From c8dca012f9a860c55c7299eb8fc950ba597ba0ee Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Tue, 3 Feb 2026 21:46:00 -0800 Subject: [PATCH] Replaced bool Ortho with lcCameraProjection::Orthographic for clarity. --- common/camera.cpp | 86 +++++++++++++++++----------------- common/camera.h | 27 +++-------- common/lc_application.cpp | 2 +- common/lc_mainwindow.cpp | 6 +-- common/lc_model.cpp | 8 ++-- common/lc_model.h | 3 +- common/lc_objectproperty.h | 2 +- common/lc_propertieswidget.cpp | 6 +-- common/lc_view.cpp | 17 +++---- common/lc_view.h | 3 +- common/light.cpp | 12 ++--- common/light.h | 9 ++-- common/object.cpp | 4 +- common/piece.cpp | 8 ++-- 14 files changed, 91 insertions(+), 102 deletions(-) diff --git a/common/camera.cpp b/common/camera.cpp index 813a78c4..378bc29a 100644 --- a/common/camera.cpp +++ b/common/camera.cpp @@ -65,35 +65,35 @@ void lcCamera::CopyProperties(const lcCamera& Other) mPosition = Other.mPosition; mTargetPosition = Other.mTargetPosition; mUpVector = Other.mUpVector; - - SetOrtho(Other.IsOrtho()); + + mProjection = Other.mProjection; } -QString lcCamera::GetCameraTypeString(lcCameraType CameraType) +QString lcCamera::GetCameraProjectionString(lcCameraProjection CameraProjection) { - switch (CameraType) + switch (CameraProjection) { - case lcCameraType::Perspective: - return QT_TRANSLATE_NOOP("Camera Type", "Perspective"); + case lcCameraProjection::Perspective: + return QT_TRANSLATE_NOOP("Camera Projection", "Perspective"); - case lcCameraType::Orthographic: - return QT_TRANSLATE_NOOP("Camera Type", "Orthographic"); + case lcCameraProjection::Orthographic: + return QT_TRANSLATE_NOOP("Camera Projection", "Orthographic"); - case lcCameraType::Count: + case lcCameraProjection::Count: break; } return QString(); } -QStringList lcCamera::GetCameraTypeStrings() +QStringList lcCamera::GetCameraProjectionStrings() { - QStringList CameraType; + QStringList CameraProjections; - for (int CameraTypeIndex = 0; CameraTypeIndex < static_cast(lcCameraType::Count); CameraTypeIndex++) - CameraType.push_back(GetCameraTypeString(static_cast(CameraTypeIndex))); + for (int CameraProjectionIndex = 0; CameraProjectionIndex < static_cast(lcCameraProjection::Count); CameraProjectionIndex++) + CameraProjections.push_back(GetCameraProjectionString(static_cast(CameraProjectionIndex))); - return CameraType; + return CameraProjections; } lcViewpoint lcCamera::GetViewpoint(const QString& ViewpointName) @@ -175,15 +175,15 @@ void lcCamera::CreateName(const std::vector>& Cameras) mName = Prefix + QString::number(MaxCameraNumber + 1); } -bool lcCamera::SetCameraType(lcCameraType CameraType) +bool lcCamera::SetProjection(lcCameraProjection CameraProjection) { - if (static_cast(CameraType) < 0 || CameraType >= lcCameraType::Count) + if (static_cast(CameraProjection) < 0 || CameraProjection >= lcCameraProjection::Count) return false; - if (GetCameraType() == CameraType) + if (GetProjection() == CameraProjection) return false; - - SetOrtho(CameraType == lcCameraType::Orthographic); + + mProjection = CameraProjection; return true; } @@ -203,7 +203,7 @@ void lcCamera::SaveLDraw(QTextStream& Stream) const if (IsHidden()) Stream << QLatin1String("HIDDEN"); - if (IsOrtho()) + if (mProjection == lcCameraProjection::Orthographic) Stream << QLatin1String("ORTHOGRAPHIC "); Stream << QLatin1String("NAME ") << mName << LineEnding; @@ -219,7 +219,7 @@ bool lcCamera::ParseLDrawLine(QTextStream& Stream) if (Token == QLatin1String("HIDDEN")) SetHidden(true); else if (Token == QLatin1String("ORTHOGRAPHIC")) - SetOrtho(true); + SetProjection(lcCameraProjection::Orthographic); else if (Token == QLatin1String("FOV")) Stream >> m_fovy; else if (Token == QLatin1String("ZNEAR")) @@ -494,16 +494,16 @@ void lcCamera::CopyPosition(const lcCamera* Camera) mPosition = Camera->mPosition; mTargetPosition = Camera->mTargetPosition; mUpVector = Camera->mUpVector; - mState |= (Camera->mState & LC_CAMERA_ORTHO); + mProjection = Camera->mProjection; } -void lcCamera::CopySettings(const lcCamera* camera) +void lcCamera::CopySettings(const lcCamera* Camera) { - m_fovy = camera->m_fovy; - m_zNear = camera->m_zNear; - m_zFar = camera->m_zFar; + m_fovy = Camera->m_fovy; + m_zNear = Camera->m_zNear; + m_zFar = Camera->m_zFar; - mState |= (camera->mState & LC_CAMERA_ORTHO); + mProjection = Camera->mProjection; } void lcCamera::DrawInterface(lcContext* Context, const lcScene& Scene) const @@ -670,8 +670,8 @@ QVariant lcCamera::GetPropertyValue(lcObjectPropertyId PropertyId) const case lcObjectPropertyId::CameraName: return GetName(); - case lcObjectPropertyId::CameraType: - return static_cast(GetCameraType()); + case lcObjectPropertyId::CameraProjection: + return static_cast(GetProjection()); case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: @@ -732,8 +732,8 @@ bool lcCamera::SetPropertyValue(lcObjectPropertyId PropertyId, lcStep Step, bool case lcObjectPropertyId::CameraName: return SetName(Value.toString()); - case lcObjectPropertyId::CameraType: - return SetCameraType(static_cast(Value.toInt())); + case lcObjectPropertyId::CameraProjection: + return SetProjection(static_cast(Value.toInt())); case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: @@ -787,7 +787,7 @@ bool lcCamera::HasKeyFrame(lcObjectPropertyId PropertyId, lcStep Time) const case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: case lcObjectPropertyId::CameraFar: @@ -848,7 +848,7 @@ bool lcCamera::SetKeyFrame(lcObjectPropertyId PropertyId, lcStep Time, bool KeyF case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: case lcObjectPropertyId::CameraFar: @@ -916,7 +916,8 @@ bool lcCamera::SaveUndoData(QDataStream& Stream, const lcModel* Model) const Stream << m_zNear; Stream << m_zFar; Stream << mName; - Stream << (mState & (LC_CAMERA_HIDDEN | LC_CAMERA_ORTHO)); + Stream << mProjection; + Stream << (mState & LC_CAMERA_HIDDEN); return mPosition.SaveUndoData(Stream) && mTargetPosition.SaveUndoData(Stream) && mUpVector.SaveUndoData(Stream); } @@ -929,11 +930,12 @@ bool lcCamera::LoadUndoData(QDataStream& Stream, const lcModel* Model) Stream >> m_zNear; Stream >> m_zFar; Stream >> mName; + Stream >> mProjection; quint32 State; Stream >> State; - mState = (mState & ~(LC_CAMERA_HIDDEN | LC_CAMERA_ORTHO)) | State; + mState = (mState & ~LC_CAMERA_HIDDEN) | State; return mPosition.LoadUndoData(Stream) && mTargetPosition.LoadUndoData(Stream) && mUpVector.LoadUndoData(Stream); } @@ -1065,8 +1067,8 @@ void lcCamera::RemoveTime(lcStep Start, lcStep Time) void lcCamera::ZoomExtents(float AspectRatio, const lcVector3& Center, const std::vector& Points, lcStep Step, bool AddKey) { lcVector3 Position, TargetPosition; - - if (IsOrtho()) + + if (GetProjection() == lcCameraProjection::Orthographic) { float MinX = FLT_MAX, MaxX = -FLT_MAX, MinY = FLT_MAX, MaxY = -FLT_MAX; @@ -1125,8 +1127,8 @@ void lcCamera::ZoomExtents(float AspectRatio, const lcVector3& Center, const std void lcCamera::ZoomRegion(float AspectRatio, const lcVector3& Position, const lcVector3& TargetPosition, const lcVector3* Corners, lcStep Step, bool AddKey) { lcVector3 NewPosition; - - if (IsOrtho()) + + if (GetProjection() == lcCameraProjection::Orthographic) { float MinX = FLT_MAX, MaxX = -FLT_MAX, MinY = FLT_MAX, MaxY = -FLT_MAX; @@ -1175,7 +1177,7 @@ void lcCamera::Zoom(float Distance, lcStep Step, bool AddKey) FrontVector *= -5.0f * Distance; // Don't zoom ortho in if it would cross the ortho focal plane. - if (IsOrtho()) + if (GetProjection() == lcCameraProjection::Orthographic) { if ((Distance > 0) && (lcDot(mPosition + FrontVector - mTargetPosition, mPosition - mTargetPosition) <= 0)) return; @@ -1185,8 +1187,8 @@ void lcCamera::Zoom(float Distance, lcStep Step, bool AddKey) AddKey = false; mPosition.ChangeKey(mPosition + FrontVector, Step, AddKey); - - if (!IsOrtho()) + + if (GetProjection() != lcCameraProjection::Orthographic) mTargetPosition.ChangeKey(mTargetPosition + FrontVector, Step, AddKey); UpdatePosition(Step); diff --git a/common/camera.h b/common/camera.h index 6b54da3a..4fe75b46 100644 --- a/common/camera.h +++ b/common/camera.h @@ -5,7 +5,6 @@ #define LC_CAMERA_HIDDEN 0x01 #define LC_CAMERA_SIMPLE 0x02 -#define LC_CAMERA_ORTHO 0x04 enum class lcViewpoint { @@ -19,7 +18,7 @@ enum class lcViewpoint Count }; -enum class lcCameraType +enum class lcCameraProjection { Perspective, Orthographic, @@ -46,8 +45,8 @@ public: lcCamera& operator=(const lcCamera&) = delete; lcCamera& operator=(lcCamera&&) = delete; - static QString GetCameraTypeString(lcCameraType CameraType); - static QStringList GetCameraTypeStrings(); + static QString GetCameraProjectionString(lcCameraProjection CameraProjection); + static QStringList GetCameraProjectionStrings(); static lcViewpoint GetViewpoint(const QString& ViewpointName); void CopyProperties(const lcCamera& Other); @@ -65,25 +64,12 @@ public: return (mState & LC_CAMERA_SIMPLE) != 0; } - lcCameraType GetCameraType() const + lcCameraProjection GetProjection() const { - return ((mState & LC_CAMERA_ORTHO) == 0) ? lcCameraType::Perspective : lcCameraType::Orthographic; + return mProjection; } - bool SetCameraType(lcCameraType CameraType); - - bool IsOrtho() const - { - return (mState & LC_CAMERA_ORTHO) != 0; - } - - void SetOrtho(bool Ortho) - { - if (Ortho) - mState |= LC_CAMERA_ORTHO; - else - mState &= ~LC_CAMERA_ORTHO; - } + bool SetProjection(lcCameraProjection CameraProjection); quint32 GetAllowedTransforms() const override { @@ -228,4 +214,5 @@ protected: QString mName; quint32 mState; + lcCameraProjection mProjection = lcCameraProjection::Perspective; }; diff --git a/common/lc_application.cpp b/common/lc_application.cpp index 2a4f7a07..c113d580 100644 --- a/common/lc_application.cpp +++ b/common/lc_application.cpp @@ -1059,7 +1059,7 @@ lcStartupMode lcApplication::Initialize(const QList>& Libra ActiveView->SetCamera(Options.CameraName); else { - ActiveView->SetProjection(Options.Orthographic); + ActiveView->SetCameraProjection(Options.Orthographic ? lcCameraProjection::Orthographic : lcCameraProjection::Perspective); if (Options.SetFoV) ActiveView->GetCamera()->m_fovy = Options.FoV; diff --git a/common/lc_mainwindow.cpp b/common/lc_mainwindow.cpp index c9ba555b..18462216 100644 --- a/common/lc_mainwindow.cpp +++ b/common/lc_mainwindow.cpp @@ -2232,7 +2232,7 @@ void lcMainWindow::ProjectionMenuAboutToShow() if (ActiveView) { - if (ActiveView->GetCamera()->IsOrtho()) + if (ActiveView->GetCamera()->GetProjection() == lcCameraProjection::Orthographic) mActions[LC_VIEW_PROJECTION_ORTHO]->setChecked(true); else mActions[LC_VIEW_PROJECTION_PERSPECTIVE]->setChecked(true); @@ -2885,12 +2885,12 @@ void lcMainWindow::HandleCommand(lcCommandId CommandId) case LC_VIEW_PROJECTION_PERSPECTIVE: if (ActiveView) - ActiveView->SetProjection(false); + ActiveView->SetCameraProjection(lcCameraProjection::Perspective); break; case LC_VIEW_PROJECTION_ORTHO: if (ActiveView) - ActiveView->SetProjection(true); + ActiveView->SetCameraProjection(lcCameraProjection::Orthographic); break; case LC_VIEW_TOGGLE_VIEW_SPHERE: diff --git a/common/lc_model.cpp b/common/lc_model.cpp index 9f4f060a..4567f90b 100644 --- a/common/lc_model.cpp +++ b/common/lc_model.cpp @@ -3702,9 +3702,9 @@ void lcModel::SetSelectedPiecesStepHide(lcStep Step) } } -void lcModel::SetCameraOrthographic(lcCamera* Camera, bool Ortho) +void lcModel::SetCameraProjection(lcCamera* Camera, lcCameraProjection CameraProjection) { - if (Camera->IsOrtho() == Ortho) + if (Camera->GetProjection() == CameraProjection) return; if (!Camera->IsSimple()) @@ -3713,7 +3713,7 @@ void lcModel::SetCameraOrthographic(lcCamera* Camera, bool Ortho) BeginObjectEditAction(lcModelActionObjectEditMode::EditCamera, Camera); } - Camera->SetOrtho(Ortho); + Camera->SetProjection(CameraProjection); Camera->UpdatePosition(mCurrentStep); if (!Camera->IsSimple()) @@ -3820,7 +3820,7 @@ void lcModel::EndPropertyEdit(lcObjectPropertyId PropertyId, bool Accept) case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: break; case lcObjectPropertyId::CameraFOV: diff --git a/common/lc_model.h b/common/lc_model.h index e3bc4112..e85fa68d 100644 --- a/common/lc_model.h +++ b/common/lc_model.h @@ -4,6 +4,7 @@ #include "lc_commands.h" enum class lcObjectPropertyId; +enum class lcCameraProjection; class lcModelAction; class lcModelActionSelection; class lcModelActionObjectEdit; @@ -389,7 +390,7 @@ public: void SetObjectsProperty(const std::vector& Objects, lcObjectPropertyId PropertyId, QVariant Value, bool AddUndo); void EndPropertyEdit(lcObjectPropertyId PropertyId, bool Accept); - void SetCameraOrthographic(lcCamera* Camera, bool Ortho); + void SetCameraProjection(lcCamera* Camera, lcCameraProjection CameraProjection); void SetCameraFOV(lcCamera* Camera, float FOV, bool Checkpoint); void SetCameraZNear(lcCamera* Camera, float ZNear, bool Checkpoint); void SetCameraZFar(lcCamera* Camera, float ZFar, bool Checkpoint); diff --git a/common/lc_objectproperty.h b/common/lc_objectproperty.h index 8d572e6d..d2dde646 100644 --- a/common/lc_objectproperty.h +++ b/common/lc_objectproperty.h @@ -7,7 +7,7 @@ enum class lcObjectPropertyId PieceStepShow, PieceStepHide, CameraName, - CameraType, + CameraProjection, CameraFOV, CameraNear, CameraFar, diff --git a/common/lc_propertieswidget.cpp b/common/lc_propertieswidget.cpp index d5b6f7f2..86a103a8 100644 --- a/common/lc_propertieswidget.cpp +++ b/common/lc_propertieswidget.cpp @@ -493,7 +493,7 @@ void lcPropertiesWidget::UpdateFloat(lcObjectPropertyId PropertyId, float Value) case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: break; case lcObjectPropertyId::CameraFOV: @@ -1159,7 +1159,7 @@ void lcPropertiesWidget::CreateWidgets() AddCategory(CategoryIndex::Camera, tr("Camera")); AddStringProperty(lcObjectPropertyId::CameraName, tr("Name"), tr("Camera name"), false); - AddStringListProperty(lcObjectPropertyId::CameraType, tr("Type"), tr("Camera type"), false, lcCamera::GetCameraTypeStrings()); + AddStringListProperty(lcObjectPropertyId::CameraProjection, tr("Projection"), tr("Camera projection"), false, lcCamera::GetCameraProjectionStrings()); AddSpacing(); @@ -1414,7 +1414,7 @@ void lcPropertiesWidget::SetCamera(const std::vector& Selection, lcOb } UpdateString(lcObjectPropertyId::CameraName); - UpdateStringList(lcObjectPropertyId::CameraType); + UpdateStringList(lcObjectPropertyId::CameraProjection); UpdateFloat(lcObjectPropertyId::CameraFOV, FoV); UpdateFloat(lcObjectPropertyId::CameraNear, ZNear); diff --git a/common/lc_view.cpp b/common/lc_view.cpp index 66f182b2..59e27954 100644 --- a/common/lc_view.cpp +++ b/common/lc_view.cpp @@ -249,7 +249,7 @@ lcMatrix44 lcView::GetProjectionMatrix() const { float AspectRatio = (float)mWidth / (float)mHeight; - if (mCamera->IsOrtho()) + if (mCamera->GetProjection() == lcCameraProjection::Orthographic) { float OrthoHeight = mCamera->GetOrthoHeight() / 2.0f; float OrthoWidth = OrthoHeight * AspectRatio; @@ -267,8 +267,8 @@ lcMatrix44 lcView::GetTileProjectionMatrix(int CurrentRow, int CurrentColumn, in double ImageLeft, ImageRight, ImageBottom, ImageTop, Near, Far; double AspectRatio = (double)ImageWidth / (double)ImageHeight; - - if (mCamera->IsOrtho()) + + if (mCamera->GetProjection() == lcCameraProjection::Orthographic) { float OrthoHeight = mCamera->GetOrthoHeight() / 2.0f; float OrthoWidth = OrthoHeight * AspectRatio; @@ -300,8 +300,8 @@ lcMatrix44 lcView::GetTileProjectionMatrix(int CurrentRow, int CurrentColumn, in double Right = Left + (ImageRight - ImageLeft) * CurrentTileWidth / ImageWidth; double Bottom = ImageBottom + (ImageTop - ImageBottom) * (CurrentRow * mHeight) / ImageHeight; double Top = Bottom + (ImageTop - ImageBottom) * CurrentTileHeight / ImageHeight; - - if (mCamera->IsOrtho()) + + if (mCamera->GetProjection() == lcCameraProjection::Orthographic) return lcMatrix44Ortho(Left, Right, Bottom, Top, Near, Far); else return lcMatrix44Frustum(Left, Right, Bottom, Top, Near, Far); @@ -1874,18 +1874,19 @@ void lcView::SetCameraIndex(size_t CameraIndex) Redraw(); } -void lcView::SetProjection(bool Ortho) +void lcView::SetCameraProjection(lcCameraProjection CameraProjection) { if (mCamera->IsSimple()) { - mCamera->SetOrtho(Ortho); + mCamera->SetProjection(CameraProjection); Redraw(); } else { lcModel* ActiveModel = GetActiveModel(); + if (ActiveModel) - ActiveModel->SetCameraOrthographic(mCamera, Ortho); + ActiveModel->SetCameraProjection(mCamera, CameraProjection); } } diff --git a/common/lc_view.h b/common/lc_view.h index 6d752ba8..700a5ebf 100644 --- a/common/lc_view.h +++ b/common/lc_view.h @@ -5,6 +5,7 @@ #include "lc_commands.h" struct lcInsertPieceInfo; +enum class lcCameraProjection; enum class lcDragState { @@ -252,7 +253,7 @@ public: void SetCamera(const QString& CameraName); void SetCameraIndex(size_t CameraIndex); - void SetProjection(bool Ortho); + void SetCameraProjection(lcCameraProjection CameraProjection); void LookAt(); void MoveCamera(const lcVector3& Direction); void Zoom(float Amount); diff --git a/common/light.cpp b/common/light.cpp index 5c4666d4..34fb2efd 100644 --- a/common/light.cpp +++ b/common/light.cpp @@ -1154,7 +1154,7 @@ QVariant lcLight::GetPropertyValue(lcObjectPropertyId PropertyId) const case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: case lcObjectPropertyId::CameraFar: @@ -1245,7 +1245,7 @@ bool lcLight::SetPropertyValue(lcObjectPropertyId PropertyId, lcStep Step, bool case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: case lcObjectPropertyId::CameraFar: @@ -1336,7 +1336,7 @@ bool lcLight::HasKeyFrame(lcObjectPropertyId PropertyId, lcStep Time) const case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: case lcObjectPropertyId::CameraFar: @@ -1427,7 +1427,7 @@ bool lcLight::SetKeyFrame(lcObjectPropertyId PropertyId, lcStep Time, bool KeyFr case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: case lcObjectPropertyId::CameraFar: @@ -1538,7 +1538,7 @@ bool lcLight::SaveUndoData(QDataStream& Stream, const lcModel* Model) const Stream << mLightType; Stream << mCastShadow; Stream << mAreaShape; - Stream << mState; + Stream << mHidden; return mPosition.SaveUndoData(Stream) && mRotation.SaveUndoData(Stream) && mColor.SaveUndoData(Stream) && mSpotConeAngle.SaveUndoData(Stream) && mSpotPenumbraAngle.SaveUndoData(Stream) && mPOVRaySpotTightness.SaveUndoData(Stream) && @@ -1556,7 +1556,7 @@ bool lcLight::LoadUndoData(QDataStream& Stream, const lcModel* Model) Stream >> mLightType; Stream >> mCastShadow; Stream >> mAreaShape; - Stream >> mState; + Stream >> mHidden; return mPosition.LoadUndoData(Stream) && mRotation.LoadUndoData(Stream) && diff --git a/common/light.h b/common/light.h index 8a935c0f..a42cccc5 100644 --- a/common/light.h +++ b/common/light.h @@ -3,9 +3,6 @@ #include "object.h" #include "lc_math.h" -#define LC_LIGHT_HIDDEN 0x0001 -#define LC_LIGHT_DISABLED 0x0002 - enum lcLightSection : quint32 { LC_LIGHT_SECTION_INVALID = LC_OBJECT_SECTION_INVALID, @@ -172,7 +169,7 @@ public: bool IsVisible() const { - return (mState & LC_LIGHT_HIDDEN) == 0; + return !mHidden; } bool SetColor(const lcVector3& Color, lcStep Step, bool AddKey); @@ -332,8 +329,8 @@ protected: lcObjectProperty mAreaSizeY = lcObjectProperty(250.0f); lcObjectProperty mPOVRayAreaGridX = lcObjectProperty(2); lcObjectProperty mPOVRayAreaGridY = lcObjectProperty(2); - - quint32 mState = 0; + + bool mHidden = false; lcVector3 mTargetMovePosition = lcVector3(0.0f, 0.0f, 0.0f); lcMatrix44 mWorldMatrix; diff --git a/common/object.cpp b/common/object.cpp index 482b93aa..e3f8fa11 100644 --- a/common/object.cpp +++ b/common/object.cpp @@ -27,8 +27,8 @@ QString lcObject::GetCheckpointString(lcObjectPropertyId PropertyId) case lcObjectPropertyId::CameraName: return QT_TRANSLATE_NOOP("Checkpoint", "Renaming Camera"); - case lcObjectPropertyId::CameraType: - return QT_TRANSLATE_NOOP("Checkpoint", "Changing Camera Type"); + case lcObjectPropertyId::CameraProjection: + return QT_TRANSLATE_NOOP("Checkpoint", "Changing Camera Projection"); case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: diff --git a/common/piece.cpp b/common/piece.cpp index d4d378a6..e598c23d 100644 --- a/common/piece.cpp +++ b/common/piece.cpp @@ -707,7 +707,7 @@ QVariant lcPiece::GetPropertyValue(lcObjectPropertyId PropertyId) const case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: case lcObjectPropertyId::CameraFar: @@ -767,7 +767,7 @@ bool lcPiece::SetPropertyValue(lcObjectPropertyId PropertyId, lcStep Step, bool case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: case lcObjectPropertyId::CameraFar: @@ -820,7 +820,7 @@ bool lcPiece::HasKeyFrame(lcObjectPropertyId PropertyId, lcStep Time) const case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: case lcObjectPropertyId::CameraFar: @@ -879,7 +879,7 @@ bool lcPiece::SetKeyFrame(lcObjectPropertyId PropertyId, lcStep Time, bool KeyFr case lcObjectPropertyId::PieceStepShow: case lcObjectPropertyId::PieceStepHide: case lcObjectPropertyId::CameraName: - case lcObjectPropertyId::CameraType: + case lcObjectPropertyId::CameraProjection: case lcObjectPropertyId::CameraFOV: case lcObjectPropertyId::CameraNear: case lcObjectPropertyId::CameraFar: