add stage scaling from configured scale values. (#2543)

facebookresearch · Feb 7, 2025 · 00f0541 · 00f0541
1 parent e6f0561
commit 00f0541
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/esp/assets/ResourceManager.cpp b/src/esp/assets/ResourceManager.cpp
@@ -496,6 +496,9 @@ bool ResourceManager::loadStage(
       renderInfo.filepath, Cr::Containers::NullOpt, flags, renderLightSetupKey);
   ESP_DEBUG() << "Start load render asset" << renderInfo.filepath << ".";
 
+  // Set the stage scale from the config
+  renderCreation.scale = stageAttributes->getScale();
+
   bool renderMeshSuccess = loadStageInternal(renderInfo,  // AssetInfo
                                              &renderCreation,
                                              &rootNode,    // parent scene node

diff --git a/src/esp/physics/bullet/BulletRigidStage.cpp b/src/esp/physics/bullet/BulletRigidStage.cpp
@@ -78,7 +78,10 @@ void BulletRigidStage::constructAndAddCollisionObjects() {
     const assets::MeshMetaData& metaData =
         resMgr_.getMeshMetaData(collisionAssetHandle);
 
-    constructBulletSceneFromMeshes(Magnum::Matrix4{}, meshGroup, metaData.root);
+    // set the configured scaling as the initial transform for collision mesh
+    // construction
+    auto initial_transform = Magnum::Matrix4::scaling(initAttr->getScale());
+    constructBulletSceneFromMeshes(initial_transform, meshGroup, metaData.root);
 
     for (auto& object : bStaticCollisionObjects_) {
       object->setFriction(initAttr->getFrictionCoefficient());