haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TRACK_BALL: Allow two input devices to simultaneously pan & rotate 

Instead of the mouse pan and drag algorithms calculating the new
position or rotation values relative to a starting value, the new values
are calculated relative to the current values. This allows the user to
use a second input device to move or rotate the view at the same time
without its change being undone by the mouse.
This commit is contained in:
markus-bonk 2021-06-11 15:10:36 +02:00 committed by Wayne Stambaugh
parent 27063688b3
commit cd82a927c2
4 changed files with 27 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
3d-viewer/3d_rendering/camera.cpp
View File

@ -125,7 +125,12 @@ void CAMERA::SetBoardLookAtPos( const SFVEC3F& aBoardPos )
if( m_board_lookat_pos_init != aBoardPos )
{
m_board_lookat_pos_init = aBoardPos;
SetLookAtPos( aBoardPos );
m_lookat_pos = aBoardPos;
m_parametersChanged = true;
updateViewMatrix();
updateFrustum();
}
}

1
3d-viewer/3d_rendering/camera.h
View File

@ -110,7 +110,6 @@ public:
float GetFar() const { return m_frustum.farD; }
void SetBoardLookAtPos( const SFVEC3F& aBoardPos );
virtual void SetLookAtPos( const SFVEC3F& aLookAtPos ) = 0;
void SetLookAtPos_T1( const SFVEC3F& aLookAtPos )
{

65
3d-viewer/3d_rendering/track_ball.cpp
View File

@ -33,22 +33,20 @@
#include "../3d_math.h"
#include <wx/log.h>
#include <glm/gtc/quaternion.hpp>
TRACK_BALL::TRACK_BALL( float aInitialDistance ) :
CAMERA( aInitialDistance )
{
wxLogTrace( m_logTrace, wxT( "TRACK_BALL::TRACK_BALL" ) );
memset( m_quat, 0, sizeof( m_quat ) );
memset( m_quat_t0, 0, sizeof( m_quat_t0 ) );
memset( m_quat_t1, 0, sizeof( m_quat_t1 ) );
trackball( m_quat, 0.0, 0.0, 0.0, 0.0 );
trackball( m_quat_t0, 0.0, 0.0, 0.0, 0.0 );
trackball( m_quat_t1, 0.0, 0.0, 0.0, 0.0 );
}
void TRACK_BALL::Drag( const wxPoint& aNewMousePosition )
{
m_parametersChanged = true;
@ -64,34 +62,15 @@ void TRACK_BALL::Drag( const wxPoint& aNewMousePosition )
zoom * ( 2.0 * aNewMousePosition.x - m_windowSize.x ) / m_windowSize.x,
zoom * ( m_windowSize.y - 2.0 * aNewMousePosition.y ) / m_windowSize.y );
add_quats( spin_quat, m_quat, m_quat );
float rotationMatrix[4][4];
build_rotmatrix( rotationMatrix, m_quat );
m_rotationMatrix = glm::make_mat4( &rotationMatrix[0][0] );
float spin_matrix[4][4];
build_rotmatrix( spin_matrix, spin_quat );
m_rotationMatrix = glm::make_mat4( &spin_matrix[0][0] ) * m_rotationMatrix;
updateViewMatrix();
updateFrustum();
}
void TRACK_BALL::SetLookAtPos( const SFVEC3F& aLookAtPos )
{
if( m_lookat_pos != aLookAtPos )
{
m_lookat_pos = aLookAtPos;
updateViewMatrix();
updateFrustum();
m_parametersChanged = true;
}
}
void TRACK_BALL::Pan( const wxPoint& aNewMousePosition )
{
m_parametersChanged = true;
@ -116,7 +95,6 @@ void TRACK_BALL::Pan( const wxPoint& aNewMousePosition )
updateFrustum();
}
void TRACK_BALL::Pan( const SFVEC3F& aDeltaOffsetInc )
{
m_parametersChanged = true;
@ -127,22 +105,11 @@ void TRACK_BALL::Pan( const SFVEC3F& aDeltaOffsetInc )
updateFrustum();
}
void TRACK_BALL::Pan_T1( const SFVEC3F& aDeltaOffsetInc )
{
m_camera_pos_t1 = m_camera_pos + aDeltaOffsetInc;
}
void TRACK_BALL::Reset()
{
CAMERA::Reset();
memset( m_quat, 0, sizeof( m_quat ) );
trackball( m_quat, 0.0, 0.0, 0.0, 0.0 );
}
void TRACK_BALL::Reset_T1()
{
CAMERA::Reset_T1();
@ -151,15 +118,19 @@ void TRACK_BALL::Reset_T1()
trackball( m_quat_t1, 0.0, 0.0, 0.0, 0.0 );
}
void TRACK_BALL::SetT0_and_T1_current_T()
{
CAMERA::SetT0_and_T1_current_T();
memcpy( m_quat_t0, m_quat, sizeof( m_quat ) );
memcpy( m_quat_t1, m_quat, sizeof( m_quat ) );
}
double quat[4];
// Charge the quaternions with the current rotation matrix to allow dual input.
std::copy_n( glm::value_ptr( glm::conjugate( glm::quat_cast( m_rotationMatrix ) ) ),
sizeof( quat ) / sizeof( quat[0] ), quat );
memcpy( m_quat_t0, quat, sizeof( quat ) );
memcpy( m_quat_t1, quat, sizeof( quat ) );
}
void TRACK_BALL::Interpolate( float t )
{
@ -184,15 +155,15 @@ void TRACK_BALL::Interpolate( float t )
}
const float t0 = 1.0f - t;
m_quat[0] = m_quat_t0[0] * t0 + m_quat_t1[0] * t;
m_quat[1] = m_quat_t0[1] * t0 + m_quat_t1[1] * t;
m_quat[2] = m_quat_t0[2] * t0 + m_quat_t1[2] * t;
m_quat[3] = m_quat_t0[3] * t0 + m_quat_t1[3] * t;
double quat[4];
quat[0] = m_quat_t0[0] * t0 + m_quat_t1[0] * t;
quat[1] = m_quat_t0[1] * t0 + m_quat_t1[1] * t;
quat[2] = m_quat_t0[2] * t0 + m_quat_t1[2] * t;
quat[3] = m_quat_t0[3] * t0 + m_quat_t1[3] * t;
float rotationMatrix[4][4];
build_rotmatrix( rotationMatrix, m_quat );
build_rotmatrix( rotationMatrix, quat );
m_rotationMatrix = glm::make_mat4( &rotationMatrix[0][0] );

7
3d-viewer/3d_rendering/track_ball.h
View File

@ -50,10 +50,6 @@ public:
void Pan_T1( const SFVEC3F& aDeltaOffsetInc ) override;
void SetLookAtPos( const SFVEC3F& aLookAtPos ) override;
void Reset() override;
void Reset_T1() override;
void SetT0_and_T1_current_T() override;
@ -62,9 +58,8 @@ public:
private:
/**
* quarternion of the trackball
* interpolate quaternions of the trackball
*/
double m_quat[4];
double m_quat_t0[4];
double m_quat_t1[4];
};