mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-09-14 13:56:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

~ Current status of camera modifications

Browse Source 
Signed-off-by: Alexis Maiquez Murcia <almamu@almamu.com>
This commit is contained in:
Alexis Maiquez Murcia 2018-07-06 16:04:18 +02:00
parent fe7870de40
commit 0b5352478f
8 changed files with 238 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

351
.idea/workspace.xml
View File

@ -17,17 +17,9 @@
<component name="ChangeListManager">
<list default="true" id="18bb2960-e23f-4286-86eb-946e53957973" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/main.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/nier_test.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/nier_test.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/config.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/config.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/effect.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/effect.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/effect.h" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/effect.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.h" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/image.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/image.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/image.h" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/image.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/object.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/object.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/object.h" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/object.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/camera.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/camera.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/camera.h" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/camera.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/project.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/project.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/project.h" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/project.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/scene.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/scene.cpp" afterDir="false" />
@ -47,8 +39,8 @@
<file leaf-file-name="project.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/project.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="15" selection-start-line="15" selection-end-line="15" />
<state relative-caret-position="591">
<caret line="44" column="29" selection-start-line="44" selection-start-column="29" selection-end-line="44" selection-end-column="29" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
@ -56,10 +48,22 @@
</provider>
</entry>
</file>
<file leaf-file-name="fileResolver.cpp" pinned="false" current-in-tab="true">
<file leaf-file-name="project.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/project.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="27" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
<folding>
<element signature="e#59#89#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="fileResolver.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<state relative-caret-position="1620">
<caret line="108" column="61" selection-start-line="108" selection-start-column="61" selection-end-line="108" selection-end-column="61" />
<folding>
<element signature="e#0#21#0" expanded="true" />
@ -68,6 +72,42 @@
</provider>
</entry>
</file>
<file leaf-file-name="scene.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/scene.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576">
<caret line="60" column="30" selection-start-line="60" selection-start-column="30" selection-end-line="60" selection-end-column="30" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="camera.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/camera.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="17" selection-end-column="38" />
<folding>
<element signature="e#57#87#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="camera.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/camera.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576">
<caret line="44" column="33" selection-start-line="44" selection-start-column="33" selection-end-line="44" selection-end-column="33" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="image.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/image.cpp">
<provider selected="true" editor-type-id="text-editor">
@ -80,56 +120,35 @@
</provider>
</entry>
</file>
<file leaf-file-name="config.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/config.cpp">
<file leaf-file-name="scene.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/scene.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="8" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="8" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="fileResolver.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="27" column="12" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
<state relative-caret-position="285">
<caret line="19" column="8" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="29" />
<folding>
<element signature="e#61#78#0" expanded="true" />
<element signature="e#55#74#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="object.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/object.cpp">
<file leaf-file-name="effect.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/effect.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="105" column="59" selection-start-line="105" selection-start-column="59" selection-end-line="105" selection-end-column="59" />
<state relative-caret-position="165">
<caret line="11" column="9" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
<folding>
<element signature="e#0#30#0" expanded="true" />
<element signature="e#0#44#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="effect.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/effect.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" column="30" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
<folding>
<element signature="e#57#85#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="nier_test.cpp" pinned="false" current-in-tab="false">
<file leaf-file-name="nier_test.cpp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/nier_test.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148">
<caret line="136" selection-start-line="136" selection-end-line="136" />
<state relative-caret-position="306">
<caret line="225" column="6" selection-start-line="225" selection-start-column="6" selection-end-line="225" selection-end-column="6" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
@ -179,7 +198,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/BasicShaderLoader.h" />
<option value="$PROJECT_DIR$/CMakeLists.txt" />
<option value="$PROJECT_DIR$/wallpaperengine/Scene.h" />
<option value="$PROJECT_DIR$/wallpaperengine/Project.h" />
@ -187,7 +205,6 @@
<option value="$PROJECT_DIR$/wallpaperengine/Core.h" />
<option value="$PROJECT_DIR$/wallpaperengine/Camera.h" />
<option value="$PROJECT_DIR$/wallpaperengine/Camera.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/camera.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/Core.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/Object.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/Project.cpp" />
@ -216,20 +233,22 @@
<option value="$PROJECT_DIR$/wallpaperengine/shaders/compiler.h" />
<option value="$PROJECT_DIR$/wallpaperengine/shaders/compiler.cpp" />
<option value="$PROJECT_DIR$/main.cpp" />
<option value="$PROJECT_DIR$/nier_test.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/project.h" />
<option value="$PROJECT_DIR$/wallpaperengine/scene.h" />
<option value="$PROJECT_DIR$/wallpaperengine/project.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/scene.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/object.h" />
<option value="$PROJECT_DIR$/wallpaperengine/image.h" />
<option value="$PROJECT_DIR$/wallpaperengine/image.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/object.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/effect.h" />
<option value="$PROJECT_DIR$/wallpaperengine/effect.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/config.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.h" />
<option value="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/effect.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/project.h" />
<option value="$PROJECT_DIR$/wallpaperengine/project.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/scene.h" />
<option value="$PROJECT_DIR$/wallpaperengine/scene.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/camera.h" />
<option value="$PROJECT_DIR$/wallpaperengine/camera.cpp" />
<option value="$PROJECT_DIR$/nier_test.cpp" />
</list>
</option>
</component>
@ -261,16 +280,6 @@
<item name="wallengine" type="b2602c69:ProjectViewProjectNode" />
<item name="linux-wallpaper-engine" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wallengine" type="b2602c69:ProjectViewProjectNode" />
<item name="linux-wallpaper-engine" type="462c0819:PsiDirectoryNode" />
<item name="nlohmann" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wallengine" type="b2602c69:ProjectViewProjectNode" />
<item name="linux-wallpaper-engine" type="462c0819:PsiDirectoryNode" />
<item name="res" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wallengine" type="b2602c69:ProjectViewProjectNode" />
<item name="linux-wallpaper-engine" type="462c0819:PsiDirectoryNode" />
@ -282,6 +291,12 @@
<item name="wallpaperengine" type="462c0819:PsiDirectoryNode" />
<item name="fs" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wallengine" type="b2602c69:ProjectViewProjectNode" />
<item name="linux-wallpaper-engine" type="462c0819:PsiDirectoryNode" />
<item name="wallpaperengine" type="462c0819:PsiDirectoryNode" />
<item name="shaders" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
@ -344,12 +359,12 @@
<workItem from="1530803672753" duration="4042000" />
<workItem from="1530808421701" duration="4380000" />
<workItem from="1530835045303" duration="119000" />
<workItem from="1530857868147" duration="20035000" />
<workItem from="1530857868147" duration="24030000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="80882000" />
<option name="totallyTimeSpent" value="84877000" />
</component>
<component name="ToolWindowManager">
<frame x="4" y="14" width="1912" height="1062" extended-state="0" />
@ -404,16 +419,6 @@
<line>309</line>
<option name="timeStamp" value="45" />
</line-breakpoint>
<line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/nier_test.cpp</url>
<line>136</line>
<option name="timeStamp" value="111" />
</line-breakpoint>
<line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/wallpaperengine/project.cpp</url>
<line>15</line>
<option name="timeStamp" value="113" />
</line-breakpoint>
</breakpoints>
<option name="time" value="114" />
</breakpoint-manager>
@ -484,16 +489,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/camera.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="16" selection-end-column="6" />
<folding>
<element signature="e#57#87#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/core.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
@ -527,16 +522,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/camera.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" selection-start-line="30" selection-end-line="30" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/object3d.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
@ -699,16 +684,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/scene.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="33" selection-start-line="16" selection-start-column="33" selection-end-line="16" selection-end-column="33" />
<folding>
<element signature="e#55#74#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/object.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
@ -729,56 +704,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/project.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="21" selection-start-line="22" selection-start-column="21" selection-end-line="22" selection-end-column="21" />
<folding>
<element signature="e#59#89#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/scene.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="474">
<caret line="35" column="59" selection-start-line="35" selection-start-column="59" selection-end-line="35" selection-end-column="59" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/effect.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="9" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
<folding>
<element signature="e#0#44#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/effect.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" column="30" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
<folding>
<element signature="e#57#85#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/image.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" selection-start-line="19" selection-end-line="19" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/config.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
@ -806,16 +731,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/nier_test.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148">
<caret line="136" selection-start-line="136" selection-end-line="136" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file:///usr/include/c++/8.1.1/ext/new_allocator.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="212">
@ -823,19 +738,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/project.cpp">
<entry file="file://$PROJECT_DIR$/wallpaperengine/effect.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="15" selection-start-line="15" selection-end-line="15" />
<state relative-caret-position="195">
<caret line="13" column="30" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
<folding>
<element signature="e#0#30#0" expanded="true" />
<element signature="e#57#85#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/image.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" selection-start-line="19" selection-end-line="19" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<state relative-caret-position="1620">
<caret line="108" column="61" selection-start-line="108" selection-start-column="61" selection-end-line="108" selection-end-column="61" />
<folding>
<element signature="e#0#21#0" expanded="true" />
@ -843,5 +768,85 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/effect.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="9" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
<folding>
<element signature="e#0#44#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/project.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="27" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
<folding>
<element signature="e#59#89#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/scene.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" column="8" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="29" />
<folding>
<element signature="e#55#74#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/scene.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576">
<caret line="60" column="30" selection-start-line="60" selection-start-column="30" selection-end-line="60" selection-end-column="30" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/camera.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="17" selection-end-column="38" />
<folding>
<element signature="e#57#87#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/camera.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576">
<caret line="44" column="33" selection-start-line="44" selection-start-column="33" selection-end-line="44" selection-end-column="33" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/project.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="591">
<caret line="44" column="29" selection-start-line="44" selection-start-column="29" selection-end-line="44" selection-end-column="29" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/nier_test.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="225" column="6" selection-start-line="225" selection-start-column="6" selection-end-line="225" selection-end-column="6" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

48
nier_test.cpp
View File

@ -70,7 +70,7 @@ public:
m_material.Wireframe = false;
m_material.Lighting = false;
m_vertices[0].Pos = irr::core::vector3df ( _map_size.X, _map_size.Y, 0.0f); // bottom right
/*m_vertices[0].Pos = irr::core::vector3df ( _map_size.X, _map_size.Y, 0.0f); // bottom right
m_vertices[1].Pos = irr::core::vector3df ( _map_size.X, -_map_size.Y, 0.0f); // top right
m_vertices[2].Pos = irr::core::vector3df (-_map_size.X, -_map_size.Y, 0.0f); // top left
m_vertices[3].Pos = irr::core::vector3df (-_map_size.X, _map_size.Y, 0.0f); // bottom left
@ -89,7 +89,17 @@ public:
for (int32_t i = 1; i < 4; i ++)
{
m_box.addInternalPoint (m_vertices [i].Pos);
}
}*/
irr::video::SColor color; color.set (255, 255, 255, 255);
irr::f32 xright = 1920.0f / 2.0f;
irr::f32 xleft = -xright;
irr::f32 ztop = 1080.0f / 2.0f;
irr::f32 zbottom = -xright;
this->m_vertices [0] = irr::video::S3DVertex (xleft, ztop,0, 0, 0,0, color,1,0);
this->m_vertices [1] = irr::video::S3DVertex(xright, ztop,0, 0, 0,0, color,0,0);
this->m_vertices [2] = irr::video::S3DVertex(xright,zbottom,0, 0, 0,0, color,0,1);
this->m_vertices [3] = irr::video::S3DVertex(xleft, zbottom,0, 0, 0,0, color,1,1);
}
virtual void OnRegisterSceneNode ()
@ -102,14 +112,17 @@ public:
virtual void render ()
{
uint16_t indices[] = {
/*uint16_t indices[] = {
0, 1, 2, 3
};
};*/
uint16_t indices[] = { 0,2,3, 2,1,3, 1,0,3, 2,0,1 };
irr::video::IVideoDriver* driver = SceneManager->getVideoDriver ();
driver->setMaterial (m_material);
driver->drawVertexPrimitiveList (m_vertices, 4, indices, 1, irr::video::EVT_STANDARD, irr::scene::EPT_QUADS, irr::video::EIT_16BIT);
driver->setTransform(irr::video::ETS_WORLD, AbsoluteTransformation);
// driver->drawVertexPrimitiveList (m_vertices, 4, indices, 1, irr::video::EVT_STANDARD, irr::scene::EPT_QUADS, irr::video::EIT_16BIT);
driver->drawVertexPrimitiveList(&this->m_vertices[0], 4, &indices[0], 4, irr::video::EVT_STANDARD, irr::scene::EPT_TRIANGLES, irr::video::EIT_16BIT);
}
virtual const irr::core::aabbox3d <irr::f32>& getBoundingBox () const
@ -134,7 +147,7 @@ int nier_test ()
// set our working directory
wp::fs::resolver.changeWorkingDirectory (_wp_engine_folder);
wp::project* wp_project = new wp::project (_wp_engine_folder);
wp::project* wp_project = new wp::project ();
wp::fs::resolver.changeWorkingDirectory (wp::config::path::resources);
irr::io::path _water_example = wp::fs::resolver.resolve ("materials/water-intact.png");
@ -144,19 +157,6 @@ int nier_test ()
irr::io::path _waterripple_frag_shader = wp::fs::resolver.resolve ("shaders/effects/waterripple_opengl.frag");
irr::io::path _waterripple_vert_shader = wp::fs::resolver.resolve ("shaders/effects/waterripple_opengl.vert");
irr::io::path _white = wp::fs::resolver.resolve ("materials/white.png");
// irr::io::path _water_example = _example_base_folder; _water_example += "materials/water-intact.png";
// irr::io::path _mud_example = _example_base_folder; _mud_example += "materials/plant-on-water.png";
// irr::io::path _background_example = _example_base_folder; _background_example += "materials/top-part.png";
// irr::io::path _waterripple_normal = _example_base_folder; _waterripple_normal += "materials/effects/waterripplenormal.png";
// irr::io::path _waterripple_frag_shader = _example_base_folder; _waterripple_frag_shader += "shaders/effects/waterripple_opengl.frag";
// irr::io::path _waterripple_vert_shader = _example_base_folder; _waterripple_vert_shader += "shaders/effects/waterripple_opengl.vert";
// irr::io::path _white = _example_base_folder; _white += "materials/white.png";
/*irr::video::E_DRIVER_TYPE driverType = irr::video::E_DRIVER_TYPE::EDT_OPENGL;
device = irr::createDevice (driverType, irr::core::dimension2d<uint32_t>(1280, 720));
device->setWindowCaption (L"Wallpaper engine simulation v0.1");
driver = device->getVideoDriver ();*/
// check for ps and vs support
if (wp::irrlicht::driver->queryFeature (irr::video::EVDF_PIXEL_SHADER_1_1) == false && wp::irrlicht::driver->queryFeature (irr::video::EVDF_ARB_FRAGMENT_PROGRAM_1) == false)
@ -201,7 +201,9 @@ int nier_test ()
// get scene manager
irr::scene::ISceneManager* sceneManager = wp::irrlicht::device->getSceneManager ();
sceneManager->addCameraSceneNode (0, irr::core::vector3df (0.0f, 0.0f, -_map_size.Z), irr::core::vector3df (0.0f, 0.0f, _map_size.Z));
_map_size = wp_project->getScene ()->getCamera ()->getCenter ();
sceneManager->addCameraSceneNode (0, wp_project->getScene ()->getCamera ()->getCenter (), wp_project->getScene ()->getCamera ()->getEye ());
// sceneManager->addCameraSceneNode (0, irr::core::vector3df (0.0f, 0.0f, -_map_size.Z), irr::core::vector3df (0.0f, 0.0f, _map_size.Z));
QuadSceneNode* backgroundNode = new QuadSceneNode (sceneManager->getRootSceneNode (), sceneManager, 666);
QuadSceneNode* waterNode = new QuadSceneNode (sceneManager->getRootSceneNode (), sceneManager, 667);
@ -221,12 +223,12 @@ int nier_test ()
waterNode->getMaterial (0).setTexture (2, whiteTexture);
waterNode->setMaterialType ( (irr::video::E_MATERIAL_TYPE) materialType1);
irr::core::matrix4 identity; identity.makeIdentity ();
irr::core::matrix4 orthoProjection; orthoProjection.buildProjectionMatrixOrthoLH (1.0f, 1.0f, 0.0f, 1.0f);
/*irr::core::matrix4 identity; identity.makeIdentity ();
irr::core::matrix4 orthoProjection; orthoProjection.buildProjectionMatrixOrthoLH (wp_project->getScene ()->getCamera ()->getEye ().X, wp_project->getScene ()->getCamera ()->getEye ().Y, wp_project->getScene ()->getCamera ()->getEye ().Z, wp_project->getScene ()->getCamera ()->getCenter ().Z);
wp::irrlicht::driver->setTransform (irr::video::ETS_PROJECTION, orthoProjection);
wp::irrlicht::driver->setTransform (irr::video::ETS_VIEW, identity);
wp::irrlicht::driver->setTransform (irr::video::ETS_WORLD, identity);
wp::irrlicht::driver->setTransform (irr::video::ETS_WORLD, identity);*/
int32_t lastTime = 0;
int32_t minimumTime = 1000 / 90;

15
wallpaperengine/camera.cpp
View File

@ -31,4 +31,19 @@ namespace wp
this->m_up = core::ato3vf(up.c_str());
}
}
irr::core::vector3df camera::getCenter ()
{
return this->m_center;
}
irr::core::vector3df camera::getEye ()
{
return this->m_eye;
}
irr::core::vector3df camera::getUp ()
{
return this->m_up;
}
}

4
wallpaperengine/camera.h
View File

@ -12,6 +12,10 @@ namespace wp
{
public:
camera (json json_data);
irr::core::vector3df getCenter ();
irr::core::vector3df getEye ();
irr::core::vector3df getUp ();
private:
irr::core::vector3df m_center, m_eye, m_up;
};

7
wallpaperengine/project.cpp
View File

@ -9,7 +9,7 @@
namespace wp
{
project::project (irr::io::path baseDirectory)
project::project ()
{
irr::io::path projectFile = wp::fs::resolver.resolveOnWorkingDirectory ("project.json");
@ -39,4 +39,9 @@ namespace wp
this->m_title = name_it.value ();
}
}
scene* project::getScene ()
{
return this->m_scene;
}
}

4
wallpaperengine/project.h
View File

@ -12,7 +12,9 @@ namespace wp
class project
{
public:
project (irr::io::path baseDirectory);
project ();
scene* getScene ();
private:
json m_projectFile;

5
wallpaperengine/scene.cpp
View File

@ -55,4 +55,9 @@ namespace wp
// free camera
delete this->m_camera;
}
camera* scene::getCamera ()
{
return this->m_camera;
}
}

2
wallpaperengine/scene.h
View File

@ -17,6 +17,8 @@ namespace wp
scene (irr::io::path file);
~scene ();
camera* getCamera ();
private:
irr::io::path m_file;
std::string m_content;