Added a way to switch cameras in a scene

Bindings/Contents/LUA/API/Polycode/Scene.lua

@@ -97,6 +97,22 @@ function Scene:getDefaultCamera()
 	end
 end
 
+function Scene:getActiveCamera()
+	local retVal =  Polycore.Scene_getActiveCamera(self.__ptr)
+	if retVal == nil then return nil end
+	if Polycore.__ptr_lookup[retVal] ~= nil then
+		return Polycore.__ptr_lookup[retVal]
+	else
+		Polycore.__ptr_lookup[retVal] = Camera("__skip_ptr__")
+		Polycore.__ptr_lookup[retVal].__ptr = retVal
+		return Polycore.__ptr_lookup[retVal]
+	end
+end
+
+function Scene:setActiveCamera(camera)
+	local retVal = Polycore.Scene_setActiveCamera(self.__ptr, camera.__ptr)
+end
+
 function Scene:enableLighting(enable)
 	local retVal = Polycore.Scene_enableLighting(self.__ptr, enable)
 end

Bindings/Contents/LUA/Include/PolycodeLUAWrappers.h

@@ -7096,6 +7096,27 @@ static int Polycore_Scene_getDefaultCamera(lua_State *L) {
 	return 1;
 }
 
+static int Polycore_Scene_getActiveCamera(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	Scene *inst = (Scene*)lua_topointer(L, 1);
+	void *ptrRetVal = (void*)inst->getActiveCamera();
+	if(ptrRetVal == NULL) {
+		lua_pushnil(L);
+	} else {
+		lua_pushlightuserdata(L, ptrRetVal);
+	}
+	return 1;
+}
+
+static int Polycore_Scene_setActiveCamera(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	Scene *inst = (Scene*)lua_topointer(L, 1);
+	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
+	Camera* camera = (Camera*)lua_topointer(L, 2);
+	inst->setActiveCamera(camera);
+	return 0;
+}
+
 static int Polycore_Scene_enableLighting(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	Scene *inst = (Scene*)lua_topointer(L, 1);

Bindings/Contents/LUA/Source/PolycodeLUA.cpp

@@ -748,6 +748,8 @@ int luaopen_Polycode(lua_State *L) {
 		{"Scene_addEntity", Polycore_Scene_addEntity},
 		{"Scene_removeEntity", Polycore_Scene_removeEntity},
 		{"Scene_getDefaultCamera", Polycore_Scene_getDefaultCamera},
+		{"Scene_getActiveCamera", Polycore_Scene_getActiveCamera},
+		{"Scene_setActiveCamera", Polycore_Scene_setActiveCamera},
 		{"Scene_enableLighting", Polycore_Scene_enableLighting},
 		{"Scene_enableFog", Polycore_Scene_enableFog},
 		{"Scene_setFogProperties", Polycore_Scene_setFogProperties},

Core/Contents/Include/PolyScene.h

@@ -73,6 +73,18 @@ namespace Polycode {
 		*/				
 		Camera *getDefaultCamera();
 		
+		/**
+		* Returns the scene's active camera.
+		* @return The scene's active camera.
+		*/						
+		Camera *getActiveCamera();
+		
+		/**
+		* Sets the scene's active camera.
+		* @param camera New camera to set as the active camera.
+		*/
+		void setActiveCamera(Camera *camera);
+		
 		/**
 		* Enables and disables lighting in the scene.
 		* @param enable If false, disables lighting in the scene, if true, enables it.		
@@ -193,6 +205,7 @@ namespace Polycode {
 		bool isSceneVirtual;
 		
 		Camera *defaultCamera;
+		Camera *activeCamera;
 		std::vector <SceneEntity*> entities;
 		
 		bool lightingEnabled;

Core/Contents/Include/PolyScenePrimitive.h

@@ -70,8 +70,8 @@ namespace Polycode {
 
 			/**
 			* A cylinder.
-			* v1 - Cylinder radius
-			* v2 - Cylinder length			
+			* v1 - Cylinder length			
+			* v2 - Cylinder radius
 			* v3 - Number of segments.
 			*/			
 			static const int TYPE_CYLINDER = 3;

Core/Contents/Source/PolyScene.cpp

@@ -39,6 +39,7 @@ using namespace Polycode;
 
 Scene::Scene() : EventDispatcher() {
 	defaultCamera = new Camera(this);
+	activeCamera = defaultCamera;
 	CoreServices::getInstance()->getSceneManager()->addScene(this);
 	fogEnabled = false;
 	lightingEnabled = false;
@@ -53,6 +54,7 @@ Scene::Scene() : EventDispatcher() {
 
 Scene::Scene(bool virtualScene) {
 	defaultCamera = new Camera(this);
+	activeCamera = defaultCamera;	
 	fogEnabled = false;
 	lightingEnabled = false;
 	enabled = true;
@@ -63,7 +65,13 @@ Scene::Scene(bool virtualScene) {
 	useClearColor = false;	
 }
 
+void Scene::setActiveCamera(Camera *camera) {
+	activeCamera = camera;
+}
 
+Camera *Scene::getActiveCamera() {
+	return activeCamera;
+}
 
 void Scene::setVirtual(bool val) {
 	isSceneVirtual = val;
@@ -145,11 +153,11 @@ Camera *Scene::getDefaultCamera() {
 
 void Scene::Render(Camera *targetCamera) {
 	
-	if(!targetCamera && !defaultCamera)
+	if(!targetCamera && !activeCamera)
 		return;
 	
 	if(!targetCamera)
-		targetCamera = defaultCamera;
+		targetCamera = activeCamera;
 	
 	// prepare lights...
 	for(int i=0; i<entities.size();i++) {

Core/Contents/Source/PolySceneManager.cpp

@@ -88,8 +88,8 @@ void SceneManager::Update() {
 			CoreServices::getInstance()->getRenderer()->loadIdentity();
 			Scene *scene = scenes[i];
 			scene->Update();
-			if(scene->getDefaultCamera()->hasFilterShader()) {
-				scene->getDefaultCamera()->drawFilter();
+			if(scene->getActiveCamera()->hasFilterShader()) {
+				scene->getActiveCamera()->drawFilter();
 			} else {
 				scene->Render();
 			}