feat: "scale" keyvalue for prop and transform components now accepts …

…vector values
Silverlan · Mar 13, 2023 · 755e0cd · 755e0cd
1 parent 048f8a4
commit 755e0cd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/core/shared/include/pragma/entities/prop/prop_base.h b/core/shared/include/pragma/entities/prop/prop_base.h
@@ -27,7 +27,7 @@ namespace pragma {
 		virtual void OnEntitySpawn() override;
 	  protected:
 		void InitializePhysics();
-		float m_kvScale;
+		Vector3 m_kvScale {1.f, 1.f, 1.f};
 		float m_kvMass = std::numeric_limits<float>::quiet_NaN();
 		BasePropComponent(BaseEntity &ent);
 		bool SetKeyValue(std::string key, std::string val);

diff --git a/core/shared/src/entities/components/base_transform_component.cpp b/core/shared/src/entities/components/base_transform_component.cpp
@@ -96,6 +96,15 @@ void BaseTransformComponent::Initialize()
 			ustring::string_to_array<float, double>(kvData.value, &ang.p, atof, 3);
 			SetAngles(ang);
 		}
+		else if(ustring::compare<std::string>(kvData.key, "scale", false)) {
+			Vector3 scale {1.f, 1.f, 1.f};
+			auto n = ustring::string_to_array<float, double>(kvData.value, &scale.x, atof, 3);
+			if(n == 1) {
+				scale.y = scale.x;
+				scale.z = scale.x;
+			}
+			SetScale(scale);
+		}
 		else
 			return util::EventReply::Unhandled;
 		return util::EventReply::Handled;

diff --git a/core/shared/src/entities/prop/prop_base.cpp b/core/shared/src/entities/prop/prop_base.cpp
@@ -19,7 +19,7 @@
 
 using namespace pragma;
 
-BasePropComponent::BasePropComponent(BaseEntity &ent) : BaseEntityComponent(ent), m_kvScale(1.f) {}
+BasePropComponent::BasePropComponent(BaseEntity &ent) : BaseEntityComponent(ent) {}
 
 PHYSICSTYPE BasePropComponent::UpdatePhysicsType(BaseEntity *ent)
 {
@@ -40,8 +40,15 @@ PHYSICSTYPE BasePropComponent::UpdatePhysicsType(BaseEntity *ent)
 
 bool BasePropComponent::SetKeyValue(std::string key, std::string val)
 {
-	if(key == "scale")
-		m_kvScale = ustring::to_float(val);
+	if(key == "scale") {
+		Vector3 scale {1.f, 1.f, 1.f};
+		auto n = ustring::string_to_array<float, double>(val, &scale.x, atof, 3);
+		if(n == 1) {
+			scale.y = scale.x;
+			scale.z = scale.x;
+		}
+		m_kvScale = scale;
+	}
 	else if(key == "mass") {
 		ustring::remove_whitespace(val);
 		if(val.empty() == false)
@@ -125,7 +132,7 @@ void BasePropComponent::OnEntitySpawn()
 	BaseEntityComponent::OnEntitySpawn();
 	auto &ent = GetEntity();
 	auto mdlComponent = ent.GetModelComponent();
-	if(m_kvScale != 1.f) {
+	if(m_kvScale != Vector3 {1.f, 1.f, 1.f}) {
 		auto pTrComponent = ent.GetTransformComponent();
 		if(pTrComponent != nullptr)
 			pTrComponent->SetScale(m_kvScale);