Scene

anki/scene/Camera.h

@@ -2,7 +2,7 @@
 #define ANKI_SCENE_CAMERA_H
 
 #include "anki/scene/SceneNode.h"
-#include "anki/scene/Spartial.h"
+#include "anki/scene/Spatial.h"
 #include "anki/scene/Movable.h"
 #include "anki/scene/Frustumable.h"
 
@@ -14,7 +14,7 @@ namespace anki {
 /// @{
 
 /// Camera SceneNode interface class
-class Camera: public SceneNode, public Movable, public Spartial,
+class Camera: public SceneNode, public Movable, public Spatial,
 	public Frustumable
 {
 public:
@@ -34,7 +34,7 @@ public:
 		CollisionShape* spartCs,
 		Frustum* frustum)
 		: SceneNode(name, scene), Movable(movableFlags, movParent),
-			Spartial(spartCs), Frustumable(frustum), type(type_)
+			Spatial(spartCs), Frustumable(frustum), type(type_)
 	{}
 	/// @}
 
@@ -78,8 +78,8 @@ public:
 		return this;
 	}
 
-	/// Re-implements SceneNode::getSpartial()
-	virtual Spartial* getSpartial()
+	/// Re-implements SceneNode::getSpatial()
+	virtual Spatial* getSpatial()
 	{
 		return this;
 	}

anki/scene/Light.h

@@ -5,7 +5,8 @@
 #include "anki/scene/Movable.h"
 #include "anki/scene/Renderable.h"
 #include "anki/scene/Frustumable.h"
-#include "anki/scene/Spartial.h"
+#include "anki/scene/Spatial.h"
+#include "anki/gl/Vao.h"
 
 
 namespace anki {
@@ -28,7 +29,7 @@ namespace anki {
 /// Specular intensity of material: Sm
 /// @endcode
 class Light: public SceneNode, public Movable, public Renderable,
-	public Spartial
+	public Spatial
 {
 public:
 	enum LightType
@@ -40,14 +41,19 @@ public:
 	/// @name Constructors
 	/// @{
 	Light(LightType t,
-		const char* name, Scene* scene,
-		uint movableFlags, Movable* movParent,
-		CollisionShape* cs,
-		const char* modelFname)
+		const char* name, Scene* scene, // Scene
+		uint movableFlags, Movable* movParent, // Movable
+		CollisionShape* cs, // Spatial
+		const char* smoMeshFname) // SMO mesh
 		: SceneNode(name, scene), Movable(movableFlags, movParent),
-			Spartial(cs), type(t)
+			Spatial(cs), type(t)
 	{
-		//smoModel
+		smoMesh.load(smoMeshFname);
+		vao.create();
+		vao.attachArrayBufferVbo(smoMesh->getVbo(Mesh::VBO_VERT_POSITIONS),
+			0, 3, GL_FLOAT, GL_FALSE, 0, NULL);
+		vao.attachElementArrayBufferVbo(
+			smoMesh->getVbo(Mesh::VBO_VERT_INDECES));
 	}
 	/// @}
 
@@ -73,36 +79,36 @@ public:
 		return this;
 	}
 
-	Spartial* getSpartial()
+	Spatial* getSpatial()
 	{
 		return this;
 	}
 
-	const Vao& getVao(const PassLevelKey&)
+	const Vao& getVao(const PassLevelKey& k)
 	{
-		//mesh.
+		ANKI_ASSERT(k.pass == 1 && "Call only in SMO");
+		(void)k; // No warnings please
+		return vao;
 	}
 
-	MaterialRuntime& getMaterialRuntime()
+	uint getVertexIdsNum(const PassLevelKey& k)
 	{
-		return *mtlr;
+		ANKI_ASSERT(k.pass == 1 && "Call only in SMO");
+		(void)k; // No warnings please
+		return smoMesh->getVertIdsNum();
 	}
 
-	const Transform& getWorldTransform(const PassLevelKey&)
-	{
-		return getWorldTransform();
-	}
-
-	const Transform& getPreviousWorldTransform(const PassLevelKey&)
+	MaterialRuntime& getMaterialRuntime()
 	{
-		return getPreviousWorldTransform();
+		return *mtlr;
 	}
 	/// @}
 
 private:
 	LightType type;
 	boost::scoped_ptr<MaterialRuntime> mtlr;
-	ModelResourcePointer smoModel; ///< Model for SMO pases
+	MeshResourcePointer smoMesh; ///< Model for SMO pases
+	Vao smoVao;
 };
 
 
@@ -110,8 +116,14 @@ private:
 class PointLight: public Light
 {
 public:
+	PointLight(const char* name, Scene* scene, uint movableFlags,
+		Movable* movParent)
+		: Light(LT_POINT, name, scene, movableFlags, movParent, &frustum,
+			"sadf")
+	{}
 
 private:
+	PerspectiveFrustum frustum;
 };
 
 

anki/scene/SceneNode.h

@@ -12,22 +12,26 @@ class Scene; // Don't include
 class Movable;
 class Renderable;
 class Frustumable;
-class Spartial;
+class Spatial;
 
 
-/// @addtogroup scene
+/// @addtogroup Scene
 /// @{
 
 /// Interface class backbone of scene
 class SceneNode
 {
 public:
+	/// @name Constructors
+	/// @{
+
 	/// The one and only constructor
 	/// @param name The unique name of the node
 	/// @param scene The scene that will register it
 	explicit SceneNode(
 		const char* name,
 		Scene* scene);
+	/// @}
 
 	/// Unregister node
 	virtual ~SceneNode();
@@ -49,7 +53,7 @@ public:
 		return NULL;
 	}
 
-	virtual Spartial* getSpartial()
+	virtual Spatial* getSpatial()
 	{
 		return NULL;
 	}

anki/scene/Spartial.h → anki/scene/Spatial.h

@@ -1,5 +1,5 @@
-#ifndef ANKI_SCENE_SPARTIAL_H
-#define ANKI_SCENE_SPARTIAL_H
+#ifndef ANKI_SCENE_SPATIAL_H
+#define ANKI_SCENE_SPATIAL_H
 
 #include "anki/collision/Collision.h"
 
@@ -10,15 +10,15 @@ namespace anki {
 /// @addtogroup Scene
 /// @{
 
-/// Spartial "interface" for scene nodes
+/// Spatial "interface" for scene nodes
 ///
 /// It indicates scene nodes that need to be placed in the scene's octree and
 /// they participate in the visibility tests
-class Spartial
+class Spatial
 {
 public:
 	/// Pass the collision shape here so we can avoid the virtuals
-	Spartial(CollisionShape* cs_)
+	Spatial(CollisionShape* cs_)
 		: cs(cs_)
 	{}