electron-rare/leocad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better piece insert position when using the keyboard.

Browse Source
This commit is contained in:
Leonardo Zide
2024-05-27 11:55:38 -07:00
parent cb6a836178
commit 18224e8095
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_application.h
-1
View File
@@ -1,6 +1,5 @@
#pragma once #pragma once
#include "lc_array.h"
#include "lc_math.h" #include "lc_math.h"
class Project; class Project;
common/lc_model.cpp
+7 -7
View File
@@ -2273,9 +2273,9 @@ lcMatrix33 lcModel::GetRelativeRotation() const
void lcModel::AddPiece() void lcModel::AddPiece()
{ {
PieceInfo* CurPiece = gMainWindow->GetCurrentPieceInfo(); PieceInfo* PieceInfo = gMainWindow->GetCurrentPieceInfo();
if (!CurPiece) if (!PieceInfo)
return; return;
lcPiece* Last = mPieces.empty() ? nullptr : mPieces[mPieces.size() - 1]; lcPiece* Last = mPieces.empty() ? nullptr : mPieces[mPieces.size() - 1];
@@ -2290,11 +2290,12 @@ void lcModel::AddPiece()
} }
lcMatrix44 WorldMatrix; lcMatrix44 WorldMatrix;
const lcBoundingBox& PieceInfoBoundingBox = PieceInfo->GetBoundingBox();
if (Last) if (Last)
{ {
const lcBoundingBox& BoundingBox = Last->GetBoundingBox(); const lcBoundingBox& LastBoundingBox = Last->GetBoundingBox();
lcVector3 Dist(0, 0, BoundingBox.Max.z - BoundingBox.Min.z); lcVector3 Dist(0, 0, LastBoundingBox.Max.z - PieceInfoBoundingBox.Min.z);
Dist = SnapPosition(Dist); Dist = SnapPosition(Dist);
WorldMatrix = Last->mModelWorld; WorldMatrix = Last->mModelWorld;
@@ -2302,11 +2303,10 @@ void lcModel::AddPiece()
} }
else else
{ {
const lcBoundingBox& BoundingBox = CurPiece->GetBoundingBox(); WorldMatrix = lcMatrix44Translation(lcVector3(0.0f, 0.0f, -PieceInfoBoundingBox.Min.z));
WorldMatrix = lcMatrix44Translation(lcVector3(0.0f, 0.0f, -BoundingBox.Min.z));
} }
lcPiece* Piece = new lcPiece(CurPiece); lcPiece* Piece = new lcPiece(PieceInfo);
Piece->Initialize(WorldMatrix, mCurrentStep); Piece->Initialize(WorldMatrix, mCurrentStep);
Piece->SetColorIndex(gMainWindow->mColorIndex); Piece->SetColorIndex(gMainWindow->mColorIndex);
AddPiece(Piece); AddPiece(Piece);