# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1398653902 -10800
# Node ID 59a72293f9bd688c0f4f3b490f0be96a4e2c1aca
# Parent  4abdce1361b96b97215aec93a8f80e8761b8db13
continuing

diff -r 4abdce1361b9 -r 59a72293f9bd liberebus/liberebus.vcxproj
--- a/liberebus/liberebus.vcxproj	Sun Apr 27 16:02:47 2014 +0300
+++ b/liberebus/liberebus.vcxproj	Mon Apr 28 05:58:22 2014 +0300
@@ -30,6 +30,8 @@
     <ClCompile Include="src\camera.cc" />
     <ClCompile Include="src\erebus.cc" />
     <ClCompile Include="src\object.cc" />
+    <ClCompile Include="src\scene.cc" />
+    <ClCompile Include="src\snode.cc" />
   </ItemGroup>
   <ItemGroup>
     <None Include="src\image.inl" />
diff -r 4abdce1361b9 -r 59a72293f9bd liberebus/liberebus.vcxproj.filters
--- a/liberebus/liberebus.vcxproj.filters	Sun Apr 27 16:02:47 2014 +0300
+++ b/liberebus/liberebus.vcxproj.filters	Mon Apr 28 05:58:22 2014 +0300
@@ -68,6 +68,12 @@
     <ClCompile Include="src\brdf.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\scene.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\snode.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="src\image.inl">
diff -r 4abdce1361b9 -r 59a72293f9bd liberebus/src/scene.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/liberebus/src/scene.cc	Mon Apr 28 05:58:22 2014 +0300
@@ -0,0 +1,51 @@
+#include "scene.h"
+
+Scene::Scene()
+{
+	active_cam = 0;
+}
+
+Scene::~Scene()
+{
+	for(auto obj : objects) {
+		delete obj;
+	}
+	for(auto node : nodes) {
+		delete node;
+	}
+}
+
+void Scene::add_object(Object *obj)
+{
+	objects.push_back(obj);
+}
+
+int Scene::get_object_count() const
+{
+	return (int)objects.size();
+}
+
+Object *Scene::get_object(int idx) const
+{
+	return objects[idx];
+}
+
+void Scene::add_node(SceneNode *node)
+{
+	nodes.push_back(node);
+}
+
+int Scene::get_node_count() const
+{
+	return (int)nodes.size();
+}
+
+SceneNode *Scene::get_node(int idx) const
+{
+	return nodes[idx];
+}
+
+bool Scene::intersect(const Ray &ray, RayHit *hit) const
+{
+
+}
\ No newline at end of file
diff -r 4abdce1361b9 -r 59a72293f9bd liberebus/src/scene.h
--- a/liberebus/src/scene.h	Sun Apr 27 16:02:47 2014 +0300
+++ b/liberebus/src/scene.h	Mon Apr 28 05:58:22 2014 +0300
@@ -17,7 +17,14 @@
 	~Scene();
 
 	void add_object(Object *obj);
-	Object *get_object(int idx);
+	int get_object_count() const;
+	Object *get_object(int idx) const;
+
+	void add_node(SceneNode *node);
+	int get_node_count() const;
+	SceneNode *get_node(int idx) const;
+
+	bool intersect(const Ray &ray, RayHit *hit) const;
 };
 
 #endif	// SCENE_H_
\ No newline at end of file
diff -r 4abdce1361b9 -r 59a72293f9bd liberebus/src/snode.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/liberebus/src/snode.cc	Mon Apr 28 05:58:22 2014 +0300
@@ -0,0 +1,107 @@
+#include <assert.h>
+#include <algorithm>
+#include "snode.h"
+
+void SceneNode::add_child(SceneNode *node)
+{
+	if(node->parent) {
+		if(node->parent == this) {
+			return;
+		}
+		node->parent->remove_child(node);
+	}
+
+	children.push_back(node);
+	node->parent = this;
+}
+
+bool SceneNode::remove_child(SceneNode *node)
+{
+	auto it = std::find(children.begin(), children.end(), node);
+	if(it != children.end()) {
+		assert(node->parent == this);
+		node->parent = 0;
+	}
+}
+
+int SceneNode::get_num_children() const
+{
+	return (int)children.size();
+}
+
+SceneNode *SceneNode::get_child(int idx) const
+{
+	return children[idx];
+}
+
+void SceneNode::set_position(const Vector3 &pos)
+{
+	this->pos = pos;
+}
+
+void SceneNode::set_rotation(const Quaternion &rot)
+{
+	this->rot = rot;
+}
+
+void SceneNode::set_scaling(const Vector3 &scale)
+{
+	this->scale = scale;
+}
+
+
+const Vector3 &SceneNode::get_node_position() const
+{
+	return pos;
+}
+
+const Quaternion &SceneNode::get_node_rotation() const
+{
+	return rot;
+}
+
+const Vector3 &SceneNode::get_node_scaling() const
+{
+	return scale;
+}
+
+
+Vector3 SceneNode::get_position() const
+{
+	return Vector3{0, 0, 0}.transformed(xform);
+}
+
+Quaternion SceneNode::get_rotation() const
+{
+	return rot;	// TODO
+}
+
+Vector3 SceneNode::get_scaling() const
+{
+	return scale;	// TODO
+}
+
+
+void SceneNode::update_node(long msec)
+{
+	node_xform.reset_identity();
+	node_xform.translate(pos);
+	node_xform.rotate(rot);
+	node_xform.scale(scale);
+
+	xform = parent ? parent->xform * node_xform : node_xform;
+}
+
+void SceneNode::update(long msec)
+{
+	update_node(msec);
+
+	for(size_t i=0; i<children.size(); i++) {
+		children[i]->update(msec);
+	}
+}
+
+
+bool SceneNode::intersect(const Ray &ray, RayHit *hit) const
+{
+}
\ No newline at end of file
diff -r 4abdce1361b9 -r 59a72293f9bd liberebus/src/snode.h
--- a/liberebus/src/snode.h	Sun Apr 27 16:02:47 2014 +0300
+++ b/liberebus/src/snode.h	Mon Apr 28 05:58:22 2014 +0300
@@ -16,8 +16,11 @@
 	SceneNode *parent;
 	std::vector<SceneNode*> children;
 
+	Matrix4x4 node_xform, xform;
+
 public:
 	void add_child(SceneNode *node);
+	bool remove_child(SceneNode *node);
 
 	int get_num_children() const;
 	SceneNode *get_child(int idx) const;
@@ -30,12 +33,14 @@
 	const Quaternion &get_node_rotation() const;
 	const Vector3 &get_node_scaling() const;
 
-	const Vector3 &get_position() const;
-	const Quaternion &get_rotation() const;
-	const Vector3 &get_scaling() const;
+	Vector3 get_position() const;
+	Quaternion get_rotation() const;
+	Vector3 get_scaling() const;
 
-	void update_node(long msec = 0) const;
-	void update(long msec = 0) const;
+	void update_node(long msec = 0);
+	void update(long msec = 0);
+
+	bool intersect(const Ray &ray, RayHit *hit) const;
 };
 
 #endif	// SNODE_H_
\ No newline at end of file