diff --git a/assets/scene.blend b/assets/scene.blend index 7aeb755..b0e7c20 100644 --- a/assets/scene.blend +++ b/assets/scene.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a49af0d2be3b605289a9eb7813a23f4159806433bdb628f90f4efb247955c82 -size 11072653 +oid sha256:7bdb5ad0036f9cc277752cd8fa4e5e5844168a3e1e71bdaea747a537ce021031 +size 11095665 diff --git a/assets/scene.glb b/assets/scene.glb index 0012d30..48a4b5c 100644 --- a/assets/scene.glb +++ b/assets/scene.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70534de0b2882fc3b003997671a21cdd71c3ccdad8b837dc50add27cd52e3855 -size 3443492 +oid sha256:1e48376251379c8a4c5468202fe4798c06778a37df80fe6e2f000c8110709f15 +size 3457104 diff --git a/src/graphics/monitor/turbine.cpp b/src/graphics/monitor/turbine.cpp index 2b978d3..fb85f78 100644 --- a/src/graphics/monitor/turbine.cpp +++ b/src/graphics/monitor/turbine.cpp @@ -66,9 +66,6 @@ void Turbine::remesh_static(Mesh& rmesh) mesh.load_text(ss.str().c_str(), 0.04); rmesh.add(mesh, mat); - mesh.load_text("Synchroscope", 0.04); - rmesh.add(mesh, glm::translate(mat, glm::vec3(0, 0.6, 0))); - rmesh.add(g_synchroscope_dial); rmesh.add(g_switch_breaker); } @@ -94,7 +91,7 @@ void Turbine::remesh_slow(Mesh& rmesh) Util::Streams::show_units( ss, sys.loop.generator.get_energy_generated() ) << "W\n"; mesh.load_text(ss.str().c_str(), 0.04); - rmesh.add(mesh, glm::translate(mat, glm::vec3(0.4, 0.7, 0))); + rmesh.add(mesh, glm::translate(mat, glm::vec3(0.4, 0.75, 0))); ss = std::stringstream(); @@ -102,11 +99,6 @@ void Turbine::remesh_slow(Mesh& rmesh) ss << show( sys.grid.frequency ) << " Hz\n"; mesh.load_text(ss.str().c_str(), 0.04); - rmesh.add(mesh, glm::translate(mat, glm::vec3(0.7, 0.7, 0))); -} - -void Turbine::remesh_fast(Mesh& rmesh) -{ - System& sys = *System::active; + rmesh.add(mesh, glm::translate(mat, glm::vec3(0.7, 0.75, 0))); } diff --git a/src/graphics/monitor/turbine.hpp b/src/graphics/monitor/turbine.hpp index dc52232..fc64fcf 100644 --- a/src/graphics/monitor/turbine.hpp +++ b/src/graphics/monitor/turbine.hpp @@ -23,7 +23,6 @@ public: virtual void get_static_transforms(std::vector& transforms); virtual void remesh_static(Mesh& rmesh); virtual void remesh_slow(Mesh& rmesh); - virtual void remesh_fast(Mesh& rmesh); }; };