jay
/
fast-nuclear-sim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modelling

This commit is contained in:
Jay Robson 2024-03-03 12:24:33 +11:00
parent 1f25edeeee
commit a270d3d601
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/scene.blend (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/scene.glb (Stored with Git LFS)
View File

Binary file not shown.

12
src/graphics/monitor/turbine.cpp
View File

@ -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)));
}

1
src/graphics/monitor/turbine.hpp
View File

@ -23,7 +23,6 @@ public:
virtual void get_static_transforms(std::vector<glm::mat4>& transforms);
virtual void remesh_static(Mesh& rmesh);
virtual void remesh_slow(Mesh& rmesh);
virtual void remesh_fast(Mesh& rmesh);
};
};