mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-07-14 05:12:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

~ Fixed texture display for scenes

Browse Source 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
This commit is contained in:
Alexis Maiquez 2018-09-21 22:13:47 +02:00
parent 41002682b3
commit f5ff11995a
3 changed files with 119 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
.idea/workspace.xml
View File

@ -13,10 +13,8 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="18bb2960-e23f-4286-86eb-946e53957973" name="Default" comment=""> <list default="true" id="18bb2960-e23f-4286-86eb-946e53957973" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/main.cpp" afterPath="$PROJECT_DIR$/main.cpp" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp" afterPath="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/image.cpp" afterPath="$PROJECT_DIR$/wallpaperengine/image.cpp" /> <change beforePath="$PROJECT_DIR$/wallpaperengine/image.cpp" afterPath="$PROJECT_DIR$/wallpaperengine/image.cpp" />
<change beforePath="$PROJECT_DIR$/wallpaperengine/texture.cpp" afterPath="$PROJECT_DIR$/wallpaperengine/texture.cpp" />
</list> </list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" /> <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -29,11 +27,11 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" /> <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="main.cpp" pinned="false" current-in-tab="true"> <file leaf-file-name="main.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main.cpp"> <entry file="file://$PROJECT_DIR$/main.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="364"> <state relative-caret-position="880">
<caret line="156" column="34" lean-forward="true" selection-start-line="156" selection-start-column="34" selection-end-line="156" selection-end-column="34" /> <caret line="155" column="0" lean-forward="false" selection-start-line="155" selection-start-column="0" selection-end-line="155" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#19#0" expanded="true" /> <element signature="e#0#19#0" expanded="true" />
</folding> </folding>
@ -41,31 +39,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="irrString.h" pinned="false" current-in-tab="false"> <file leaf-file-name="renderer.cpp" pinned="false" current-in-tab="false">
<entry file="file:///usr/include/irrlicht/irrString.h"> <entry file="file://$PROJECT_DIR$/wallpaperengine/video/renderer.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="214"> <state relative-caret-position="476">
<caret line="305" column="0" lean-forward="false" selection-start-line="305" selection-start-column="0" selection-end-line="305" selection-end-column="0" /> <caret line="52" column="0" lean-forward="false" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="irrAllocator.h" pinned="false" current-in-tab="false">
<entry file="file:///usr/include/irrlicht/irrAllocator.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="142">
<caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="compiler.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/shaders/compiler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1596">
<caret line="133" column="83" lean-forward="false" selection-start-line="133" selection-start-column="83" selection-end-line="133" selection-end-column="83" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -84,9 +62,11 @@
<file leaf-file-name="texture.cpp" pinned="false" current-in-tab="false"> <file leaf-file-name="texture.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/texture.cpp"> <entry file="file://$PROJECT_DIR$/wallpaperengine/texture.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156"> <state relative-caret-position="168">
<caret line="13" column="23" lean-forward="false" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" /> <caret line="14" column="30" lean-forward="false" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
<folding /> <folding>
<element signature="e#0#36#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -94,18 +74,40 @@
<file leaf-file-name="image.h" pinned="false" current-in-tab="false"> <file leaf-file-name="image.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/image.h"> <entry file="file://$PROJECT_DIR$/wallpaperengine/image.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72"> <state relative-caret-position="312">
<caret line="6" column="44" lean-forward="false" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" /> <caret line="26" column="40" lean-forward="false" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="40" />
<folding>
<element signature="e#55#83#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="image.cpp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/wallpaperengine/image.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="492">
<caret line="88" column="103" lean-forward="true" selection-start-line="88" selection-start-column="103" selection-end-line="88" selection-end-column="103" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="image.cpp" pinned="false" current-in-tab="false"> <file leaf-file-name="scene.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/image.cpp"> <entry file="file://$PROJECT_DIR$/wallpaperengine/scene.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104"> <state relative-caret-position="536">
<caret line="127" column="21" lean-forward="false" selection-start-line="127" selection-start-column="21" selection-end-line="127" selection-end-column="21" /> <caret line="104" column="0" lean-forward="false" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="530">
<caret line="124" column="0" lean-forward="false" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -124,8 +126,8 @@
<file leaf-file-name="fileResolver.cpp" pinned="false" current-in-tab="false"> <file leaf-file-name="fileResolver.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp"> <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="404"> <state relative-caret-position="224">
<caret line="121" column="0" lean-forward="false" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" /> <caret line="106" column="0" lean-forward="false" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -135,7 +137,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>context</find>
<find>GL_INVA</find> <find>GL_INVA</find>
<find>GLSL TEST</find> <find>GLSL TEST</find>
<find>arb</find> <find>arb</find>
@ -164,6 +165,7 @@
<find>changeWorkingDirectory</find> <find>changeWorkingDirectory</find>
<find>::fileResolver</find> <find>::fileResolver</find>
<find>&quot;.&quot;</find> <find>&quot;.&quot;</find>
<find>-&gt;render</find>
<find>Failed</find> <find>Failed</find>
</findStrings> </findStrings>
</component> </component>
@ -214,7 +216,6 @@
<option value="$PROJECT_DIR$/wallpaperengine/object.cpp" /> <option value="$PROJECT_DIR$/wallpaperengine/object.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/texture.h" /> <option value="$PROJECT_DIR$/wallpaperengine/texture.h" />
<option value="$PROJECT_DIR$/wallpaperengine/image.h" /> <option value="$PROJECT_DIR$/wallpaperengine/image.h" />
<option value="$PROJECT_DIR$/wallpaperengine/texture.cpp" />
<option value="$PROJECT_DIR$/nier_test.h" /> <option value="$PROJECT_DIR$/nier_test.h" />
<option value="$PROJECT_DIR$/s3tc.cpp" /> <option value="$PROJECT_DIR$/s3tc.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/video/renderer.h" /> <option value="$PROJECT_DIR$/wallpaperengine/video/renderer.h" />
@ -223,6 +224,7 @@
<option value="$PROJECT_DIR$/CMakeLists.txt" /> <option value="$PROJECT_DIR$/CMakeLists.txt" />
<option value="$PROJECT_DIR$/main.cpp" /> <option value="$PROJECT_DIR$/main.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp" /> <option value="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/texture.cpp" />
<option value="$PROJECT_DIR$/wallpaperengine/image.cpp" /> <option value="$PROJECT_DIR$/wallpaperengine/image.cpp" />
</list> </list>
</option> </option>
@ -341,12 +343,12 @@
<workItem from="1531002668909" duration="7171000" /> <workItem from="1531002668909" duration="7171000" />
<workItem from="1531833563019" duration="18910000" /> <workItem from="1531833563019" duration="18910000" />
<workItem from="1535381505231" duration="2647000" /> <workItem from="1535381505231" duration="2647000" />
<workItem from="1537556584820" duration="2401000" /> <workItem from="1537556584820" duration="4148000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="130617000" /> <option name="totallyTimeSpent" value="132364000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1099" y="309" width="1882" height="1032" extended-state="0" /> <frame x="1099" y="309" width="1882" height="1032" extended-state="0" />
@ -422,12 +424,12 @@
<option name="timeStamp" value="45" /> <option name="timeStamp" value="45" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp</url> <url>file://$PROJECT_DIR$/wallpaperengine/video/renderer.cpp</url>
<line>106</line> <line>52</line>
<option name="timeStamp" value="135" /> <option name="timeStamp" value="137" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
<option name="time" value="137" /> <option name="time" value="140" />
</breakpoint-manager> </breakpoint-manager>
<watches-manager /> <watches-manager />
</component> </component>
@ -473,6 +475,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132"> <state relative-caret-position="132">
<caret line="11" column="43" lean-forward="false" selection-start-line="11" selection-start-column="43" selection-end-line="12" selection-end-column="52" /> <caret line="11" column="43" lean-forward="false" selection-start-line="11" selection-start-column="43" selection-end-line="12" selection-end-column="52" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -564,20 +567,11 @@
</provider> </provider>
</entry> </entry>
<entry file="file:///usr/include/c++/8.1.1/bits/stl_iterator.h" /> <entry file="file:///usr/include/c++/8.1.1/bits/stl_iterator.h" />
<entry file="file://$PROJECT_DIR$/wallpaperengine/object.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="530">
<caret line="124" column="0" lean-forward="false" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
<folding>
<element signature="e#0#30#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/video/node.h"> <entry file="file://$PROJECT_DIR$/wallpaperengine/video/node.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -589,19 +583,12 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/scene.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1248">
<caret line="104" column="0" lean-forward="false" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/s3tc.cpp" /> <entry file="file://$PROJECT_DIR$/s3tc.cpp" />
<entry file="file://$PROJECT_DIR$/wallpaperengine/video/node.cpp"> <entry file="file://$PROJECT_DIR$/wallpaperengine/video/node.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="39" lean-forward="false" selection-start-line="0" selection-start-column="39" selection-end-line="0" selection-end-column="39" /> <caret line="0" column="39" lean-forward="false" selection-start-line="0" selection-start-column="39" selection-end-line="0" selection-end-column="39" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -615,14 +602,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/video/renderer.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="392">
<caret line="45" column="0" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/video/material.h"> <entry file="file://$PROJECT_DIR$/wallpaperengine/video/material.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276"> <state relative-caret-position="276">
@ -656,22 +635,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/texture.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="10" column="37" lean-forward="false" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/texture.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="13" column="23" lean-forward="false" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/shaders/compiler.cpp"> <entry file="file://$PROJECT_DIR$/wallpaperengine/shaders/compiler.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1596"> <state relative-caret-position="1596">
@ -731,37 +694,81 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp"> <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="404"> <state relative-caret-position="224">
<caret line="121" column="0" lean-forward="false" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" /> <caret line="106" column="0" lean-forward="false" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/image.h"> <entry file="file://$PROJECT_DIR$/wallpaperengine/object.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72"> <state relative-caret-position="530">
<caret line="6" column="44" lean-forward="false" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" /> <caret line="124" column="0" lean-forward="false" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/image.cpp"> <entry file="file://$PROJECT_DIR$/wallpaperengine/scene.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104"> <state relative-caret-position="536">
<caret line="127" column="21" lean-forward="false" selection-start-line="127" selection-start-column="21" selection-end-line="127" selection-end-column="21" /> <caret line="104" column="0" lean-forward="false" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/main.cpp"> <entry file="file://$PROJECT_DIR$/main.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="364"> <state relative-caret-position="880">
<caret line="156" column="34" lean-forward="true" selection-start-line="156" selection-start-column="34" selection-end-line="156" selection-end-column="34" /> <caret line="155" column="0" lean-forward="false" selection-start-line="155" selection-start-column="0" selection-end-line="155" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#19#0" expanded="true" /> <element signature="e#0#19#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/video/renderer.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476">
<caret line="52" column="0" lean-forward="false" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/texture.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="10" column="37" lean-forward="false" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/image.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="312">
<caret line="26" column="40" lean-forward="false" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="40" />
<folding>
<element signature="e#55#83#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wallpaperengine/texture.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="14" column="30" lean-forward="false" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
<folding>
<element signature="e#0#36#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="492">
<caret line="88" column="103" lean-forward="true" selection-start-line="88" selection-start-column="103" selection-end-line="88" selection-end-column="103" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>

10
wallpaperengine/image.cpp
View File

@ -129,8 +129,12 @@ namespace wp
{ {
this->getMaterial ().setTexture (i, (*cur)->getIrrTexture ()); this->getMaterial ().setTexture (i, (*cur)->getIrrTexture ());
} }
}
// set basic material flags
this->setType (irr::video::EMT_TRANSPARENT_ALPHA_CHANNEL);
this->setFlag (irr::video::EMF_LIGHTING, false);
this->setFlag (irr::video::EMF_BLEND_OPERATION, true);
}
void image::setFlag(irr::video::E_MATERIAL_FLAG flag, bool newvalue) void image::setFlag(irr::video::E_MATERIAL_FLAG flag, bool newvalue)
@ -150,12 +154,14 @@ namespace wp
void image::render () void image::render ()
{ {
if (this->m_visible == false) return;
uint16_t indices[] = uint16_t indices[] =
{ {
0, 1, 2, 3 0, 1, 2, 3
}; };
wp::irrlicht::driver->setMaterial (this->m_material); wp::irrlicht::driver->setMaterial (this->getMaterial ());
wp::irrlicht::driver->drawVertexPrimitiveList (this->m_vertices, 4, indices, 1, irr::video::EVT_STANDARD, irr::scene::EPT_QUADS, irr::video::EIT_16BIT); wp::irrlicht::driver->drawVertexPrimitiveList (this->m_vertices, 4, indices, 1, irr::video::EVT_STANDARD, irr::scene::EPT_QUADS, irr::video::EIT_16BIT);
} }

5
wallpaperengine/texture.cpp
View File

@ -1,16 +1,17 @@
#include <wallpaperengine/texture.h> #include <wallpaperengine/texture.h>
#include "irrlicht.h"
namespace wp namespace wp
{ {
texture::texture (irr::io::path file) texture::texture (irr::io::path file)
{ {
this->m_texture = wp::irrlicht::driver->getTexture (file);
} }
irr::video::ITexture* texture::getIrrTexture () irr::video::ITexture* texture::getIrrTexture ()
{ {
return nullptr; return this->m_texture;
} }
} }