Panagiotis Christopoulos Charitos 15 years ago
parent
commit
9741b57504

File diff suppressed because it is too large
+ 0 - 1
build/debug/Makefile


+ 2 - 2
src/Core/App.cpp

@@ -60,8 +60,8 @@ void App::parseCommandLineArgs(int argc, char* argv[])
 //======================================================================================================================
 void App::init(int argc, char* argv[])
 {
-	windowW = 1280;
-	windowH = 720;
+	windowW = 1700;
+	windowH = 1000;
 	terminalColoringEnabled = true,
 	fullScreenFlag = false;
 

+ 1 - 1
src/Misc/TestHeader.cpp

@@ -1 +1 @@
-#include "Model.h"
+#include "VisibilityTester.h"

+ 19 - 0
src/Scene/VisibilityTester.cpp

@@ -0,0 +1,19 @@
+#include "VisibilityTester.h"
+#include "Scene.h"
+
+
+//======================================================================================================================
+// Constructor                                                                                                         =
+//======================================================================================================================
+VisibilityTester::VisibilityTester(const Scene& scene_):
+	scene(scene_)
+{}
+
+
+//======================================================================================================================
+// test                                                                                                                =
+//======================================================================================================================
+void VisibilityTester::test(const Camera& cam)
+{
+	//Scene
+}

+ 23 - 5
src/Scene/VisibilityTester.h

@@ -2,24 +2,42 @@
 #define VISIBILITY_TESTER_H
 
 #include <deque>
+#include "Properties.h"
+
+
+class Camera;
+class Scene;
+class SceneRenderable;
 
 
 class VisibilityTester
 {
 	public:
 		/// Types
-		template<typedef Type>
+		template<typename Type>
 		class Types
 		{
-			typedef std::deque<Type> Container;
-			typedef typename Container::iterator Iterator;
-			typedef typename Container::const_iterator ConstIterator;
+			public:
+				typedef std::deque<Type*> Container;
+				typedef typename Container::iterator Iterator;
+				typedef typename Container::const_iterator ConstIterator;
 		};
 
+		VisibilityTester(const Scene& scene);
+
+		/// @name Accessors
+		/// @{
+		GETTER_R(Types<SceneRenderable>::Container, renderables, getRenderables)
+		GETTER_R(Types<SceneRenderable>::Container, lights, getLights)
+		/// @}
+
 		void test(const Camera& cam);
 
 	private:
-		Scene& scene; ///< Know your father
+		const Scene& scene; ///< Know your father
+
+		Types<SceneRenderable>::Container renderables;
+		Types<SceneRenderable>::Container lights;
 };
 
 

+ 0 - 2
src/Scripting/Core/App.bpi.cpp

@@ -1,7 +1,5 @@
 #include "ScriptingCommon.h"
 #include "App.h"
-#include "Scene.h"
-#include "MainRenderer.h"
 
 
 WRAP(App)

Some files were not shown because too many files changed in this diff