Mercurial > fife-parpg

diff engine/core/controller/enginesettings.cpp @ 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 51bbda7676f0
children 61a5f86a0db3
line wrap: on
line diff
--- a/engine/core/controller/enginesettings.cpp	Wed Nov 03 13:44:12 2010 +0000
+++ b/engine/core/controller/enginesettings.cpp	Fri Nov 05 15:21:10 2010 +0000
@@ -50,6 +50,7 @@
 		m_defaultfontpath(""),
 		m_defaultfontsize(8),
 		m_defaultfontglyphs(""),
+		m_lighting(0),
 		m_iscolorkeyenabled(false){
 			m_colorkey.r = 255;
 			m_colorkey.g = 0;
@@ -199,5 +200,13 @@
 	const std::string& EngineSettings::getVideoDriver() const {
 		return m_videodriver;
 	}
+	void EngineSettings::setLightingModel(unsigned int lighting) {
+		if (lighting <= 2) {
+			m_lighting = lighting;
+			return;
+		}
+		throw NotSupported("Given light model is not supported");
+	}
+
 }