Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-17 18:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

New piece free movement mode.

Browse source
This commit is contained in:
Leonardo Zide 2017-11-12 19:38:07 -08:00
parent 6ca7934681
commit 470be6b7a9
4 changed files with 46 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/lc_model.cpp
View file

@ -1376,28 +1376,20 @@ void lcModel::UpdateBackgroundTexture()
void lcModel::RayTest(lcObjectRayTest& ObjectRayTest) const
{
for (int PieceIdx = 0; PieceIdx < mPieces.GetSize(); PieceIdx++)
{
lcPiece* Piece = mPieces[PieceIdx];
if (Piece->IsVisible(mCurrentStep))
for (lcPiece* Piece : mPieces)
if (Piece->IsVisible(mCurrentStep) && (!ObjectRayTest.IgnoreSelected || !Piece->IsSelected()))
Piece->RayTest(ObjectRayTest);
}
if (ObjectRayTest.PiecesOnly)
return;
for (int CameraIdx = 0; CameraIdx < mCameras.GetSize(); CameraIdx++)
{
lcCamera* Camera = mCameras[CameraIdx];
if (Camera != ObjectRayTest.ViewCamera && Camera->IsVisible())
for (lcCamera* Camera : mCameras)
if (Camera != ObjectRayTest.ViewCamera && Camera->IsVisible() && (!ObjectRayTest.IgnoreSelected || !Camera->IsSelected()))
Camera->RayTest(ObjectRayTest);
}
for (int LightIdx = 0; LightIdx < mLights.GetSize(); LightIdx++)
if (mLights[LightIdx]->IsVisible())
mLights[LightIdx]->RayTest(ObjectRayTest);
for (lcLight* Light : mLights)
if (Light->IsVisible() && (!ObjectRayTest.IgnoreSelected || !Light->IsSelected()))
Light->RayTest(ObjectRayTest);
}
void lcModel::BoxTest(lcObjectBoxTest& ObjectBoxTest) const

1
common/object.h
View file

@ -30,6 +30,7 @@ struct lcObjectRayTest
{
lcCamera* ViewCamera;
bool PiecesOnly;
bool IgnoreSelected;
lcVector3 Start;
lcVector3 End;
float Distance;

48
common/view.cpp
View file

@ -476,14 +476,13 @@ lcVector3 View::GetMoveDirection(const lcVector3& Direction) const
return axis;
}
lcMatrix44 View::GetPieceInsertPosition() const
lcMatrix44 View::GetPieceInsertPosition(bool IgnoreSelected, PieceInfo* Info) const
{
PieceInfo* CurPiece = gMainWindow->GetCurrentPieceInfo();
lcPiece* HitPiece = (lcPiece*)FindObjectUnderPointer(true).Object;
lcPiece* HitPiece = (lcPiece*)FindObjectUnderPointer(true, IgnoreSelected).Object;
if (HitPiece)
{
lcVector3 Position(0, 0, HitPiece->GetBoundingBox().Max.z - CurPiece->GetBoundingBox().Min.z);
lcVector3 Position(0, 0, HitPiece->GetBoundingBox().Max.z - Info->GetBoundingBox().Min.z);
if (gMainWindow->GetRelativeTransform())
Position = lcMul31(mModel->SnapPosition(Position), HitPiece->mModelWorld);
@ -501,7 +500,7 @@ lcMatrix44 View::GetPieceInsertPosition() const
lcVector3 Intersection;
const lcBoundingBox& BoundingBox = CurPiece->GetBoundingBox();
const lcBoundingBox& BoundingBox = Info->GetBoundingBox();
if (lcLinePlaneIntersection(&Intersection, ClickPoints[0], ClickPoints[1], lcVector4(0, 0, 1, BoundingBox.Min.z)))
{
Intersection = mModel->SnapPosition(Intersection);
@ -525,7 +524,7 @@ void View::GetRayUnderPointer(lcVector3& Start, lcVector3& End) const
End = StartEnd[1];
}
lcObjectSection View::FindObjectUnderPointer(bool PiecesOnly) const
lcObjectSection View::FindObjectUnderPointer(bool PiecesOnly, bool IgnoreSelected) const
{
lcVector3 StartEnd[2] =
{
@ -538,6 +537,7 @@ lcObjectSection View::FindObjectUnderPointer(bool PiecesOnly) const
lcObjectRayTest ObjectRayTest;
ObjectRayTest.PiecesOnly = PiecesOnly;
ObjectRayTest.IgnoreSelected = IgnoreSelected;
ObjectRayTest.ViewCamera = mCamera;
ObjectRayTest.Start = StartEnd[0];
ObjectRayTest.End = StartEnd[1];
@ -648,7 +648,7 @@ void View::OnDraw()
PieceInfo* Info = gMainWindow->GetCurrentPieceInfo();
if (Info)
Info->AddRenderMeshes(mScene, GetPieceInsertPosition(), gMainWindow->mColorIndex, true, true, false);
Info->AddRenderMeshes(mScene, GetPieceInsertPosition(false, gMainWindow->GetCurrentPieceInfo()), gMainWindow->mColorIndex, true, true, false);
}
int TotalTileRows = 1;
@ -1420,7 +1420,7 @@ void View::DrawGrid()
lcVector3 Points[8];
lcGetBoxCorners(CurPiece->GetBoundingBox(), Points);
lcMatrix44 WorldMatrix = GetPieceInsertPosition();
lcMatrix44 WorldMatrix = GetPieceInsertPosition(false, CurPiece);
for (int i = 0; i < 8; i++)
{
@ -1781,7 +1781,7 @@ void View::BeginPieceDrag()
void View::EndPieceDrag(bool Accept)
{
if (Accept)
mModel->InsertPieceToolClicked(GetPieceInsertPosition());
mModel->InsertPieceToolClicked(GetPieceInsertPosition(false, gMainWindow->GetCurrentPieceInfo()));
mDragState = LC_DRAGSTATE_NONE;
UpdateTrackTool();
@ -1995,6 +1995,20 @@ void View::UpdateTrackTool()
}
}
if (CurrentTool == LC_TOOL_SELECT && NewTrackTool == LC_TRACKTOOL_SELECT)
{
lcObjectSection ObjectSection = FindObjectUnderPointer(false, false);
lcObject* Object = ObjectSection.Object;
if (Object && Object->IsPiece() && ObjectSection.Section == LC_PIECE_SECTION_POSITION)
{
lcPiece* Piece = (lcPiece*)Object;
mMouseDownPosition = Piece->mModelWorld.GetTranslation();
mMouseDownPiece = Piece->mPieceInfo;
NewTrackTool = LC_TRACKTOOL_MOVE_XYZ;
}
}
Redraw = true;
}
break;
@ -2472,7 +2486,7 @@ void View::OnButtonDown(lcTrackButton TrackButton)
if (!CurPiece)
break;
mModel->InsertPieceToolClicked(GetPieceInsertPosition());
mModel->InsertPieceToolClicked(GetPieceInsertPosition(false, gMainWindow->GetCurrentPieceInfo()));
if ((mInputState.Modifiers & Qt::ControlModifier) == 0)
gMainWindow->SetTool(LC_TOOL_SELECT);
@ -2499,7 +2513,7 @@ void View::OnButtonDown(lcTrackButton TrackButton)
case LC_TRACKTOOL_SELECT:
{
lcObjectSection ObjectSection = FindObjectUnderPointer(false);
lcObjectSection ObjectSection = FindObjectUnderPointer(false, false);
if (mInputState.Modifiers & Qt::ControlModifier)
mModel->FocusOrDeselectObject(ObjectSection);
@ -2537,11 +2551,11 @@ void View::OnButtonDown(lcTrackButton TrackButton)
break;
case LC_TRACKTOOL_ERASER:
mModel->EraserToolClicked(FindObjectUnderPointer(false).Object);
mModel->EraserToolClicked(FindObjectUnderPointer(false, false).Object);
break;
case LC_TRACKTOOL_PAINT:
mModel->PaintToolClicked(FindObjectUnderPointer(true).Object);
mModel->PaintToolClicked(FindObjectUnderPointer(true, false).Object);
break;
case LC_TRACKTOOL_ZOOM:
@ -2586,7 +2600,7 @@ void View::OnLeftButtonDoubleClick()
{
gMainWindow->SetActiveView(this);
lcObjectSection ObjectSection = FindObjectUnderPointer(false);
lcObjectSection ObjectSection = FindObjectUnderPointer(false, false);
if (mInputState.Modifiers & Qt::ControlModifier)
mModel->FocusOrDeselectObject(ObjectSection);
@ -2774,6 +2788,12 @@ void View::OnMouseMove()
}
}
}
else if (mTrackTool == LC_TRACKTOOL_MOVE_XYZ)
{
lcMatrix44 NewPosition = GetPieceInsertPosition(true, mMouseDownPiece);
lcVector3 Distance = NewPosition.GetTranslation() - mMouseDownPosition;
mModel->UpdateMoveTool(Distance, mTrackButton != LC_TRACKBUTTON_LEFT);
}
else if (mTrackTool == LC_TRACKTOOL_SCALE_PLUS || mTrackTool == LC_TRACKTOOL_SCALE_MINUS)
{
lcVector3 Direction;

6
common/view.h
View file

@ -100,9 +100,9 @@ public:
void ShowContextMenu() const;
lcVector3 GetMoveDirection(const lcVector3& Direction) const;
lcMatrix44 GetPieceInsertPosition() const;
lcMatrix44 GetPieceInsertPosition(bool IgnoreSelected, PieceInfo* Info) const;
void GetRayUnderPointer(lcVector3& Start, lcVector3& End) const;
lcObjectSection FindObjectUnderPointer(bool PiecesOnly) const;
lcObjectSection FindObjectUnderPointer(bool PiecesOnly, bool IgnoreSelected) const;
lcArray<lcObject*> FindObjectsInBox(float x1, float y1, float x2, float y2) const;
lcModel* mModel;
@ -162,6 +162,8 @@ protected:
bool mTrackUpdated;
int mMouseDownX;
int mMouseDownY;
lcVector3 mMouseDownPosition;
PieceInfo* mMouseDownPiece;
bool mHighlight;
QImage mRenderImage;