diff --git a/common/camera.cpp b/common/camera.cpp index ba77bb1b..c16b6ac4 100644 --- a/common/camera.cpp +++ b/common/camera.cpp @@ -644,8 +644,8 @@ QVariant lcCamera::GetPropertyValue(lcObjectPropertyId PropertyId) const case lcObjectPropertyId::LightColor: case lcObjectPropertyId::LightPower: case lcObjectPropertyId::LightCastShadow: - case lcObjectPropertyId::LightAttenuationDistance: - case lcObjectPropertyId::LightAttenuationPower: + case lcObjectPropertyId::LightPOVRayFadeDistance: + case lcObjectPropertyId::LightPOVRayFadePower: case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: case lcObjectPropertyId::LightDirectionalSize: @@ -707,8 +707,8 @@ bool lcCamera::SetPropertyValue(lcObjectPropertyId PropertyId, lcStep Step, bool case lcObjectPropertyId::LightColor: case lcObjectPropertyId::LightPower: case lcObjectPropertyId::LightCastShadow: - case lcObjectPropertyId::LightAttenuationDistance: - case lcObjectPropertyId::LightAttenuationPower: + case lcObjectPropertyId::LightPOVRayFadeDistance: + case lcObjectPropertyId::LightPOVRayFadePower: case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: case lcObjectPropertyId::LightDirectionalSize: @@ -769,8 +769,8 @@ bool lcCamera::HasKeyFrame(lcObjectPropertyId PropertyId, lcStep Time) const case lcObjectPropertyId::LightColor: case lcObjectPropertyId::LightPower: case lcObjectPropertyId::LightCastShadow: - case lcObjectPropertyId::LightAttenuationDistance: - case lcObjectPropertyId::LightAttenuationPower: + case lcObjectPropertyId::LightPOVRayFadeDistance: + case lcObjectPropertyId::LightPOVRayFadePower: case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: case lcObjectPropertyId::LightDirectionalSize: @@ -831,8 +831,8 @@ bool lcCamera::SetKeyFrame(lcObjectPropertyId PropertyId, lcStep Time, bool KeyF case lcObjectPropertyId::LightColor: case lcObjectPropertyId::LightPower: case lcObjectPropertyId::LightCastShadow: - case lcObjectPropertyId::LightAttenuationDistance: - case lcObjectPropertyId::LightAttenuationPower: + case lcObjectPropertyId::LightPOVRayFadeDistance: + case lcObjectPropertyId::LightPOVRayFadePower: case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: case lcObjectPropertyId::LightDirectionalSize: diff --git a/common/lc_model.cpp b/common/lc_model.cpp index d23c6f7e..234e10fa 100644 --- a/common/lc_model.cpp +++ b/common/lc_model.cpp @@ -3130,22 +3130,22 @@ void lcModel::SetCameraZFar(lcCamera* Camera, float ZFar) UpdateAllViews(); } -void lcModel::SetLightAttenuationDistance(lcLight* Light, float Distance) +void lcModel::SetLightPOVRayFadeDistance(lcLight* Light, float Distance) { - Light->SetAttenuationDistance(Distance, mCurrentStep, gMainWindow->GetAddKeys()); + Light->SetPOVRayFadeDistance(Distance, mCurrentStep, gMainWindow->GetAddKeys()); Light->UpdatePosition(mCurrentStep); - SaveCheckpoint(tr("Changing Light Attenuation Distance")); + SaveCheckpoint(tr("Changing Light POV-Ray Fade Distance")); gMainWindow->UpdateSelectedObjects(false); UpdateAllViews(); } -void lcModel::SetLightAttenuationPower(lcLight* Light, float Power) +void lcModel::SetLightPOVRayFadePower(lcLight* Light, float Power) { - Light->SetAttenuationPower(Power, mCurrentStep, gMainWindow->GetAddKeys()); + Light->SetPOVRayFadePower(Power, mCurrentStep, gMainWindow->GetAddKeys()); Light->UpdatePosition(mCurrentStep); - SaveCheckpoint(tr("Changing Light Attenuation Power")); + SaveCheckpoint(tr("Changing Light POV-Ray Fade Power")); gMainWindow->UpdateSelectedObjects(false); UpdateAllViews(); } diff --git a/common/lc_model.h b/common/lc_model.h index a9ddfe9f..12a9cd98 100644 --- a/common/lc_model.h +++ b/common/lc_model.h @@ -371,8 +371,8 @@ public: void SetCameraZNear(lcCamera* Camera, float ZNear); void SetCameraZFar(lcCamera* Camera, float ZFar); - void SetLightAttenuationDistance(lcLight* Light, float Distance); - void SetLightAttenuationPower(lcLight* Light, float Power); + void SetLightPOVRayFadeDistance(lcLight* Light, float Distance); + void SetLightPOVRayFadePower(lcLight* Light, float Power); void SetSpotLightConeAngle(lcLight* Light, float Angle); void SetSpotLightPenumbraAngle(lcLight* Light, float Angle); void SetSpotLightTightness(lcLight* Light, float Tightness); diff --git a/common/lc_objectproperty.h b/common/lc_objectproperty.h index cf4b27aa..6c6f2985 100644 --- a/common/lc_objectproperty.h +++ b/common/lc_objectproperty.h @@ -27,8 +27,8 @@ enum class lcObjectPropertyId LightColor, LightPower, LightCastShadow, - LightAttenuationDistance, - LightAttenuationPower, + LightPOVRayFadeDistance, + LightPOVRayFadePower, LightPointSize, LightSpotSize, LightDirectionalSize, diff --git a/common/lc_propertieswidget.cpp b/common/lc_propertieswidget.cpp index 8a91271d..f7a770c2 100644 --- a/common/lc_propertieswidget.cpp +++ b/common/lc_propertieswidget.cpp @@ -376,13 +376,13 @@ void lcPropertiesWidget::FloatChanged() { Model->SetLightPower(Light, Value); } - else if (PropertyId == lcObjectPropertyId::LightAttenuationDistance) + else if (PropertyId == lcObjectPropertyId::LightPOVRayFadeDistance) { - Model->SetLightAttenuationDistance(Light, Value); + Model->SetLightPOVRayFadeDistance(Light, Value); } - else if (PropertyId == lcObjectPropertyId::LightAttenuationPower) + else if (PropertyId == lcObjectPropertyId::LightPOVRayFadePower) { - Model->SetLightAttenuationPower(Light, Value); + Model->SetLightPOVRayFadePower(Light, Value); } else if (PropertyId == lcObjectPropertyId::LightPointSize || PropertyId == lcObjectPropertyId::LightSpotSize || PropertyId == lcObjectPropertyId::LightDirectionalSize || PropertyId == lcObjectPropertyId::LightAreaSizeX) { @@ -1032,8 +1032,8 @@ void lcPropertiesWidget::CreateWidgets() AddColorProperty(lcObjectPropertyId::LightColor, tr("Color"), tr("Light color"), true); AddFloatProperty(lcObjectPropertyId::LightPower, tr("Power"), tr("Power of the light (Watts in Blender, multiplicative factor in POV-Ray)"), true, 0.0f, FLT_MAX); - AddFloatProperty(lcObjectPropertyId::LightAttenuationDistance, tr("Fade Distance"), tr("The distance at which the full light intensity arrives (POV-Ray only)"), true, 0.0f, FLT_MAX); - AddFloatProperty(lcObjectPropertyId::LightAttenuationPower, tr("Fade Power"), tr("Light falloff rate (POV-Ray only)"), true, 0.0f, FLT_MAX); + AddFloatProperty(lcObjectPropertyId::LightPOVRayFadeDistance, tr("Fade Distance"), tr("The distance at which the full light intensity arrives (POV-Ray only)"), true, 0.0f, FLT_MAX); + AddFloatProperty(lcObjectPropertyId::LightPOVRayFadePower, tr("Fade Power"), tr("Light falloff rate (POV-Ray only)"), true, 0.0f, FLT_MAX); AddBoolProperty(lcObjectPropertyId::LightCastShadow, tr("Cast Shadow"), tr("Cast a shadow from this light"), false); AddSpacing(); @@ -1259,8 +1259,8 @@ void lcPropertiesWidget::SetLight(const lcArray& Selection, lcObject* lcLightAreaShape LightAreaShape = lcLightAreaShape::Count; lcVector2 LightSize(0.0f, 0.0f); float Power = 0.0f; - float AttenuationDistance = 0.0f; - float AttenuationPower = 0.0f; + float FadeDistance = 0.0f; + float FadePower = 0.0f; lcVector3 Position(0.0f, 0.0f, 0.0f); lcVector3 Rotation = lcVector3(0.0f, 0.0f, 0.0f); float SpotConeAngle = 0.0f, SpotPenumbraAngle = 0.0f, SpotTightness = 0.0f; @@ -1273,8 +1273,8 @@ void lcPropertiesWidget::SetLight(const lcArray& Selection, lcObject* Position = Light->GetPosition(); Rotation = lcMatrix44ToEulerAngles(Light->GetWorldMatrix()) * LC_RTOD; Power = Light->GetPower(); - AttenuationDistance = Light->GetAttenuationDistance(); - AttenuationPower = Light->GetAttenuationPower(); + FadeDistance = Light->GetPOVRayFadeDistance(); + FadePower = Light->GetPOVRayFadePower(); SpotConeAngle = Light->GetSpotConeAngle(); SpotPenumbraAngle = Light->GetSpotPenumbraAngle(); SpotTightness = Light->GetSpotTightness(); @@ -1322,8 +1322,8 @@ void lcPropertiesWidget::SetLight(const lcArray& Selection, lcObject* UpdateFloat(lcObjectPropertyId::LightPower, Power); UpdateBool(lcObjectPropertyId::LightCastShadow); - UpdateFloat(lcObjectPropertyId::LightAttenuationDistance, AttenuationDistance); - UpdateFloat(lcObjectPropertyId::LightAttenuationPower, AttenuationPower); + UpdateFloat(lcObjectPropertyId::LightPOVRayFadeDistance, FadeDistance); + UpdateFloat(lcObjectPropertyId::LightPOVRayFadePower, FadePower); const bool IsPointLight = (LightType == lcLightType::Point); SetPropertyVisible(lcObjectPropertyId::LightPointSize, IsPointLight); diff --git a/common/light.cpp b/common/light.cpp index f75385ae..15e0120b 100644 --- a/common/light.cpp +++ b/common/light.cpp @@ -134,8 +134,8 @@ void lcLight::SaveLDraw(QTextStream& Stream) const mColor.Save(Stream, "LIGHT", "COLOR", true); mSize.Save(Stream, "LIGHT", "SIZE", true); mPower.Save(Stream, "LIGHT", "POWER", true); - mAttenuationDistance.Save(Stream, "LIGHT", "ATTENUATION_DISTANCE", true); - mAttenuationPower.Save(Stream, "LIGHT", "ATTENUATION_POWER", true); + mPOVRayFadeDistance.Save(Stream, "LIGHT", "POVRAY_FADE_DISTANCE", true); + mPOVRayFadePower.Save(Stream, "LIGHT", "POVRAY_FADE_POWER", true); switch (mLightType) { @@ -240,9 +240,9 @@ bool lcLight::ParseLDrawLine(QTextStream& Stream) continue; else if (mPower.Load(Stream, Token, "POWER")) continue; - else if (mAttenuationDistance.Load(Stream, Token, "ATTENUATION_DISTANCE")) + else if (mPOVRayFadeDistance.Load(Stream, Token, "POVRAY_FADE_DISTANCE")) continue; - else if (mAttenuationPower.Load(Stream, Token, "ATTENUATION_POWER")) + else if (mPOVRayFadePower.Load(Stream, Token, "POVRAY_FADE_POWER")) continue; else if (mSpotConeAngle.Load(Stream, Token, "SPOT_CONE_ANGLE")) continue; @@ -514,14 +514,14 @@ bool lcLight::SetColor(const lcVector3& Color, lcStep Step, bool AddKey) return mColor.ChangeKey(Color, Step, AddKey); } -void lcLight::SetAttenuationDistance(float Distance, lcStep Step, bool AddKey) +void lcLight::SetPOVRayFadeDistance(float Distance, lcStep Step, bool AddKey) { - mAttenuationDistance.ChangeKey(Distance, Step, AddKey); + mPOVRayFadeDistance.ChangeKey(Distance, Step, AddKey); } -void lcLight::SetAttenuationPower(float Power, lcStep Step, bool AddKey) +void lcLight::SetPOVRayFadePower(float Power, lcStep Step, bool AddKey) { - mAttenuationPower.ChangeKey(Power, Step, AddKey); + mPOVRayFadePower.ChangeKey(Power, Step, AddKey); } void lcLight::SetSpotConeAngle(float Angle, lcStep Step, bool AddKey) @@ -595,8 +595,8 @@ void lcLight::InsertTime(lcStep Start, lcStep Time) mAreaGrid.InsertTime(Start, Time); mSize.InsertTime(Start, Time); mPower.InsertTime(Start, Time); - mAttenuationDistance.InsertTime(Start, Time); - mAttenuationPower.InsertTime(Start, Time); + mPOVRayFadeDistance.InsertTime(Start, Time); + mPOVRayFadePower.InsertTime(Start, Time); } void lcLight::RemoveTime(lcStep Start, lcStep Time) @@ -610,8 +610,8 @@ void lcLight::RemoveTime(lcStep Start, lcStep Time) mAreaGrid.RemoveTime(Start, Time); mSize.RemoveTime(Start, Time); mPower.RemoveTime(Start, Time); - mAttenuationDistance.RemoveTime(Start, Time); - mAttenuationPower.RemoveTime(Start, Time); + mPOVRayFadeDistance.RemoveTime(Start, Time); + mPOVRayFadePower.RemoveTime(Start, Time); } void lcLight::UpdatePosition(lcStep Step) @@ -625,8 +625,8 @@ void lcLight::UpdatePosition(lcStep Step) mAreaGrid.Update(Step); mSize.Update(Step); mPower.Update(Step); - mAttenuationDistance.Update(Step); - mAttenuationPower.Update(Step); + mPOVRayFadeDistance.Update(Step); + mPOVRayFadePower.Update(Step); if (IsPointLight()) { @@ -1087,8 +1087,8 @@ QVariant lcLight::GetPropertyValue(lcObjectPropertyId PropertyId) const case lcObjectPropertyId::LightCastShadow: return GetCastShadow(); - case lcObjectPropertyId::LightAttenuationDistance: - case lcObjectPropertyId::LightAttenuationPower: + case lcObjectPropertyId::LightPOVRayFadeDistance: + case lcObjectPropertyId::LightPOVRayFadePower: case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: case lcObjectPropertyId::LightDirectionalSize: @@ -1161,8 +1161,8 @@ bool lcLight::SetPropertyValue(lcObjectPropertyId PropertyId, lcStep Step, bool case lcObjectPropertyId::LightCastShadow: return SetCastShadow(Value.toBool()); - case lcObjectPropertyId::LightAttenuationDistance: - case lcObjectPropertyId::LightAttenuationPower: + case lcObjectPropertyId::LightPOVRayFadeDistance: + case lcObjectPropertyId::LightPOVRayFadePower: case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: case lcObjectPropertyId::LightDirectionalSize: @@ -1231,11 +1231,11 @@ bool lcLight::HasKeyFrame(lcObjectPropertyId PropertyId, lcStep Time) const case lcObjectPropertyId::LightCastShadow: return false; - case lcObjectPropertyId::LightAttenuationDistance: - return mAttenuationDistance.HasKeyFrame(Time); + case lcObjectPropertyId::LightPOVRayFadeDistance: + return mPOVRayFadeDistance.HasKeyFrame(Time); - case lcObjectPropertyId::LightAttenuationPower: - return mAttenuationPower.HasKeyFrame(Time); + case lcObjectPropertyId::LightPOVRayFadePower: + return mPOVRayFadePower.HasKeyFrame(Time); case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: @@ -1313,11 +1313,11 @@ bool lcLight::SetKeyFrame(lcObjectPropertyId PropertyId, lcStep Time, bool KeyFr case lcObjectPropertyId::LightCastShadow: return false; - case lcObjectPropertyId::LightAttenuationDistance: - return mAttenuationDistance.SetKeyFrame(Time, KeyFrame); + case lcObjectPropertyId::LightPOVRayFadeDistance: + return mPOVRayFadeDistance.SetKeyFrame(Time, KeyFrame); - case lcObjectPropertyId::LightAttenuationPower: - return mAttenuationPower.SetKeyFrame(Time, KeyFrame); + case lcObjectPropertyId::LightPOVRayFadePower: + return mPOVRayFadePower.SetKeyFrame(Time, KeyFrame); case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: @@ -1371,6 +1371,6 @@ void lcLight::RemoveKeyFrames() mAreaGrid.RemoveAllKeys(); mSize.RemoveAllKeys(); mPower.RemoveAllKeys(); - mAttenuationDistance.RemoveAllKeys(); - mAttenuationPower.RemoveAllKeys(); + mPOVRayFadeDistance.RemoveAllKeys(); + mPOVRayFadePower.RemoveAllKeys(); } diff --git a/common/light.h b/common/light.h index 6cce77dc..c3ef395b 100644 --- a/common/light.h +++ b/common/light.h @@ -234,18 +234,18 @@ public: return mColor; } - void SetAttenuationDistance(float Distance, lcStep Step, bool AddKey); + void SetPOVRayFadeDistance(float Distance, lcStep Step, bool AddKey); - float GetAttenuationDistance() const + float GetPOVRayFadeDistance() const { - return mAttenuationDistance; + return mPOVRayFadeDistance; } - void SetAttenuationPower(float Power, lcStep Step, bool AddKey); + void SetPOVRayFadePower(float Power, lcStep Step, bool AddKey); - float GetAttenuationPower() const + float GetPOVRayFadePower() const { - return mAttenuationPower; + return mPOVRayFadePower; } void SetSpotConeAngle(float Angle, lcStep Step, bool AddKey); @@ -339,8 +339,8 @@ protected: lcObjectProperty mColor = lcObjectProperty(lcVector3(1.0f, 1.0f, 1.0f)); lcObjectProperty mSize = lcObjectProperty(lcVector2(0.0f, 0.0f)); lcObjectProperty mPower = lcObjectProperty(1.0f); - lcObjectProperty mAttenuationDistance = lcObjectProperty(0.0f); - lcObjectProperty mAttenuationPower = lcObjectProperty(0.0f); + lcObjectProperty mPOVRayFadeDistance = lcObjectProperty(0.0f); + lcObjectProperty mPOVRayFadePower = lcObjectProperty(0.0f); lcObjectProperty mSpotConeAngle = lcObjectProperty(80.0f); lcObjectProperty mSpotPenumbraAngle = lcObjectProperty(0.0f); lcObjectProperty mSpotTightness = lcObjectProperty(0.0f); diff --git a/common/object.cpp b/common/object.cpp index 6805a5a8..0a8154cd 100644 --- a/common/object.cpp +++ b/common/object.cpp @@ -59,8 +59,8 @@ QString lcObject::GetCheckpointString(lcObjectPropertyId PropertyId) case lcObjectPropertyId::LightCastShadow: return QT_TRANSLATE_NOOP("Checkpoint", "Changing Light Shadow"); - case lcObjectPropertyId::LightAttenuationDistance: - case lcObjectPropertyId::LightAttenuationPower: + case lcObjectPropertyId::LightPOVRayFadeDistance: + case lcObjectPropertyId::LightPOVRayFadePower: case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: case lcObjectPropertyId::LightDirectionalSize: diff --git a/common/piece.cpp b/common/piece.cpp index 2171ef88..ed73d626 100644 --- a/common/piece.cpp +++ b/common/piece.cpp @@ -689,8 +689,8 @@ QVariant lcPiece::GetPropertyValue(lcObjectPropertyId PropertyId) const case lcObjectPropertyId::LightColor: case lcObjectPropertyId::LightPower: case lcObjectPropertyId::LightCastShadow: - case lcObjectPropertyId::LightAttenuationDistance: - case lcObjectPropertyId::LightAttenuationPower: + case lcObjectPropertyId::LightPOVRayFadeDistance: + case lcObjectPropertyId::LightPOVRayFadePower: case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: case lcObjectPropertyId::LightDirectionalSize: @@ -750,8 +750,8 @@ bool lcPiece::SetPropertyValue(lcObjectPropertyId PropertyId, lcStep Step, bool case lcObjectPropertyId::LightColor: case lcObjectPropertyId::LightPower: case lcObjectPropertyId::LightCastShadow: - case lcObjectPropertyId::LightAttenuationDistance: - case lcObjectPropertyId::LightAttenuationPower: + case lcObjectPropertyId::LightPOVRayFadeDistance: + case lcObjectPropertyId::LightPOVRayFadePower: case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: case lcObjectPropertyId::LightDirectionalSize: @@ -804,8 +804,8 @@ bool lcPiece::HasKeyFrame(lcObjectPropertyId PropertyId, lcStep Time) const case lcObjectPropertyId::LightColor: case lcObjectPropertyId::LightPower: case lcObjectPropertyId::LightCastShadow: - case lcObjectPropertyId::LightAttenuationDistance: - case lcObjectPropertyId::LightAttenuationPower: + case lcObjectPropertyId::LightPOVRayFadeDistance: + case lcObjectPropertyId::LightPOVRayFadePower: case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: case lcObjectPropertyId::LightDirectionalSize: @@ -864,8 +864,8 @@ bool lcPiece::SetKeyFrame(lcObjectPropertyId PropertyId, lcStep Time, bool KeyFr case lcObjectPropertyId::LightColor: case lcObjectPropertyId::LightPower: case lcObjectPropertyId::LightCastShadow: - case lcObjectPropertyId::LightAttenuationDistance: - case lcObjectPropertyId::LightAttenuationPower: + case lcObjectPropertyId::LightPOVRayFadeDistance: + case lcObjectPropertyId::LightPOVRayFadePower: case lcObjectPropertyId::LightPointSize: case lcObjectPropertyId::LightSpotSize: case lcObjectPropertyId::LightDirectionalSize: diff --git a/common/project.cpp b/common/project.cpp index 82fcc190..0e1c96e7 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -2189,8 +2189,8 @@ bool Project::ExportPOVRay(const QString& FileName) LightType = Light->GetLightType(); Shadowless = Light->GetCastShadow() ? 0 : 1; Power = Light->GetPower(); - FadeDistance = Light->GetAttenuationDistance(); - FadePower = Light->GetAttenuationPower(); + FadeDistance = Light->GetPOVRayFadeDistance(); + FadePower = Light->GetPOVRayFadePower(); switch (LightType) {