eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

virtual slider mouse input mode, minor refactoring, minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2018-07-11 17:45:50 +02:00
parent 1056f9bb14
commit 12d70fe320
20 changed files with 330 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sceneeditor.cpp
View File

@@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/.
#include "globals.h"
#include "simulation.h"
#include "uilayer.h"
#include "renderer.h"
namespace scene {
@@ -46,7 +47,7 @@ basic_editor::on_mouse_button( int const Button, int const Action ) {
m_node = GfxRenderer.Update_Pick_Node();
m_nodesnapshot = { m_node };
if( m_node ) {
glfwSetInputMode( Global.window, GLFW_CURSOR, GLFW_CURSOR_DISABLED );
UILayer.set_cursor( GLFW_CURSOR_DISABLED );
}
}
else {
@@ -54,7 +55,7 @@ basic_editor::on_mouse_button( int const Button, int const Action ) {
// TODO: record the current undo step on the undo stack
m_nodesnapshot = { m_node };
if( m_node ) {
glfwSetInputMode( Global.window, GLFW_CURSOR, GLFW_CURSOR_NORMAL );
UILayer.set_cursor( GLFW_CURSOR_NORMAL );
}
}
@@ -136,9 +137,9 @@ basic_editor::translate( float const Offset ) {
void
basic_editor::translate_instance( TAnimModel *Instance, glm::dvec3 const &Location ) {
simulation::Region->erase_instance( Instance );
simulation::Region->erase( Instance );
Instance->location( Location );
simulation::Region->insert_instance( Instance, scene::scratch_data() );
simulation::Region->insert( Instance );
}
void
@@ -152,9 +153,9 @@ basic_editor::translate_instance( TAnimModel *Instance, float const Offset ) {
void
basic_editor::translate_memorycell( TMemCell *Memorycell, glm::dvec3 const &Location ) {
simulation::Region->erase_memorycell( Memorycell );
simulation::Region->erase( Memorycell );
Memorycell->location( Location );
simulation::Region->insert_memorycell( Memorycell, scene::scratch_data() );
simulation::Region->insert( Memorycell );
}
void
@@ -182,8 +183,8 @@ basic_editor::rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ) {
glm::vec3 angle = glm::dvec3 { Instance->Angles() };
angle.y = clamp_circular( angle.y + Angle.y, 360.f );
if( mode_snap() ) {
auto const quantizationstep { 15.f };
angle.y = quantizationstep * std::round( angle.y * ( 1.f / quantizationstep ) );
// TBD, TODO: adjustable quantization step
angle.y = quantize( angle.y, 15.f );
}
Instance->Angles( angle );
// update scene