Change SceneNode behavior

Transform ~ rename Transform to TransformComponent World, RenderEngine - remove Ogre, this is offloaded to RenderEngine CameraComponent ~ remove creation of Ogre camera, this is done in RenderEngine
RavEngine · Aug 10, 2020 · 4600c6a · 4600c6a
1 parent 38b96bc
commit 4600c6a
Show file tree

Hide file tree

Showing 13 changed files with 190 additions and 163 deletions.
diff --git a/RavEngine_Test/PlayerActor.hpp b/RavEngine_Test/PlayerActor.hpp
@@ -10,7 +10,7 @@ class PlayerActor : public Entity {
 	decimalType sensitivity = 0.1;
 
 	//transform cache
-	Ref<Transform> trans;
+	Ref<TransformComponent> trans;
 
 
 	decimalType scaleMovement(decimalType f) {
@@ -53,7 +53,7 @@ class PlayerActor : public Entity {
 		auto cam = cameraEntity->AddComponent<CameraComponent>(new CameraComponent());
 
 		//set the active camera
-		cam->isActive = true;
+		cam->setActive(true);
 
 		trans = transform();
 		trans->AddChild(cameraEntity->transform());

diff --git a/include/RavEngine/CameraComponent.hpp b/include/RavEngine/CameraComponent.hpp
@@ -1,54 +1,61 @@
 #include "Component.hpp"
 #include "Entity.hpp"
 #include "GameplayStatics.hpp"
-#include "OgreStatics.hpp"
 #include <stduuid/uuid.h>
 
 class CameraComponent : public Component {
 protected:
 	Ogre::Camera* cam = nullptr;
+	Ogre::CompositorWorkspace* compositor = nullptr;
 public:
-	CameraComponent(float inFOV = 60, float inNearClip = 0.1, float inFarClip = 100) : FOV(inFOV), nearClip(inNearClip), farClip(inFarClip), Component() {
-		auto const id = to_string(uuids::uuid_system_generator{}());
-		cam = GameplayStatics::ogreFactory.createCamera(id);
-		cam->setFOVy(Ogre::Radian(FOV));
-		cam->setNearClipDistance(nearClip);
-		cam->setFarClipDistance(farClip);
-	}
+	CameraComponent(float inFOV = 60, float inNearClip = 0.1, float inFarClip = 100);
 
 	virtual ~CameraComponent() {
 		cam->detachFromParent();
 		OGRE_DELETE cam;
 	}
 
+	/**
+	Get the backend camera directly. For internal use only. The engine will not be aware of changes made directly to this pointer.
+	@return a pointer to the camera
+	*/
+	Ogre::Camera* const getCamera() const {
+		return cam;
+	}
+
 	void AddHook(const WeakRef<Entity>& e) override{
 		//add the camera to the root
 		e.get()->transform()->getNode()->attachObject(cam);
 	}
 
 	void RegisterAllAlternateTypes() override{}
-	bool isActive = false;
 
-	//camera details
-	float FOV;
-	float nearClip;
-	float farClip;
+	/**
+	Enable / disable this camera
+	@param newState the new enabled state for this camera. The renderer will choose the first active camera as the camera to use when drawing.
+	*/
+	void setActive(bool newState);
 
 	/**
-	Using the camera's current state, set the view transform
+	@returns if this camera is active
 	*/
-	void SetViewTransform() {
-		Ref<Entity> entity = owner.get();
-		auto transform = entity->transform();
-		auto pos = transform->GetWorldPosition();
-		//calculate where to position the camera
-		float view[16];
-		transform->WorldMatrixToArray(view);
-		/*auto rot = transform->GetWorldRotation();
-		bx::mtxQuatTranslation(view, bx::Quaternion{(float)rot.x,(float)rot.y,(float)rot.z,(float)rot.w},bx::Vec3(pos.x,pos.y,pos.z));*/
-
-		float proj[16];
-		//bx::mtxProj(proj, FOV, GameplayStatics::width / GameplayStatics::height, nearClip, farClip, bgfx::getCaps()->homogeneousDepth);
-		//bgfx::setViewTransform(0, view, proj);
+	bool isActive() {
+		return active;
 	}
+
+	/**
+	For internal use
+	@return the compositor workspace for this camera.
+	*/
+	Ogre::CompositorWorkspace* const GetCompositor() {
+		return compositor;
+	}
+
+protected:
+	bool active = false;
+
+	//camera details
+	float FOV;
+	float nearClip;
+	float farClip;
 };
diff --git a/include/RavEngine/Component.hpp b/include/RavEngine/Component.hpp
@@ -14,7 +14,6 @@
 //forward declarations
 class Entity;
 
-
 class Component : public SharedObject{
 protected:
 	WeakRef<Entity> owner;		//non-owning pointer to the owning Entity of this component

diff --git a/include/RavEngine/Entity.hpp b/include/RavEngine/Entity.hpp
@@ -143,7 +143,7 @@ class Entity : public SharedObject{
     /**
      @return a reference to the transform component, which all entities possess
      */
-	Ref<Transform> transform();
+	Ref<TransformComponent> transform();
 
 	/**
 	 Tick logic on this Entity

diff --git a/include/RavEngine/RenderEngine.hpp b/include/RavEngine/RenderEngine.hpp
@@ -10,18 +10,19 @@
 #include "Entity.hpp"
 #include <list>
 #include "WeakRef.hpp"
+#include "OgreStatics.hpp"
 
 class RenderEngine : public SharedObject{
 public:
     virtual ~RenderEngine(){};
     void Spawn(Ref<Entity> e);
     void Destroy(Ref<Entity> e);
-    RenderEngine(const WeakRef<World>& w) : world(w) {};
+    RenderEngine(const WeakRef<World>& w);
     void Draw();
 
 	static const std::string currentBackend();
     WeakRef<World> world;
 
-protected:
-    std::list<Ref<Entity>> entities;
+protected:   
+    Ogre::SceneManager* ogrescene = nullptr;
 };