Removed mBodyNode from CharacterBase

src/gamedata/CharacterModule.cpp

@@ -162,9 +162,9 @@ CharacterModule::CharacterModule(flecs::world &ecs)
             OgreAssert(characterOrientations.find(e) !=
                        characterOrientations.end(),
                    "Bad orientation/position");
-            ch.mBodyNode = characterNodes[e];
-            ch.mBodyNode->setOrientation(characterOrientations[e]);
-            ch.mBodyNode->setPosition(characterPositions[e]);
+            Ogre::SceneNode *bodyNode = characterNodes[e];
+            bodyNode->setOrientation(characterOrientations[e]);
+            bodyNode->setPosition(characterPositions[e]);
             OgreAssert(
                 characterEntitiesFace[e]->getSkeleton()->hasBone(
                     "Root"),
@@ -304,7 +304,9 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 				ch.mGoalDirection.normalise();
 
 				Ogre::Quaternion toGoal =
-					ch.mBodyNode->getOrientation()
+                    ECS::get<CharacterModule>()
+                        .characterNodes.at(e)
+                        ->getOrientation()
 						.zAxis()
 						.getRotationTo(
 							ch.mGoalDirection);
@@ -329,7 +331,9 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 						std::min<Ogre::Real>(
 							yawToGoal,
 							yawAtSpeed)); //yawToGoal = Math::Clamp<Real>(yawToGoal, 0, yawAtSpeed);
-				ch.mBodyNode->yaw(Ogre::Degree(yawToGoal));
+                ECS::get<CharacterModule>()
+                    .characterNodes.at(e)
+                    ->yaw(Ogre::Degree(yawToGoal));
 			}
 		});
 #if 0
@@ -363,7 +367,7 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 		.kind(flecs::OnUpdate)
 		.with<Player>()
 		.with<GroundCheckReady>()
-		.each([](const EngineData &eng, Camera &camera,
+        .each([](flecs::entity e, const EngineData &eng, Camera &camera,
 			 const CharacterBase &ch) {
             ZoneScopedN("UpdateCamera");
             float delta = eng.delta;
@@ -391,7 +395,9 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 			} else {
 				// place the camera pivot roughly at the character's shoulder
 				camera.mCameraPivot->setPosition(
-					ch.mBodyNode->getPosition() +
+                    ECS::get<CharacterModule>()
+                        .characterNodes.at(e)
+                        ->getPosition() +
 					Ogre::Vector3::UNIT_Y * CAM_HEIGHT);
 				// move the camera smoothly to the goal
 				Ogre::Vector3 goalOffset =