~ Better path resolving handling

+ Possibility to resolve paths from json data (duh weird conversions...)

Signed-off-by: Alexis Maiquez Murcia <almamu@almamu.com>

.idea/workspace.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="BookmarkManager">
+    <bookmark url="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.h" line="23" mnemonic="9" />
+  </component>
   <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true" buildAllGenerated="true">
     <generated>
       <config projectName="wallengine" targetName="wallengine" />
@@ -13,25 +16,22 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="18bb2960-e23f-4286-86eb-946e53957973" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/wallpaperengine/object.cpp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wallpaperengine/object.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wallpaperengine/project.cpp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wallpaperengine/project.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wallpaperengine/scene.cpp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wallpaperengine/scene.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BasicShaderLoader.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/shaders/compiler.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BasicShaderLoader.h" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/shaders/compiler.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" 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$/res/common.h" beforeDir="false" afterPath="$PROJECT_DIR$/res/shaders/common.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wallpaperengine/Object.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wallpaperengine/Object.h" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wallpaperengine/Project.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wallpaperengine/Project.h" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wallpaperengine/Scene.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wallpaperengine/Scene.h" beforeDir="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/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" />
+      <change beforePath="$PROJECT_DIR$/wallpaperengine/scene.h" beforeDir="false" afterPath="$PROJECT_DIR$/wallpaperengine/scene.h" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -44,47 +44,56 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="compiler.h" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/wallpaperengine/shaders/compiler.h">
+      <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="422">
-              <caret line="59" column="26" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="26" />
+            <state relative-caret-position="156">
+              <caret line="15" selection-start-line="15" selection-end-line="15" />
               <folding>
-                <element signature="e#69#99#0" expanded="true" />
+                <element signature="e#0#30#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="compiler.cpp" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/wallpaperengine/shaders/compiler.cpp">
+      <file leaf-file-name="fileResolver.cpp" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="381">
-              <caret line="358" column="12" selection-start-line="358" selection-start-column="12" selection-end-line="358" selection-end-column="12" />
+            <state relative-caret-position="495">
+              <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#30#0" expanded="true" />
+                <element signature="e#0#21#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">
+      <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">
-            <state relative-caret-position="1200">
-              <caret line="80" column="94" selection-start-line="80" selection-start-column="94" selection-end-line="80" selection-end-column="94" />
+            <state relative-caret-position="285">
+              <caret line="19" selection-start-line="19" selection-end-line="19" />
               <folding>
-                <element signature="e#0#21#0" expanded="true" />
+                <element signature="e#0#26#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="config.cpp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/wallpaperengine/config.cpp">
+          <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="390">
-              <caret line="26" column="16" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
+            <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" />
               <folding>
                 <element signature="e#61#78#0" expanded="true" />
               </folding>
@@ -92,13 +101,25 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.cpp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/main.cpp">
+      <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="405">
-              <caret line="65" column="59" selection-start-line="65" selection-start-column="59" selection-end-line="65" selection-end-column="59" />
+            <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" />
               <folding>
-                <element signature="e#0#19#0" expanded="true" />
+                <element signature="e#0#30#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>
@@ -107,8 +128,8 @@
       <file leaf-file-name="nier_test.cpp" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/nier_test.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="377">
-              <caret line="186" selection-start-line="186" selection-end-line="186" />
+            <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>
@@ -120,8 +141,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>XMapWindow</find>
-      <find>VOFLAG_W</find>
       <find>_window3</find>
       <find>_window</find>
       <find>WinID</find>
@@ -150,6 +169,8 @@
       <find>device</find>
       <find>getAb</find>
       <find>Compiled shader output for</find>
+      <find>getFileSystem</find>
+      <find>string</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -158,7 +179,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/res/shaders/effects/waterripple_opengl.frag" />
         <option value="$PROJECT_DIR$/BasicShaderLoader.h" />
         <option value="$PROJECT_DIR$/CMakeLists.txt" />
         <option value="$PROJECT_DIR$/wallpaperengine/Scene.h" />
@@ -178,15 +198,6 @@
         <option value="$PROJECT_DIR$/wallpaperengine/model.cpp" />
         <option value="$PROJECT_DIR$/wallpaperengine/object3d.h" />
         <option value="$PROJECT_DIR$/wallpaperengine/object3d.cpp" />
-        <option value="$PROJECT_DIR$/wallpaperengine/effect.h" />
-        <option value="$PROJECT_DIR$/wallpaperengine/object.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/effect.cpp" />
-        <option value="$PROJECT_DIR$/wallpaperengine/object.cpp" />
-        <option value="$PROJECT_DIR$/wallpaperengine/image.h" />
-        <option value="$PROJECT_DIR$/wallpaperengine/image.cpp" />
         <option value="$PROJECT_DIR$/wallpaperengine/material.h" />
         <option value="$PROJECT_DIR$/wallpaperengine/material.cpp" />
         <option value="$PROJECT_DIR$/wallpaperengine/fs/resolver.cpp" />
@@ -202,13 +213,23 @@
         <option value="$PROJECT_DIR$/wallpaperengine/irrlicht.cpp" />
         <option value="$PROJECT_DIR$/wallpaperengine/irrlicht.h" />
         <option value="$PROJECT_DIR$/wallpaperengine/config.h" />
-        <option value="$PROJECT_DIR$/wallpaperengine/config.cpp" />
-        <option value="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp" />
-        <option value="$PROJECT_DIR$/wallpaperengine/fs/fileResolver.h" />
-        <option value="$PROJECT_DIR$/main.cpp" />
-        <option value="$PROJECT_DIR$/nier_test.cpp" />
         <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" />
       </list>
     </option>
   </component>
@@ -225,7 +246,7 @@
   <component name="ProjectFrameBounds">
     <option name="x" value="4" />
     <option name="y" value="14" />
-    <option name="width" value="1912" />
+    <option name="width" value="954" />
     <option name="height" value="1062" />
   </component>
   <component name="ProjectView">
@@ -240,6 +261,11 @@
               <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" />
@@ -296,7 +322,7 @@
     </option>
   </component>
   <component name="RunManager">
-    <configuration name="Build All" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS_2="true" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="wallengine" RUN_TARGET_NAME="wallengine" EXPLICIT_BUILD_TARGET_NAME="all" />
+    <configuration name="Unnamed" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS_2="true" PROJECT_NAME="wallengine" TARGET_NAME="wallengine" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="wallengine" RUN_TARGET_NAME="wallengine" />
   </component>
   <component name="SvnConfiguration">
     <configuration />
@@ -318,12 +344,12 @@
       <workItem from="1530803672753" duration="4042000" />
       <workItem from="1530808421701" duration="4380000" />
       <workItem from="1530835045303" duration="119000" />
-      <workItem from="1530857868147" duration="16781000" />
+      <workItem from="1530857868147" duration="20035000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="77628000" />
+    <option name="totallyTimeSpent" value="80882000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="4" y="14" width="1912" height="1062" extended-state="0" />
@@ -378,69 +404,21 @@
           <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$/wallpaperengine/shaders/compiler.cpp</url>
-          <line>357</line>
-          <option name="timeStamp" value="101" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/nier_test.cpp</url>
-          <line>147</line>
-          <option name="timeStamp" value="102" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
           <url>file://$PROJECT_DIR$/nier_test.cpp</url>
-          <line>163</line>
-          <option name="timeStamp" value="103" />
+          <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$/nier_test.cpp</url>
-          <line>169</line>
-          <option name="timeStamp" value="104" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/nier_test.cpp</url>
-          <line>175</line>
-          <option name="timeStamp" value="105" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/nier_test.cpp</url>
-          <line>179</line>
-          <option name="timeStamp" value="106" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/nier_test.cpp</url>
-          <line>186</line>
-          <option name="timeStamp" value="107" />
+          <url>file://$PROJECT_DIR$/wallpaperengine/project.cpp</url>
+          <line>15</line>
+          <option name="timeStamp" value="113" />
         </line-breakpoint>
       </breakpoints>
-      <option name="time" value="108" />
+      <option name="time" value="114" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/glsl/lexer.cpp" />
-    <entry file="file://$PROJECT_DIR$/glsl/parser.cpp" />
-    <entry file="file:///usr/include/c++/8.1.1/bits/basic_string.tcc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="223">
-          <caret line="218" selection-start-line="218" selection-end-line="218" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="8" selection-start-line="8" selection-end-line="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CMakeModules/FindIrrlicht.cmake">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="50" selection-start-column="50" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/res/shaders/common.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="468">
@@ -570,192 +548,233 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/project.h">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/shaderResolver.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
-          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="24" selection-end-column="6" />
-          <folding>
-            <element signature="e#59#89#0" expanded="true" />
-          </folding>
+          <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/scene.h">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/shaderResolver.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="57" selection-start-line="16" selection-start-column="57" selection-end-line="16" selection-end-column="57" />
+        <state relative-caret-position="180">
+          <caret line="12" column="1" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
           <folding>
-            <element signature="e#55#74#0" expanded="true" />
+            <element signature="e#40#61#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/scene.cpp">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/material.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="11" column="60" selection-start-line="11" selection-start-column="60" selection-end-line="11" selection-end-column="60" />
-          <folding>
-            <element signature="e#0#30#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="120">
+          <caret line="8" column="38" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/effect.cpp">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/material.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
+        <state relative-caret-position="150">
+          <caret line="10" column="5" selection-start-line="10" selection-start-column="5" selection-end-line="11" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/effect.h">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/resolvers.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="54" />
-          <folding>
-            <element signature="e#57#85#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="150">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/project.cpp">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/resolvers.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="28" column="75" selection-start-line="28" selection-start-column="75" selection-end-line="28" selection-end-column="75" />
+        <state relative-caret-position="135">
+          <caret line="9" column="34" selection-start-line="9" selection-start-column="34" selection-end-line="9" selection-end-column="34" />
           <folding>
-            <element signature="e#0#30#0" expanded="true" />
+            <element signature="e#0#25#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/object.cpp">
+    <entry file="file://$PROJECT_DIR$/nier_test.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-420">
-          <caret line="14" column="58" selection-start-line="14" selection-start-column="34" selection-end-line="14" selection-end-column="58" />
-          <folding>
-            <element signature="e#0#30#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="105">
+          <caret line="7" column="42" selection-start-line="7" selection-start-column="42" selection-end-line="7" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/object.h">
+    <entry file="file:///usr/include/irrlicht/IrrlichtDevice.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="30" selection-start-line="17" selection-start-column="30" selection-end-line="17" selection-end-column="54" />
+        <state relative-caret-position="201">
+          <caret line="91" column="26" lean-forward="true" selection-start-line="91" selection-start-column="26" selection-end-line="91" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/include/irrlicht/IFileSystem.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="213">
+          <caret line="280" column="22" selection-start-line="280" selection-start-column="17" selection-end-line="280" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/irrlicht.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="35" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/irrlicht.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="19" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/config.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="15" lean-forward="true" selection-start-line="12" selection-start-column="15" selection-end-line="15" selection-end-column="41" />
           <folding>
-            <element signature="e#57#76#0" expanded="true" />
+            <element signature="e#57#74#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/image.cpp">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/shaders/compiler.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="60" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
+        <state relative-caret-position="422">
+          <caret line="59" column="26" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="26" />
           <folding>
-            <element signature="e#0#26#0" expanded="true" />
+            <element signature="e#69#99#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/shaderResolver.h">
+    <entry file="file://$PROJECT_DIR$/nlohmann/detail/input/json_sax.hpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
+        <state relative-caret-position="220">
+          <caret line="246" selection-start-line="246" selection-end-line="246" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/shaderResolver.cpp">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/shaders/compiler.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="1" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
+        <state relative-caret-position="435">
+          <caret line="187" column="29" selection-start-line="187" selection-start-column="20" selection-end-line="187" selection-end-column="29" />
           <folding>
-            <element signature="e#40#61#0" expanded="true" />
+            <element signature="e#0#30#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/material.cpp">
+    <entry file="file:///usr/include/irrlicht/irrAllocator.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="38" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
+        <state relative-caret-position="330">
+          <caret line="24" selection-start-line="24" selection-end-line="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/material.h">
+    <entry file="file://$PROJECT_DIR$/main.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="5" selection-start-line="10" selection-start-column="5" selection-end-line="11" selection-end-column="33" />
+        <state relative-caret-position="501">
+          <caret line="68" selection-start-line="68" selection-end-line="68" />
+          <folding>
+            <element signature="e#0#19#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/image.h">
+    <entry file="file:///usr/include/irrlicht/irrString.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
-          <folding>
-            <element signature="e#55#83#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="265">
+          <caret line="89" selection-start-line="89" selection-end-line="89" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/resolvers.h">
+    <entry file="file://$PROJECT_DIR$/nlohmann/json.hpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
+        <state relative-caret-position="173">
+          <caret line="1080" column="130" selection-start-line="1080" selection-start-column="124" selection-end-line="1080" selection-end-column="130" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/resolvers.cpp">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/scene.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="34" selection-start-line="9" selection-start-column="34" selection-end-line="9" selection-end-column="34" />
+        <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#0#25#0" expanded="true" />
+            <element signature="e#55#74#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nier_test.h">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/object.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="42" selection-start-line="7" selection-start-column="42" selection-end-line="7" selection-end-column="42" />
+        <state relative-caret-position="255">
+          <caret line="17" column="30" selection-start-line="17" selection-start-column="30" selection-end-line="17" selection-end-column="30" />
+          <folding>
+            <element signature="e#57#76#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/include/irrlicht/IrrlichtDevice.h">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/image.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="91" column="26" lean-forward="true" selection-start-line="91" selection-start-column="26" selection-end-line="91" selection-end-column="26" />
+        <state relative-caret-position="195">
+          <caret line="13" column="28" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="e#55#83#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/include/irrlicht/IFileSystem.h">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/project.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="213">
-          <caret line="280" column="22" selection-start-line="280" selection-start-column="17" selection-end-line="280" selection-end-column="22" />
+        <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/irrlicht.cpp">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/scene.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="35" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" />
+        <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/irrlicht.h">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/effect.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="19" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="19" />
+        <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/config.h">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/effect.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="15" lean-forward="true" selection-start-line="12" selection-start-column="15" selection-end-line="15" selection-end-column="41" />
+        <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#74#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>
@@ -763,66 +782,63 @@
     <entry file="file://$PROJECT_DIR$/wallpaperengine/config.cpp">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
-          <caret line="12" column="35" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" />
+          <caret line="12" column="8" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="8" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="26" column="16" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
+        <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" />
           <folding>
             <element signature="e#61#78#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/shaders/compiler.h">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/object.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="422">
-          <caret line="59" column="26" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="26" />
+        <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" />
           <folding>
-            <element signature="e#69#99#0" expanded="true" />
+            <element signature="e#0#30#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.cpp">
+    <entry file="file://$PROJECT_DIR$/nier_test.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="65" column="59" selection-start-line="65" selection-start-column="59" selection-end-line="65" selection-end-column="59" />
+        <state relative-caret-position="148">
+          <caret line="136" selection-start-line="136" selection-end-line="136" />
           <folding>
-            <element signature="e#0#19#0" expanded="true" />
+            <element signature="e#0#30#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/nier_test.cpp">
+    <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="377">
-          <caret line="186" selection-start-line="186" selection-end-line="186" />
-          <folding>
-            <element signature="e#0#30#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="212">
+          <caret line="110" selection-start-line="110" selection-end-line="110" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/project.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1200">
-          <caret line="80" column="94" selection-start-line="80" selection-start-column="94" selection-end-line="80" selection-end-column="94" />
+        <state relative-caret-position="156">
+          <caret line="15" selection-start-line="15" selection-end-line="15" />
           <folding>
-            <element signature="e#0#21#0" expanded="true" />
+            <element signature="e#0#30#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wallpaperengine/shaders/compiler.cpp">
+    <entry file="file://$PROJECT_DIR$/wallpaperengine/fs/fileResolver.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="381">
-          <caret line="358" column="12" selection-start-line="358" selection-start-column="12" selection-end-line="358" selection-end-column="12" />
+        <state relative-caret-position="495">
+          <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#30#0" expanded="true" />
+            <element signature="e#0#21#0" expanded="true" />
           </folding>
         </state>
       </provider>

main.cpp

@@ -2,6 +2,7 @@
 #include <irrlicht/irrlicht.h>
 #include <sstream>
 #include <wallpaperengine/config.h>
+#include <wallpaperengine/fs/fileResolver.h>
 #include "nier_test.h"
 #include "wallpaperengine/irrlicht.h"
 
@@ -64,6 +65,8 @@ void preconfigure_wallpaper_engine ()
     wp::config::path::base = wp::irrlicht::device->getFileSystem ()->getAbsolutePath ("../");
     wp::config::path::resources = wp::config::path::base + "/res";
     wp::config::path::shaders = wp::config::path::resources + "/shaders";
+
+    wp::fs::resolver.changeWorkingDirectory(wp::config::path::base);
 }
 
 int game_test_main ()

nier_test.cpp

@@ -1,6 +1,7 @@
 #include <irrlicht/irrlicht.h>
 #include <cstdint>
 #include <iostream>
+#include <wallpaperengine/config.h>
 
 #include "common.h"
 #include "wallpaperengine/shaders/compiler.h"
@@ -133,11 +134,8 @@ int nier_test ()
 
     // set our working directory
     wp::fs::resolver.changeWorkingDirectory (_wp_engine_folder);
-    // also append base folder for resources
-    wp::fs::resolver.appendEnvironment ("");
-
     wp::project* wp_project = new wp::project (_wp_engine_folder);
-    wp::fs::resolver.changeWorkingDirectory ("../res");
+    wp::fs::resolver.changeWorkingDirectory (wp::config::path::resources);
 
     irr::io::path _water_example = wp::fs::resolver.resolve ("materials/water-intact.png");
     irr::io::path _mud_example = wp::fs::resolver.resolve ("materials/plant-on-water.png");

wallpaperengine/config.cpp

@@ -8,8 +8,8 @@ namespace wp
 {
     namespace config
     {
-        static irr::io::path path::resources;
-        static irr::io::path path::base;
-        static irr::io::path path::shaders;
+        irr::io::path path::resources;
+        irr::io::path path::base;
+        irr::io::path path::shaders;
     }
 }

wallpaperengine/effect.cpp

@@ -1,17 +1,16 @@
+#include <wallpaperengine/fs/fileResolver.h>
 #include "effect.h"
 
 namespace wp
 {
-    effect::effect (json json_data, irr::io::path basepath)
+    effect::effect (json json_data)
     {
         json::const_iterator file = json_data.find ("file");
         json::const_iterator pass = json_data.find ("passes");
 
         if (file != json_data.end () && (*file).is_string () == true)
         {
-            std::string file_s = *file;
-
-            this->m_file = basepath + "/" + file_s.c_str ();
+            this->m_file = wp::fs::resolver.resolve (*file);
         }
     }
 };

wallpaperengine/effect.h

@@ -11,7 +11,7 @@ namespace wp
     class effect
     {
     public:
-        effect (json json_data, irr::io::path basepath);
+        effect (json json_data);
 
     private:
         irr::io::path m_file;

wallpaperengine/fs/fileResolver.cpp

@@ -4,83 +4,120 @@
 
 namespace wp
 {
-    namespace fs
+    fs::fileResolver::fileResolver ()
     {
-        fileResolver::fileResolver ()
-        {
-            this->m_environment.push_back (".");
-        }
+        this->m_environment.push_back (".");
+    }
 
-        fileResolver::fileResolver (std::vector<irr::io::path> environment)
-        {
-            this->m_environment.push_back (".");
-            this->m_environment.insert (this->m_environment.end (), environment.begin (), environment.end ());
-        }
-        void fileResolver::appendEnvironment (irr::io::path path)
+    fs::fileResolver::fileResolver (std::vector<irr::io::path> environment)
+    {
+        this->m_environment.push_back (".");
+        this->m_environment.insert (this->m_environment.end (), environment.begin (), environment.end ());
+    }
+    void fs::fileResolver::appendEnvironment (irr::io::path path)
+    {
+        this->m_environment.push_back (wp::irrlicht::device->getFileSystem ()->getAbsolutePath (path));
+    }
+
+    void fs::fileResolver::removeEnvironment(irr::io::path path)
+    {
+        std::vector<irr::io::path>::const_iterator cur = this->m_environment.begin ();
+        std::vector<irr::io::path>::const_iterator end = this->m_environment.end ();
+        irr::io::path absolute = wp::irrlicht::device->getFileSystem ()->getAbsolutePath (path);
+
+        for (; cur != end; cur ++)
         {
-            this->m_environment.push_back (wp::irrlicht::device->getFileSystem ()->getAbsolutePath (path));
+            if (*cur == path)
+            {
+                this->m_environment.erase (cur);
+                return;
+            }
         }
+    }
+
+    void fs::fileResolver::prependEnvironment (irr::io::path path)
+    {
+        this->m_environment.insert (
+                this->m_environment.begin (),
+                wp::irrlicht::device->getFileSystem ()->getAbsolutePath (path)
+        );
+    }
+
+    void fs::fileResolver::changeWorkingDirectory (irr::io::path newpath)
+    {
+        this->m_environment.erase (this->m_environment.begin ());
+        this->prependEnvironment (newpath);
+    }
+
+    irr::io::path fs::fileResolver::getWorkingDirectory ()
+    {
+        return *this->m_environment.begin ();
+    }
+
+    fs::fileResolver fs::fileResolver::clone ()
+    {
+        return fileResolver (this->m_environment);
+    }
+
+    irr::io::path fs::fileResolver::resolve (irr::io::path name)
+    {
+        std::vector<irr::io::path>::const_iterator cur = this->m_environment.begin ();
+        std::vector<irr::io::path>::const_iterator end = this->m_environment.end ();
+        irr::io::path tmp = "";
 
-        void fileResolver::removeEnvironment(irr::io::path path)
+        // try to resolve the path
+        for (; cur != end; cur ++)
         {
-            std::vector<irr::io::path>::const_iterator cur = this->m_environment.begin ();
-            std::vector<irr::io::path>::const_iterator end = this->m_environment.end ();
-            irr::io::path absolute = wp::irrlicht::device->getFileSystem ()->getAbsolutePath (path);
+            tmp = *cur;
+            tmp += "/";
+            tmp += name;
 
-            for (; cur != end; cur ++)
+            if (wp::irrlicht::device->getFileSystem ()->existFile (tmp) == true)
             {
-                if (*cur == path)
-                {
-                    this->m_environment.erase (cur);
-                    return;
-                }
+                wp::irrlicht::device->getLogger ()->log ("Resolved file to", tmp.c_str ());
+                return tmp;
             }
         }
 
-        void fileResolver::prependEnvironment (irr::io::path path)
-        {
-            this->m_environment.insert (
-                    this->m_environment.begin (),
-                    wp::irrlicht::device->getFileSystem ()->getAbsolutePath (path)
-            );
-        }
+        wp::irrlicht::device->getLogger ()->log ("Failed resolving file ", name.c_str (), irr::ELL_ERROR);
 
-        void fileResolver::changeWorkingDirectory (irr::io::path newpath)
-        {
-            this->m_environment.erase (this->m_environment.begin ());
-            this->prependEnvironment (newpath);
-        }
+        return "";
+    }
 
-        fileResolver fileResolver::clone ()
-        {
-            return fileResolver (this->m_environment);
-        }
+    irr::io::path fs::fileResolver::resolveOnWorkingDirectory (irr::io::path name)
+    {
+        irr::io::path file = *this->m_environment.begin () + "/" + name;
 
-        irr::io::path fileResolver::resolve (irr::io::path name)
+        if (wp::irrlicht::device->getFileSystem ()->existFile (file) == true)
         {
-            std::vector<irr::io::path>::const_iterator cur = this->m_environment.begin ();
-            std::vector<irr::io::path>::const_iterator end = this->m_environment.end ();
-            irr::io::path tmp = "";
+            wp::irrlicht::device->getLogger ()->log ("Resolved file in working directory to", file.c_str ());
+            return file;
+        }
 
-            // try to resolve the path
-            for (; cur != end; cur ++)
-            {
-                tmp = *cur;
-                tmp += "/";
-                tmp += name;
+        return "";
+    }
 
-                struct stat buffer;
+    irr::io::path fs::fileResolver::resolve (json name)
+    {
+        std::string tmp = name;
+        return this->resolve (tmp.c_str ());
+    }
 
-                if (stat (tmp.c_str (), &buffer) == 0)
-                {
-                    wp::irrlicht::device->getLogger ()->log ("Resolved file to", tmp.c_str ());
-                    return tmp;
-                }
-            }
+    irr::io::path fs::fileResolver::resolveOnWorkingDirectory (json name)
+    {
+        std::string tmp = name;
+        return this->resolveOnWorkingDirectory (tmp.c_str ());
+    }
 
-            wp::irrlicht::device->getLogger ()->log ("Failed resolving file ", name.c_str ());
+    irr::io::path fs::fileResolver::resolve (const char* name)
+    {
+        return this->resolve (irr::io::path(name));
+    }
 
-            return "";
-        }
+    irr::io::path fs::fileResolver::resolveOnWorkingDirectory (const char* name)
+    {
+        return this->resolveOnWorkingDirectory(irr::io::path (name));
     }
+
+    fs::fileResolver fs::resolver;
 }

wallpaperengine/fs/fileResolver.h

@@ -4,11 +4,14 @@
 #include <string>
 #include <vector>
 #include <irrlicht/path.h>
+#include <nlohmann/json.hpp>
 
 namespace wp
 {
-    namespace fs
+    using json = nlohmann::json;
+    class fs
     {
+    public:
         class fileResolver
         {
         public:
@@ -18,8 +21,14 @@ namespace wp
             void appendEnvironment (irr::io::path path);
             void removeEnvironment (irr::io::path path);
             void changeWorkingDirectory (irr::io::path newpath);
+            irr::io::path getWorkingDirectory ();
             fileResolver clone ();
             irr::io::path resolve (irr::io::path name);
+            irr::io::path resolveOnWorkingDirectory (irr::io::path name);
+            irr::io::path resolve (json name);
+            irr::io::path resolveOnWorkingDirectory (json name);
+            irr::io::path resolve (const char* name);
+            irr::io::path resolveOnWorkingDirectory (const char* name);
 
         protected:
             void prependEnvironment (irr::io::path path);
@@ -29,7 +38,7 @@ namespace wp
         };
 
         static fileResolver resolver;
-    }
+    };
 }
 
 

wallpaperengine/image.cpp

@@ -1,10 +1,11 @@
 #include <irrlicht/path.h>
+#include <wallpaperengine/fs/fileResolver.h>
 #include "object3d.h"
 #include "image.h"
 
 namespace wp
 {
-    image::image (json json_data, irr::io::path basepath) : object3d (object3d::Type::Type_Image)
+    image::image (json json_data) : object3d (object3d::Type::Type_Image)
     {
         json::const_iterator visible = json_data.find ("visible");
         json::const_iterator file = json_data.find ("image");
@@ -16,9 +17,7 @@ namespace wp
 
         if (file != json_data.end () && (*file).is_string () == true)
         {
-            std::string file_s = *file;
-
-            this->m_file = basepath + "/" + file_s.c_str ();
+            this->m_file = wp::fs::resolver.resolve (*file);
         }
     }
 }

wallpaperengine/image.h

@@ -11,7 +11,7 @@ namespace wp
     class image : public object3d
     {
     public:
-        image(json json_data, irr::io::path basepath);
+        image(json json_data);
 
     private:
         bool m_visible;

wallpaperengine/object.cpp

@@ -12,7 +12,7 @@ namespace wp
 {
     using json = nlohmann::json;
 
-    object::object (json json_data, irr::io::path basepath)
+    object::object (json json_data)
     {
         json::const_iterator size = json_data.find ("size");
         json::const_iterator scale = json_data.find ("scale");
@@ -84,7 +84,7 @@ namespace wp
         switch (_type)
         {
             case object3d::Type::Type_Image:
-                this->m_object3d = new wp::image (json_data, basepath);
+                this->m_object3d = new wp::image (json_data);
                 break;
 
             case object3d::Type::Type_Model:
@@ -103,7 +103,7 @@ namespace wp
 
             for (; cur != end; cur ++)
             {
-                this->m_effects.push_back (new effect (*cur, basepath));
+                this->m_effects.push_back (new effect (*cur));
             }
         }
     }

wallpaperengine/object.h

@@ -15,7 +15,7 @@ namespace wp
     {
     public:
 
-        object (json json_data, irr::io::path basepath);
+        object (json json_data);
         ~object ();
 
     private:

wallpaperengine/project.cpp

@@ -2,13 +2,16 @@
 #include <iostream>
 #include <fstream>
 
+#include "fs/fileResolver.h"
+
 #include "project.h"
+#include "irrlicht.h"
 
 namespace wp
 {
     project::project (irr::io::path baseDirectory)
     {
-        irr::io::path projectFile = baseDirectory + "/project.json";
+        irr::io::path projectFile = wp::fs::resolver.resolveOnWorkingDirectory ("project.json");
 
         std::ifstream _in (projectFile.c_str ());
         this->m_content = "";
@@ -22,11 +25,8 @@ namespace wp
         if (file_it != this->m_projectFile.end ())
         {
             // load scene file
-            this->m_file = file_it.value ();
-            this->m_file = baseDirectory.c_str ();
-            this->m_file += "/";
-            this->m_file += this->m_projectFile ["file"];
-            this->m_scene = new scene (this->m_file.c_str (), baseDirectory);
+            this->m_file = wp::fs::resolver.resolveOnWorkingDirectory (*file_it);
+            this->m_scene = new scene (this->m_file.c_str ());
         }
 
         if (type_it != this->m_projectFile.end ())

wallpaperengine/project.h

@@ -20,7 +20,7 @@ namespace wp
 
         std::string m_title;
         std::string m_type;
-        std::string m_file;
+        irr::io::path m_file;
         scene* m_scene;
     };
 };

wallpaperengine/scene.cpp

@@ -9,7 +9,7 @@ namespace wp
 {
     using json = nlohmann::json;
 
-    scene::scene (irr::io::path file, irr::io::path basepath)
+    scene::scene (irr::io::path file)
     {
         std::ifstream _in (file.c_str ());
         this->m_content = "";
@@ -33,7 +33,7 @@ namespace wp
 
             for (; cur != end; cur ++)
             {
-                this->m_objects.push_back (new object (*cur, basepath));
+                this->m_objects.push_back (new object (*cur));
             }
         }
     }

wallpaperengine/scene.h

@@ -14,7 +14,7 @@ namespace wp
     class scene
     {
     public:
-        scene (irr::io::path file, irr::io::path basepath);
+        scene (irr::io::path file);
         ~scene ();
 
     private: