Mercurial > fife-parpg

diff engine/core/view/camera.h @ 661:e3140f01749d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merged the light branch back into trunk. * Modified the demos so they work with the new loaders and setting.
author helios2000@33b003aa-7bff-0310-803a-e67f0ece8222
date Fri, 05 Nov 2010 15:21:10 +0000
parents 5f381fa34769
children
line wrap: on
line diff
--- a/engine/core/view/camera.h	Wed Nov 03 13:44:12 2010 +0000
+++ b/engine/core/view/camera.h	Fri Nov 05 15:21:10 2010 +0000
@@ -283,6 +283,10 @@
 		 */
 		bool testRenderedViewPort();
 
+		void setLightingColor(float red, float green, float blue, float alpha);
+		void resetLightingColor();
+		std::vector<float> getLightingColor();
+
 		/** Renders camera
 		 */
 		void render();
@@ -356,6 +360,11 @@
 		std::map<Layer*,LayerCache*> m_cache;
 		MapObserver* m_map_observer;
 		Map* m_map;
+
+		// is lighting enable
+		bool m_lighting;
+		// caches the light color for the camera
+		std::vector<float> m_light_colors;
 	};
 }
 #endif