Remove the idea of just re-sorting transparency due to billboards (#96)

Just do a full regenerate for now. Also filters were wrong for some reason for some images #95
chreden · Apr 9, 2018 · 4d3c5eb · 4d3c5eb
1 parent e4f647c
commit 4d3c5eb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/trview/Level.cpp b/trview/Level.cpp
@@ -173,11 +173,10 @@ namespace trview
             }
         }
 
-        if (_resort_transparency || _regenerate_transparency)
+        if (_regenerate_transparency)
         {
             // Sort the accumulated transparent triangles farthest to nearest.
             _transparency->sort(camera.position());
-            _resort_transparency = false;
         }
 
         _regenerate_transparency = false;
@@ -314,6 +313,6 @@ namespace trview
 
     void Level::on_camera_moved()
     {
-        _resort_transparency = true;
+        _regenerate_transparency = true;
     }
 }
diff --git a/trview/Level.h b/trview/Level.h
@@ -117,6 +117,5 @@ namespace trview
         std::unique_ptr<TransparencyBuffer> _transparency;
 
         bool _regenerate_transparency{ true };
-        bool _resort_transparency{ true };
     };
 }
diff --git a/trview/Viewer.cpp b/trview/Viewer.cpp
@@ -469,6 +469,11 @@ namespace trview
 
                 const float Speed = 10;
                 _free_camera.move(movement * _timer.elapsed() * Speed);
+
+                if (_level)
+                {
+                    _level->on_camera_moved();
+                }
             }
         }
     }

diff --git a/trview/trview.vcxproj b/trview/trview.vcxproj
@@ -227,8 +227,8 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="resources\buttonup.png" />
-    <Image Include="resources\check_off.png" />
-    <Image Include="resources\check_on.png" />
+    <Image Include="resources\checkoff.png" />
+    <Image Include="resources\checkon.png" />
     <Image Include="resources\numericdown.png" />
     <Image Include="resources\numericup.png" />
     <Image Include="resources\tomb1.png" />

diff --git a/trview/trview.vcxproj.filters b/trview/trview.vcxproj.filters
@@ -271,13 +271,13 @@
     <Image Include="resources\numericup.png">
       <Filter>Resources</Filter>
     </Image>
-    <Image Include="resources\check_off.png">
+    <Image Include="resources\buttonup.png">
       <Filter>Resources</Filter>
     </Image>
-    <Image Include="resources\check_on.png">
+    <Image Include="resources\checkon.png">
       <Filter>Resources</Filter>
     </Image>
-    <Image Include="resources\buttonup.png">
+    <Image Include="resources\checkoff.png">
       <Filter>Resources</Filter>
     </Image>
   </ItemGroup>