diff --git a/media/Engine/Error.mesh b/bin/media/Engine/Error.mesh
similarity index 100%
rename from media/Engine/Error.mesh
rename to bin/media/Engine/Error.mesh
diff --git a/media/Engine/README b/bin/media/Engine/README
similarity index 100%
rename from media/Engine/README
rename to bin/media/Engine/README
diff --git a/media/Entities/ErrorObject.info b/bin/media/Entities/ErrorObject.info
similarity index 100%
rename from media/Entities/ErrorObject.info
rename to bin/media/Entities/ErrorObject.info
diff --git a/media/Entities/ErrorObject/ErrorObject.mesh b/bin/media/Entities/ErrorObject/ErrorObject.mesh
similarity index 100%
rename from media/Entities/ErrorObject/ErrorObject.mesh
rename to bin/media/Entities/ErrorObject/ErrorObject.mesh
diff --git a/bin/media/Entities/Light.info b/bin/media/Entities/Light.info
new file mode 100644
index 0000000..49a7b35
--- /dev/null
+++ b/bin/media/Entities/Light.info
@@ -0,0 +1,16 @@
+common_settigns
+{
+ name Light
+ type object
+
+ position "0, 0, 0"
+ orientation "Default"
+ scale "1, 1, 1"
+
+ visible true
+}
+
+type_settings
+{
+ mesh "Light/Light.mesh"
+}
diff --git a/bin/media/Entities/Light/Light.blend b/bin/media/Entities/Light/Light.blend
new file mode 100644
index 0000000..7b8a76f
Binary files /dev/null and b/bin/media/Entities/Light/Light.blend differ
diff --git a/bin/media/Entities/Light/Light.blend1 b/bin/media/Entities/Light/Light.blend1
new file mode 100644
index 0000000..77fe32d
Binary files /dev/null and b/bin/media/Entities/Light/Light.blend1 differ
diff --git a/bin/media/Entities/Light/Light.material b/bin/media/Entities/Light/Light.material
new file mode 100644
index 0000000..7e49c67
--- /dev/null
+++ b/bin/media/Entities/Light/Light.material
@@ -0,0 +1,11 @@
+material Material.001
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ lighting off
+ }
+ }
+}
diff --git a/bin/media/Entities/Light/Light.mesh b/bin/media/Entities/Light/Light.mesh
new file mode 100644
index 0000000..70a6005
Binary files /dev/null and b/bin/media/Entities/Light/Light.mesh differ
diff --git a/bin/media/Entities/Light/Light.mesh.xml b/bin/media/Entities/Light/Light.mesh.xml
new file mode 100644
index 0000000..593a718
--- /dev/null
+++ b/bin/media/Entities/Light/Light.mesh.xml
@@ -0,0 +1,6444 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/media/Entities/Light/OgreXMLConverter.log b/bin/media/Entities/Light/OgreXMLConverter.log
new file mode 100644
index 0000000..0122713
--- /dev/null
+++ b/bin/media/Entities/Light/OgreXMLConverter.log
@@ -0,0 +1,31 @@
+20:25:28: Creating resource group General
+20:25:28: Creating resource group Internal
+20:25:28: Creating resource group Autodetect
+20:25:28: Registering ResourceManager for type Mesh
+20:25:28: Registering ResourceManager for type Material
+20:25:28: Registering ResourceManager for type Skeleton
+20:25:28: XMLMeshSerializer reading mesh data from /home/michael/Desktop/pseudoform-2/Pseudoform-2/bin/pong-media/Entities/Light/Light.mesh.xml...
+20:25:28: Reading submeshes...
+20:25:28: Reading geometry...
+20:25:28: Geometry done...
+20:25:28: Submeshes done.
+20:25:28: XMLMeshSerializer import successful.
+20:25:28: Reorganising vertex buffers to automatic layout..
+20:25:28: MeshSerializer writing mesh data to /home/michael/Desktop/pseudoform-2/Pseudoform-2/bin/pong-media/Entities/Light/Light.mesh...
+20:25:28: File header written.
+20:25:28: Writing mesh data...
+20:25:28: Writing submesh...
+20:25:28: Exporting submesh texture aliases...
+20:25:28: Submesh texture aliases exported.
+20:25:28: Submesh exported.
+20:25:28: Exporting bounds information....
+20:25:28: Bounds information exported.
+20:25:28: Exporting submesh name table...
+20:25:28: Submesh name table exported.
+20:25:28: Exporting edge lists...
+20:25:28: Edge lists exported
+20:25:28: Mesh data exported.
+20:25:28: MeshSerializer export successful.
+20:25:28: Unregistering ResourceManager for type Skeleton
+20:25:28: Unregistering ResourceManager for type Material
+20:25:28: Unregistering ResourceManager for type Mesh
diff --git a/bin/media/Entities/Light/test.jpg b/bin/media/Entities/Light/test.jpg
new file mode 100644
index 0000000..d1167a8
Binary files /dev/null and b/bin/media/Entities/Light/test.jpg differ
diff --git a/media/Entities/MainCamera.info b/bin/media/Entities/MainCamera.info
similarity index 100%
rename from media/Entities/MainCamera.info
rename to bin/media/Entities/MainCamera.info
diff --git a/media/Fonts/Pneumatics.fontdef b/bin/media/Fonts/Pneumatics.fontdef
similarity index 100%
rename from media/Fonts/Pneumatics.fontdef
rename to bin/media/Fonts/Pneumatics.fontdef
diff --git a/media/Fonts/StarWars.fontdef b/bin/media/Fonts/StarWars.fontdef
similarity index 100%
rename from media/Fonts/StarWars.fontdef
rename to bin/media/Fonts/StarWars.fontdef
diff --git a/media/Fonts/pneumati.ttf b/bin/media/Fonts/pneumati.ttf
similarity index 100%
rename from media/Fonts/pneumati.ttf
rename to bin/media/Fonts/pneumati.ttf
diff --git a/media/Fonts/solo5.ttf b/bin/media/Fonts/solo5.ttf
similarity index 100%
rename from media/Fonts/solo5.ttf
rename to bin/media/Fonts/solo5.ttf
diff --git a/media/MyGUI/DejaVuSans-ExtraLight.ttf b/bin/media/MyGUI/DejaVuSans-ExtraLight.ttf
similarity index 100%
rename from media/MyGUI/DejaVuSans-ExtraLight.ttf
rename to bin/media/MyGUI/DejaVuSans-ExtraLight.ttf
diff --git a/media/MyGUI/DejaVuSans.ttf b/bin/media/MyGUI/DejaVuSans.ttf
similarity index 100%
rename from media/MyGUI/DejaVuSans.ttf
rename to bin/media/MyGUI/DejaVuSans.ttf
diff --git a/media/MyGUI/body_bg.png b/bin/media/MyGUI/body_bg.png
similarity index 100%
rename from media/MyGUI/body_bg.png
rename to bin/media/MyGUI/body_bg.png
diff --git a/media/MyGUI/body_content_bg.png b/bin/media/MyGUI/body_content_bg.png
similarity index 100%
rename from media/MyGUI/body_content_bg.png
rename to bin/media/MyGUI/body_content_bg.png
diff --git a/media/MyGUI/body_footer.png b/bin/media/MyGUI/body_footer.png
similarity index 100%
rename from media/MyGUI/body_footer.png
rename to bin/media/MyGUI/body_footer.png
diff --git a/media/MyGUI/body_logo.png b/bin/media/MyGUI/body_logo.png
similarity index 100%
rename from media/MyGUI/body_logo.png
rename to bin/media/MyGUI/body_logo.png
diff --git a/media/MyGUI/body_nav_bg.png b/bin/media/MyGUI/body_nav_bg.png
similarity index 100%
rename from media/MyGUI/body_nav_bg.png
rename to bin/media/MyGUI/body_nav_bg.png
diff --git a/media/MyGUI/button_active_left.png b/bin/media/MyGUI/button_active_left.png
similarity index 100%
rename from media/MyGUI/button_active_left.png
rename to bin/media/MyGUI/button_active_left.png
diff --git a/media/MyGUI/button_active_right.png b/bin/media/MyGUI/button_active_right.png
similarity index 100%
rename from media/MyGUI/button_active_right.png
rename to bin/media/MyGUI/button_active_right.png
diff --git a/media/MyGUI/button_community.png b/bin/media/MyGUI/button_community.png
similarity index 100%
rename from media/MyGUI/button_community.png
rename to bin/media/MyGUI/button_community.png
diff --git a/media/MyGUI/button_customize.png b/bin/media/MyGUI/button_customize.png
similarity index 100%
rename from media/MyGUI/button_customize.png
rename to bin/media/MyGUI/button_customize.png
diff --git a/media/MyGUI/button_play.png b/bin/media/MyGUI/button_play.png
similarity index 100%
rename from media/MyGUI/button_play.png
rename to bin/media/MyGUI/button_play.png
diff --git a/media/MyGUI/core.png b/bin/media/MyGUI/core.png
similarity index 100%
rename from media/MyGUI/core.png
rename to bin/media/MyGUI/core.png
diff --git a/media/MyGUI/core.xml b/bin/media/MyGUI/core.xml
similarity index 100%
rename from media/MyGUI/core.xml
rename to bin/media/MyGUI/core.xml
diff --git a/media/MyGUI/core_black_blue.png b/bin/media/MyGUI/core_black_blue.png
similarity index 100%
rename from media/MyGUI/core_black_blue.png
rename to bin/media/MyGUI/core_black_blue.png
diff --git a/media/MyGUI/core_black_orange.png b/bin/media/MyGUI/core_black_orange.png
similarity index 100%
rename from media/MyGUI/core_black_orange.png
rename to bin/media/MyGUI/core_black_orange.png
diff --git a/media/MyGUI/core_font.xml b/bin/media/MyGUI/core_font.xml
similarity index 100%
rename from media/MyGUI/core_font.xml
rename to bin/media/MyGUI/core_font.xml
diff --git a/media/MyGUI/core_language.xml b/bin/media/MyGUI/core_language.xml
similarity index 100%
rename from media/MyGUI/core_language.xml
rename to bin/media/MyGUI/core_language.xml
diff --git a/media/MyGUI/core_language_english_tag.xml b/bin/media/MyGUI/core_language_english_tag.xml
similarity index 100%
rename from media/MyGUI/core_language_english_tag.xml
rename to bin/media/MyGUI/core_language_english_tag.xml
diff --git a/media/MyGUI/core_language_russian_tag.xml b/bin/media/MyGUI/core_language_russian_tag.xml
similarity index 100%
rename from media/MyGUI/core_language_russian_tag.xml
rename to bin/media/MyGUI/core_language_russian_tag.xml
diff --git a/media/MyGUI/core_layer.xml b/bin/media/MyGUI/core_layer.xml
similarity index 100%
rename from media/MyGUI/core_layer.xml
rename to bin/media/MyGUI/core_layer.xml
diff --git a/media/MyGUI/core_micro_font.PNG b/bin/media/MyGUI/core_micro_font.PNG
similarity index 100%
rename from media/MyGUI/core_micro_font.PNG
rename to bin/media/MyGUI/core_micro_font.PNG
diff --git a/media/MyGUI/core_pointer.png b/bin/media/MyGUI/core_pointer.png
similarity index 100%
rename from media/MyGUI/core_pointer.png
rename to bin/media/MyGUI/core_pointer.png
diff --git a/media/MyGUI/core_pointer.xml b/bin/media/MyGUI/core_pointer.xml
similarity index 100%
rename from media/MyGUI/core_pointer.xml
rename to bin/media/MyGUI/core_pointer.xml
diff --git a/media/MyGUI/core_pointers_W32.xml b/bin/media/MyGUI/core_pointers_W32.xml
similarity index 100%
rename from media/MyGUI/core_pointers_W32.xml
rename to bin/media/MyGUI/core_pointers_W32.xml
diff --git a/media/MyGUI/core_resource.xml b/bin/media/MyGUI/core_resource.xml
similarity index 100%
rename from media/MyGUI/core_resource.xml
rename to bin/media/MyGUI/core_resource.xml
diff --git a/media/MyGUI/core_settings.xml b/bin/media/MyGUI/core_settings.xml
similarity index 100%
rename from media/MyGUI/core_settings.xml
rename to bin/media/MyGUI/core_settings.xml
diff --git a/media/MyGUI/core_skin.xml b/bin/media/MyGUI/core_skin.xml
similarity index 100%
rename from media/MyGUI/core_skin.xml
rename to bin/media/MyGUI/core_skin.xml
diff --git a/media/MyGUI/core_theme.xml b/bin/media/MyGUI/core_theme.xml
similarity index 100%
rename from media/MyGUI/core_theme.xml
rename to bin/media/MyGUI/core_theme.xml
diff --git a/media/MyGUI/core_theme_black_blue_tag.xml b/bin/media/MyGUI/core_theme_black_blue_tag.xml
similarity index 100%
rename from media/MyGUI/core_theme_black_blue_tag.xml
rename to bin/media/MyGUI/core_theme_black_blue_tag.xml
diff --git a/media/MyGUI/core_theme_black_orange_tag.xml b/bin/media/MyGUI/core_theme_black_orange_tag.xml
similarity index 100%
rename from media/MyGUI/core_theme_black_orange_tag.xml
rename to bin/media/MyGUI/core_theme_black_orange_tag.xml
diff --git a/media/MyGUI/core_theme_tag.xml b/bin/media/MyGUI/core_theme_tag.xml
similarity index 100%
rename from media/MyGUI/core_theme_tag.xml
rename to bin/media/MyGUI/core_theme_tag.xml
diff --git a/media/MyGUI/pneumati.ttf b/bin/media/MyGUI/pneumati.ttf
similarity index 100%
rename from media/MyGUI/pneumati.ttf
rename to bin/media/MyGUI/pneumati.ttf
diff --git a/media/Pseudoform.layout b/bin/media/Pseudoform.layout
similarity index 100%
rename from media/Pseudoform.layout
rename to bin/media/Pseudoform.layout
diff --git a/media/Statistic.layout b/bin/media/Statistic.layout
similarity index 100%
rename from media/Statistic.layout
rename to bin/media/Statistic.layout
diff --git a/bin/settings.info b/bin/settings.info
index 4720647..1f3058f 100644
--- a/bin/settings.info
+++ b/bin/settings.info
@@ -33,5 +33,6 @@ resources
MediaFolder1 "media/Fonts"
MediaFolder2 "media/Materials"
MediaFolder3 "media/Entities"
+ MediaEngine "media/Engine"
MyGUI "media/MyGUI"
}
diff --git a/include/Managers/Entities/Camera.hpp b/include/Managers/Entities/Camera.hpp
index a39f25d..46564f4 100644
--- a/include/Managers/Entities/Camera.hpp
+++ b/include/Managers/Entities/Camera.hpp
@@ -33,7 +33,7 @@ class Camera : public Entity
Ogre::Camera *handle();
Ogre::SceneNode *getPitchNode();
- void loadFromFile(const string &filePath);
+ Camera *loadFromFile(const string &filePath);
void setCameraType(CameraType type);
void setActive(bool state);
diff --git a/include/Managers/Entities/Entity.hpp b/include/Managers/Entities/Entity.hpp
index 4d588c9..78d695c 100644
--- a/include/Managers/Entities/Entity.hpp
+++ b/include/Managers/Entities/Entity.hpp
@@ -29,7 +29,7 @@ class Entity : private boost::noncopyable
bool parseArguments(const string &argName, const string &argData, float *outData, vector &storage);
ptree defaultLoader(const string &infoPath); // Predefined loading of common settings
- virtual void loadFromFile(const string &filePath) = 0; // Loading entity type-derived settings
+ virtual Entity *loadFromFile(const string &filePath) = 0; // Loading entity type-derived settings
void defaultDump(); // Dumping default entity settings
virtual void dump() = 0; // Dumping type-related entity settings
@@ -46,7 +46,7 @@ class Entity : private boost::noncopyable
Ogre::SceneNode *getNode() const;
Ogre::Entity *getEntity() const;
-
+
const vec3 &getPosition() const;
const quat &getOrientation() const;
const vec3 &getScale() const;
@@ -54,7 +54,7 @@ class Entity : private boost::noncopyable
void setName(const string &entityName);
void setMeshName(const string &meshPath);
void setDrawable(bool state);
-
+
void setMaterial(const string &matName, const string &group = Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
void setPosition(const vec3 &pos = vec3());
void setRotation(const quat &rot = quat());
diff --git a/include/Managers/Entities/Light.hpp b/include/Managers/Entities/Light.hpp
index c19c637..cb3f1c5 100644
--- a/include/Managers/Entities/Light.hpp
+++ b/include/Managers/Entities/Light.hpp
@@ -19,7 +19,7 @@ class Light : public Entity
Light(const string &entityName);
Ogre::Light *handle();
- void loadFromFile(const string &filePath);
+ Light *loadFromFile(const string &filePath);
void setDiffuse(const colour &diffuse);
void setSpecular(const colour &specular);
diff --git a/include/Managers/Entities/Object.hpp b/include/Managers/Entities/Object.hpp
index c81a0f1..d147d54 100644
--- a/include/Managers/Entities/Object.hpp
+++ b/include/Managers/Entities/Object.hpp
@@ -18,7 +18,7 @@ class Object : public Entity
void setImage(const string& imgPath);
// Inherited from Entity class
- void loadFromFile(const string &filePath);
+ Object *loadFromFile(const string &filePath);
void dump();
string type();
void update(float elapsed);
diff --git a/samples/pong-cpp/main.cpp b/samples/pong-cpp/main.cpp
index f7bb286..f3cc0d0 100644
--- a/samples/pong-cpp/main.cpp
+++ b/samples/pong-cpp/main.cpp
@@ -36,9 +36,11 @@ class GameState : public State
MakeCamera("MainCamera")->loadFromFile("Entities/MainCamera.info");
MakeLight("DirectionalLight");
MakeObject("ErrorObject")->loadFromFile("Entities/ErrorObject.info");
+ MakeObject("TestLight")->loadFromFile("Entities/Light.info")->dump();
- GetCamera("MainCamera")->dump();
- GetObject("ErrorObject")->dump();
+ //GetCamera("MainCamera")->dump();
+ //GetObject("ErrorObject")->dump();
+ GetObject("TestLight")->setPosition(vec3(0, 50, 0));
}
string type() { return "GameState"; }
diff --git a/src/Managers/Entities/Camera.cpp b/src/Managers/Entities/Camera.cpp
index 6839107..3045438 100644
--- a/src/Managers/Entities/Camera.cpp
+++ b/src/Managers/Entities/Camera.cpp
@@ -17,7 +17,7 @@ Camera::Camera(const string &entityName)
mPitchNode->attachObject(mCamera);
}
-void Camera::loadFromFile(const string &filePath)
+Camera *Camera::loadFromFile(const string &filePath)
{
ptree tree_handle = defaultLoader(filePath);
@@ -49,6 +49,8 @@ void Camera::loadFromFile(const string &filePath)
setCameraType(Camera::ATTACHED);
else
setCameraType(Camera::DONT_USE);
+
+ return this;
}
Ogre::Camera *Camera::handle() { return mCamera; }
diff --git a/src/Managers/Entities/Light.cpp b/src/Managers/Entities/Light.cpp
index 7dc40c9..218f759 100644
--- a/src/Managers/Entities/Light.cpp
+++ b/src/Managers/Entities/Light.cpp
@@ -14,7 +14,7 @@ Light::Light(const string &entityName)
mNode->attachObject(mEntity);
}
-void Light::loadFromFile(const string &filePath)
+Light *Light::loadFromFile(const string &filePath)
{
ptree tree_handle = defaultLoader(filePath);
@@ -36,6 +36,8 @@ void Light::loadFromFile(const string &filePath)
mNode->detachObject(mEntity);
mNode->attachObject(mLight);
+
+ return this;
}
void Light::dump()
diff --git a/src/Managers/Entities/Object.cpp b/src/Managers/Entities/Object.cpp
index f21236c..6e85076 100644
--- a/src/Managers/Entities/Object.cpp
+++ b/src/Managers/Entities/Object.cpp
@@ -15,7 +15,7 @@ Object::Object(const string &entityName, const string &resGroup)
mNode->attachObject(mEntity);
}
-void Object::loadFromFile(const string &filePath)
+Object *Object::loadFromFile(const string &filePath)
{
ptree tree_handle = defaultLoader(filePath);
@@ -31,6 +31,8 @@ void Object::loadFromFile(const string &filePath)
mEntity = graphicSystem.getSceneMgr()->createEntity(mEntityName, mEntityMesh);
mNode->attachObject(mEntity);
+
+ return this;
}
void Object::dump()