Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implemented plane-switching logic #42

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implemented plane-switching logic #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions ImGuizmo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,6 +1458,25 @@ namespace ImGuizmo
const vec_t movePlanNormal[] = { gContext.mModel.v.up, gContext.mModel.v.dir, gContext.mModel.v.right, gContext.mModel.v.dir, gContext.mModel.v.right, gContext.mModel.v.up, -gContext.mCameraDir };
// pickup plan
gContext.mTranslationPlan = BuildPlan(gContext.mModel.v.position, movePlanNormal[type - MOVE_X]);

vec_t dirVec = gContext.mRayOrigin - gContext.mModel.v.position;
const float dotP = Dot(dirVec, gContext.mTranslationPlan);

// this means that the view direction vector is coplanar with the translation plane.
// If this is the case, we should modify the plane if the movement type is along a single axis
// FLT_EPSILON isn't big enough for this value for some reason
if (fabsf(dotP) < 0.001f && type >= MOVE_X && type <= MOVE_Z)
{
// intersect with a different plane, that still keeps the movement vector as a direction vector
vec_t normDir = movePlanNormal[type - MOVE_X];

int axisIndex = gContext.mCurrentOperation - MOVE_X;
const vec_t& axisValue = *(vec_t*)&gContext.mModel.m[axisIndex];

vec_t newNorm = Cross(normDir, axisValue);
gContext.mTranslationPlan = BuildPlan(gContext.mModel.v.position, newNorm);
}

const float len = IntersectRayPlane(gContext.mRayOrigin, gContext.mRayVector, gContext.mTranslationPlan);
gContext.mTranslationPlanOrigin = gContext.mRayOrigin + gContext.mRayVector * len;
gContext.mMatrixOrigin = gContext.mModel.v.position;
Expand Down Expand Up @@ -1487,7 +1506,24 @@ namespace ImGuizmo
// pickup plan

gContext.mTranslationPlan = BuildPlan(gContext.mModel.v.position, movePlanNormal[type - SCALE_X]);
vec_t dirVec = gContext.mRayOrigin - gContext.mModel.v.position;
const float dotP = Dot(dirVec, gContext.mTranslationPlan);
// this means that the view direction vector is coplanar with the translation plane.
// If this is the case, we should modify the plane if the movement type is along a single axis
// FLT_EPSILON isn't big enough for this value for some reason
if (fabsf(dotP) < 0.001f && type >= SCALE_X && type <= SCALE_Z)
{
// intersect with a different plane, that still keeps the movement vector as a direction vector
vec_t normDir = movePlanNormal[type - SCALE_X];

int axisIndex = gContext.mCurrentOperation - SCALE_X;
const vec_t& axisValue = *(vec_t*)&gContext.mModel.m[axisIndex];

vec_t newNorm = Cross(normDir, axisValue);
gContext.mTranslationPlan = BuildPlan(gContext.mModel.v.position, newNorm);
}
const float len = IntersectRayPlane(gContext.mRayOrigin, gContext.mRayVector, gContext.mTranslationPlan);

gContext.mTranslationPlanOrigin = gContext.mRayOrigin + gContext.mRayVector * len;
gContext.mMatrixOrigin = gContext.mModel.v.position;
gContext.mScale.Set(1.f, 1.f, 1.f);
Expand Down