Mercurial > parpg-core

changeset 184:9d9c4ccc081e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated settings to use the MouseSensitivity, MouseAcceleration, GLUseNPOT and GLUseFramebuffer options.
author KarstenBock@gmx.net
date Wed, 26 Oct 2011 13:01:49 +0200
parents 5d52f08633c0
children 756ce052ac85
files parpg.cfg.in src/parpg/application.py src/parpg/settings.py
diffstat 3 files changed, 54 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/parpg.cfg.in	Fri Oct 21 13:39:40 2011 +0200
+++ b/parpg.cfg.in	Wed Oct 26 13:01:49 2011 +0200
@@ -1,4 +1,5 @@
 [fife]
+#------------------------------------------------------------------------------
 # Options marked with ? are untested/unknown
 
 # Game window's title (string) DO NOT EDIT!
@@ -10,17 +11,19 @@
 # Video driver to use. (?)
 VideoDriver = ""
 
-# Backend to use for graphics (OpenGL|SDL)
+# Backend to use for graphics (OpenGL|OpenGLe|SDL)
 RenderBackend = OpenGL 
 
 # Run the game in fullscreen mode or not. (True|False)
 FullScreen = False
 
-# Screen Resolution's width. Not used if FullScreen is set to False (800|1024|etc)
-ScreenWidth = 800
+# Screen Resolution's width. Not used if FullScreen is set to False 
+# (800|1024|etc)
+ScreenWidth = 1024
 
-# Screen Resolution's height. Not used if FullScreen is set to False (600|768|etc)
-ScreenHeight = 600
+# Screen Resolution's height. Not used if FullScreen is set to False 
+# (600|768|etc)
+ScreenHeight = 768
 
 # Screen DPI? (?)
 BitsPerPixel = 0
@@ -28,6 +31,18 @@
 # ? (?)
 SDLRemoveFakeAlpha = 1
 
+# Use Framebuffer Objects (True|False)
+GLUseFramebuffer = True
+
+# Use NPOT textures (True|False)
+GLUseNPOT = True
+
+# The Sensitivity of the mouse. (-0.99 to 10.0)
+MouseSensitivity = 0.0
+
+# Sets whether the mouse should be accelerated. (True|False)
+MouseAcceleration = False
+
 # Subdirectory to load icons from (path)
 IconsPath = icons
 
@@ -44,13 +59,12 @@
 InitialVolume = 5.0
 
 # Characters to use to render fonts. DO NOT EDIT!
-FontGlyphs = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]""
+FontGlyphs = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]\""
 
 # Subdirectory to load fronts from (path)
 FontsPath = fonts
 
 # Font to load when game starts
-#TODO: make it so that the font name is supplied instead of the filename
 Font = oldtypewriter.ttf
 
 # Size of in-game fonts
@@ -72,12 +86,7 @@
 Lighting = 0
 
 [parpg]
-
-# Directory where the fife python module is located (path).
-FifePath = "@FIFEPATH@"
-
-# System directory where all data files are located (path)
-DataPath = "@DATADIR@"
+#------------------------------------------------------------------------------
 
 # System subdirectory to load maps from (path)
 MapsPath = maps
@@ -103,6 +112,12 @@
 # System subdirectory to load quests from (path)
 QuestsPath = quests
 
+# User subdirectory to save screenshots to
+ScreenshotsPath = screenshots
+
+# User subdirectory to save games to
+SavesPath = saves
+
 # System subdirectory where gui files are loaded from (path)
 GuiPath = gui
 
@@ -128,4 +143,4 @@
 ScrollSpeed = 1.0
 
 # Player walk speed (digit)
-PCSpeed = 3
+PCSpeed = 3
\ No newline at end of file
--- a/src/parpg/application.py	Fri Oct 21 13:39:40 2011 +0200
+++ b/src/parpg/application.py	Wed Oct 26 13:01:49 2011 +0200
@@ -168,6 +168,7 @@
         """
 
         engineSetting = self.engine.getSettings()
+        assert(isinstance(engineSetting, fife.EngineSettings))
         engineSetting.setDefaultFontGlyphs(self._setting.fife.FontGlyphs)
         engineSetting.setDefaultFontPath(
             '{0}/fonts/{1}'.format(self._setting.parpg.DataPath,
@@ -179,6 +180,8 @@
         engineSetting.setSDLRemoveFakeAlpha(
             self._setting.fife.SDLRemoveFakeAlpha
         )
+        engineSetting.setGLUseFramebuffer(self._setting.fife.GLUseFramebuffer)
+        engineSetting.setGLUseNPOT(self._setting.fife.GLUseNPOT)
         engineSetting.setScreenWidth(self._setting.fife.ScreenWidth)
         engineSetting.setScreenHeight(self._setting.fife.ScreenHeight)
         engineSetting.setRenderBackend(self._setting.fife.RenderBackend)
@@ -186,7 +189,11 @@
         engineSetting.setVideoDriver(self._setting.fife.VideoDriver)
         engineSetting.setLightingModel(self._setting.fife.Lighting)
         engineSetting.setColorKeyEnabled(self._setting.fife.ColorKeyEnabled)
-
+        engineSetting.setMouseSensitivity(self._setting.fife.MouseSensitivity)
+        engineSetting.setMouseAcceleration(
+            self._setting.fife.MouseAcceleration
+        )
+        
         engineSetting.setColorKey(*[int(digit) 
                                     for digit in self._setting.fife.ColorKey])
 
--- a/src/parpg/settings.py	Fri Oct 21 13:39:40 2011 +0200
+++ b/src/parpg/settings.py	Wed Oct 26 13:01:49 2011 +0200
@@ -340,16 +340,18 @@
 # Video driver to use. (?)
 VideoDriver = ""
 
-# Backend to use for graphics (OpenGL|SDL)
+# Backend to use for graphics (OpenGL|OpenGLe|SDL)
 RenderBackend = OpenGL 
 
 # Run the game in fullscreen mode or not. (True|False)
 FullScreen = False
 
-# Screen Resolution's width. Not used if FullScreen is set to False (800|1024|etc)
+# Screen Resolution's width. Not used if FullScreen is set to False 
+# (800|1024|etc)
 ScreenWidth = 1024
 
-# Screen Resolution's height. Not used if FullScreen is set to False (600|768|etc)
+# Screen Resolution's height. Not used if FullScreen is set to False 
+# (600|768|etc)
 ScreenHeight = 768
 
 # Screen DPI? (?)
@@ -358,6 +360,18 @@
 # ? (?)
 SDLRemoveFakeAlpha = 1
 
+# Use Framebuffer Objects (True|False)
+GLUseFramebuffer = True
+
+# Use NPOT textures (True|False)
+GLUseNPOT = True
+
+# The Sensitivity of the mouse. (-0.99 to 10.0)
+MouseSensitivity = 0.0
+
+# Sets whether the mouse should be accelerated. (True|False)
+MouseAcceleration = False
+
 # Subdirectory to load icons from (path)
 IconsPath = icons