Changeset 8071

Timestamp:

Mar 14, 2011, 3:53:38 AM (13 years ago)

Author:

rgrieder

Message:

Merged ois_update branch (before it was renamed to mac_osx) into kicklib branch.

Location:

code/branches/kicklib

Files:

• . (modified) (1 prop)
• CMakeLists.txt (modified) (1 diff)
• cmake/CompilerConfigGCC.cmake (modified) (3 diffs)
• cmake/CompilerConfigMSVC.cmake (modified) (1 diff)
• cmake/LibraryConfig.cmake (modified) (3 diffs)
• cmake/LibraryConfigApple.cmake (deleted)
• cmake/LibraryConfigOSX.cmake (copied) (copied from code/branches/ois_update/cmake/LibraryConfigOSX.cmake)
• cmake/PackageConfig.cmake (modified) (1 diff)
• cmake/PackageConfigMSVC.cmake (modified) (1 diff)
• cmake/PackageConfigMinGW.cmake (modified) (1 diff)
• cmake/PackageConfigOSX.cmake (copied) (copied from code/branches/ois_update/cmake/PackageConfigOSX.cmake)
• cmake/tools/CheckOGREPlugins.cmake (modified) (1 diff)
• cmake/tools/CheckPackageVersion.cmake (copied) (copied from code/branches/ois_update/cmake/tools/CheckPackageVersion.cmake)
• cmake/tools/FindALUT.cmake (modified) (2 diffs)
• cmake/tools/GenerateToluaBindings.cmake (modified) (1 diff)
• cmake/tools/TargetUtilities.cmake (modified) (1 diff)
• data/gui/scripts/AudioMenu.lua (modified) (3 diffs)
• src/CMakeLists.txt (modified) (2 diffs)
• src/OrxonoxConfig.cmake (modified) (3 diffs)
• src/OrxonoxConfig.h.in (modified) (2 diffs)
• src/SpecialConfig.h.in (modified) (2 diffs)
• src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) (1 diff)
• src/external/ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• src/external/ois/CMakeLists.txt (modified) (4 diffs)
• src/external/ois/OIS.h (modified) (1 diff)
• src/external/ois/OISConfig.h (modified) (1 diff)
• src/external/ois/OISInputManager.cpp (modified) (3 diffs)
• src/external/ois/OISKeyboard.h (modified) (8 diffs)
• src/external/ois/OISMultiTouch.h (copied) (copied from code/branches/ois_update/src/external/ois/OISMultiTouch.h)
• src/external/ois/OISPrereqs.h (modified) (4 diffs)
• src/external/ois/ReadMe.txt (modified) (4 diffs)
• src/external/ois/VERSION (modified) (1 diff)
• src/external/ois/changes_orxonox.diff (modified) (3 diffs)
• src/external/ois/linux/LinuxInputManager.cpp (modified) (3 diffs)
• src/external/ois/linux/LinuxInputManager.h (modified) (1 diff)
• src/external/ois/linux/LinuxJoyStickEvents.cpp (modified) (1 diff)
• src/external/ois/linux/LinuxKeyboard.cpp (modified) (6 diffs)
• src/external/ois/linux/LinuxKeyboard.h (modified) (3 diffs)
• src/external/ois/linux/LinuxMouse.cpp (modified) (2 diffs)
• src/external/ois/linux/LinuxPrereqs.h (modified) (1 diff)
• src/external/ois/mac/CMakeLists.txt (modified) (1 diff)
• src/external/ois/mac/MacHIDManager.cpp (modified) (20 diffs)
• src/external/ois/mac/MacHIDManager.h (modified) (1 diff)
• src/external/ois/mac/MacInputManager.cpp (modified) (1 diff)
• src/external/ois/mac/MacJoyStick.cpp (copied) (copied from code/branches/ois_update/src/external/ois/mac/MacJoyStick.cpp)
• src/external/ois/mac/MacJoyStick.h (copied) (copied from code/branches/ois_update/src/external/ois/mac/MacJoyStick.h)
• src/external/ois/mac/MacKeyboard.cpp (modified) (1 diff)
• src/external/ois/win32/Win32ForceFeedback.cpp (modified) (1 diff)
• src/external/ois/win32/Win32ForceFeedback.h (modified) (1 diff)
• src/external/ois/win32/Win32InputManager.cpp (modified) (4 diffs)
• src/external/ois/win32/Win32InputManager.h (modified) (1 diff)
• src/external/ois/win32/Win32JoyStick.cpp (modified) (13 diffs)
• src/external/ois/win32/Win32JoyStick.h (modified) (4 diffs)
• src/external/ois/win32/Win32KeyBoard.cpp (modified) (3 diffs)
• src/external/ois/win32/Win32KeyBoard.h (modified) (2 diffs)
• src/external/ois/win32/Win32Mouse.cpp (modified) (1 diff)
• src/external/ois/win32/Win32Mouse.h (modified) (1 diff)
• src/external/ois/win32/Win32Prereqs.h (modified) (2 diffs)
• src/external/openal (copied) (copied from code/branches/ois_update/src/external/openal)
• src/external/openal/MacOSX_OALExtensions.h (copied) (copied from code/branches/ois_update/src/external/openal/MacOSX_OALExtensions.h)
• src/external/openal/README (copied) (copied from code/branches/ois_update/src/external/openal/README)
• src/external/openal/al.h (copied) (copied from code/branches/ois_update/src/external/openal/al.h)
• src/external/openal/alc.h (copied) (copied from code/branches/ois_update/src/external/openal/alc.h)
• src/libraries/core/Core.cc (modified) (3 diffs)
• src/libraries/core/CorePrereqs.h (modified) (1 diff)
• src/libraries/core/DynLib.cc (modified) (3 diffs)
• src/libraries/core/DynLib.h (modified) (2 diffs)
• src/libraries/core/GUIManager.cc (modified) (1 diff)
• src/libraries/core/GraphicsManager.cc (modified) (1 diff)
• src/libraries/core/Identifier.h (modified) (2 diffs)
• src/libraries/core/OrxonoxClass.h (modified) (2 diffs)
• src/libraries/core/PathConfig.cc (modified) (3 diffs)
• src/libraries/core/Super.h (modified) (9 diffs)
• src/libraries/core/command/Functor.h (modified) (1 diff)
• src/libraries/core/input/InputDevice.h (modified) (2 diffs)
• src/libraries/core/input/InputState.h (modified) (6 diffs)
• src/libraries/network/LANDiscoverable.cc (modified) (1 diff)
• src/libraries/network/NetworkPrereqs.h (modified) (1 diff)
• src/libraries/tools/BulletConversions.h (modified) (4 diffs)
• src/libraries/tools/ToolsPrereqs.h (modified) (1 diff)
• src/libraries/util/Convert.h (modified) (20 diffs)
• src/libraries/util/MathConvert.h (modified) (9 diffs)
• src/libraries/util/SharedPtr.h (modified) (2 diffs)
• src/libraries/util/SignalHandler.h (modified) (1 diff)
• src/libraries/util/UtilPrereqs.h (modified) (1 diff)
• src/modules/designtools/DesignToolsPrereqs.h (modified) (1 diff)
• src/modules/notifications/NotificationsPrereqs.h (modified) (1 diff)
• src/modules/objects/ObjectsPrereqs.h (modified) (1 diff)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pong/PongPrereqs.h (modified) (1 diff)
• src/modules/questsystem/QuestEffect.cc (modified) (1 diff)
• src/modules/questsystem/QuestEffectBeacon.cc (modified) (1 diff)
• src/modules/questsystem/QuestsystemPrereqs.h (modified) (1 diff)
• src/modules/questsystem/effects/AddReward.cc (modified) (1 diff)
• src/modules/weapons/WeaponsPrereqs.h (modified) (1 diff)
• src/orxonox/MoodManager.cc (modified) (1 diff)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/sound/AmbientSound.cc (modified) (1 diff)
• src/orxonox/sound/BaseSound.cc (modified) (1 diff)
• src/orxonox/sound/SoundBuffer.cc (modified) (1 diff)
• src/orxonox/sound/SoundManager.cc (modified) (3 diffs)
• src/orxonox/sound/SoundStreamer.cc (modified) (1 diff)
• src/orxonox/sound/WorldSound.cc (modified) (1 diff)

code/branches/kicklib/CMakeLists.txt

@@ -101 +101 @@
 OPTION(ORXONOX_RELEASE "Enable when building restributable releases" FALSE)
 
+IF(APPLE)
+  # Set 10.5 as the base SDK by default
+  SET(XCODE_ATTRIBUTE_SDKROOT macosx10.5)
+
+  # 10.6 sets x86_64 as the default architecture.
+  # Because Carbon isn't supported on 64-bit and we still need it, force the architectures to ppc and i386
+  IF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+    SET(CMAKE_OSX_ARCHITECTURES "i386")
+  ENDIF()
+  IF(CMAKE_OSX_ARCHITECTURES MATCHES "ppc64")
+    SET(CMAKE_OSX_ARCHITECTURES "ppc")
+  ENDIF()
+  IF(NOT CMAKE_OSX_ARCHITECTURES)
+    SET(CMAKE_OSX_ARCHITECTURES "i386")
+  ENDIF()
+ENDIF()
+
 ########### Subfolders and Subscripts ###########
+
+# General build and compiler options and configurations
+INCLUDE(CompilerConfig)
 
 # Library finding
 INCLUDE(LibraryConfig)
-
-# General build and compiler options and configurations
-INCLUDE(CompilerConfig)
 
 # Configure installation paths and options

code/branches/kicklib/cmake/CompilerConfigGCC.cmake

@@ -26 +26 @@
 INCLUDE(FlagUtilities)
 INCLUDE(CompareVersionStrings)
+INCLUDE(CheckCXXCompilerFlag)
 
 # Shortcut for CMAKE_COMPILER_IS_GNUCXX and ..._GNUC
@@ -36 +37 @@
   OUTPUT_VARIABLE GCC_VERSION
 )
-
-# Complain about incompatibilities
-COMPARE_VERSION_STRINGS("${GCC_VERSION}" "4.4.0" _compare_result)
-IF(NOT _compare_result LESS 0)
-  IF(${Boost_VERSION} LESS 103700)
-    MESSAGE(STATUS "Warning: Boost versions earlier than 1.37 may not compile with GCC 4.4 or later!")
-  ENDIF()
-ENDIF()
 
 # GCC may not support #pragma GCC system_header correctly when using
@@ -72 +65 @@
 
 # CMake doesn't seem to set the PIC flags right on certain 64 bit systems
+# Todo: MinGW too?
 IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
   ADD_COMPILER_FLAGS("-fPIC" CACHE)
+ENDIF()
+
+# Use SSE if possible
+# Commented because this might not work for cross compiling
+#CHECK_CXX_COMPILER_FLAG(-msse _gcc_have_sse)
+#IF(_gcc_have_sse)
+#  ADD_COMPILER_FLAGS("-msse" CACHE)
+#ENDIF()
+
+IF(NOT MINGW)
+  # Have GCC visibility?
+  CHECK_CXX_COMPILER_FLAG("-fvisibility=hidden" _gcc_have_visibility)
+  IF(_gcc_have_visibility)
+    # Note: There is a possible bug with the flag in gcc < 4.2 and Debug versions
+    COMPARE_VERSION_STRINGS("${GCC_VERSION}" "4.2.0" _compare_result)
+    IF(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" OR _compare_result GREATER -1)
+      ADD_COMPILER_FLAGS("-DORXONOX_GCC_VISIBILITY -fvisibility=default -fvisibility-inlines-hidden" CACHE)
+    ENDIF()
+  ENDIF(_gcc_have_visibility)
 ENDIF()
 

code/branches/kicklib/cmake/CompilerConfigMSVC.cmake

@@ -60 +60 @@
 
 # Overwrite CMake default flags here for the individual configurations
-SET_COMPILER_FLAGS("-MDd -Od -Zi -D_DEBUG -RTC1" Debug          CACHE)
-SET_COMPILER_FLAGS("-MD  -O2     -DNDEBUG"       Release        CACHE)
-SET_COMPILER_FLAGS("-MD  -O2 -Zi -DNDEBUG"       RelWithDebInfo CACHE)
-SET_COMPILER_FLAGS("-MD  -O1     -DNDEBUG"       MinSizeRel     CACHE)
+SET_COMPILER_FLAGS("-MDd -Od -Oi -Zi -D_DEBUG -RTC1" Debug          CACHE)
+SET_COMPILER_FLAGS("-MD  -O2         -DNDEBUG"       Release        CACHE)
+SET_COMPILER_FLAGS("-MD  -O2     -Zi -DNDEBUG"       RelWithDebInfo CACHE)
+SET_COMPILER_FLAGS("-MD  -O1         -DNDEBUG"       MinSizeRel     CACHE)
+
+# Enable non standard floating point optimisations
+# Note: It hasn't been checked yet whether we have code that might break
+#ADD_COMPILER_FLAGS("-fp:fast" CACHE)
 
 # No iterator checking for release builds (MSVC 8 dosn't understand this though)

code/branches/kicklib/cmake/LibraryConfig.cmake

@@ -40 +40 @@
 # On Windows using a package causes way less problems
 SET(_option_msg "Set this to true to use precompiled dependecy archives")
-IF(WIN32)
+IF(WIN32 OR APPLE)
   OPTION(DEPENDENCY_PACKAGE_ENABLE "${_option_msg}" ON)
-ELSE(WIN32)
+ELSE()
   OPTION(DEPENDENCY_PACKAGE_ENABLE "${_option_msg}" FALSE)
-ENDIF(WIN32)
+ENDIF()
 
 # Scripts for specific library and CMake config
 INCLUDE(LibraryConfigTardis)
-INCLUDE(LibraryConfigApple)
+#INCLUDE(LibraryConfigOSX)
 
 IF(DEPENDENCY_PACKAGE_ENABLE)
@@ -75 +75 @@
                    "Disable LIBRARY_USE_PACKAGE if you have none intalled.")
   ELSE()
-    INCLUDE(PackageConfigMinGW)
-    INCLUDE(PackageConfigMSVC)
-    INCLUDE(PackageConfig) # For both msvc and mingw
+    IF(WIN32)
+      INCLUDE(PackageConfigMinGW)
+      INCLUDE(PackageConfigMSVC)
+      INCLUDE(PackageConfig) # For both msvc and mingw
+    ELSEIF(APPLE)
+      INCLUDE(PackageConfigOSX)
+    ENDIF(WIN32)
   ENDIF()
 ENDIF(DEPENDENCY_PACKAGE_ENABLE)
@@ -152 +156 @@
 # No auto linking, so this option is useless anyway
 MARK_AS_ADVANCED(Boost_LIB_DIAGNOSTIC_DEFINITIONS)
+# Complain about incompatibilities
+IF(GCC_VERSION)
+  COMPARE_VERSION_STRINGS("${GCC_VERSION}" "4.4.0" _compare_result)
+  IF(NOT _compare_result LESS 0)
+    IF(${Boost_VERSION} LESS 103700)
+      MESSAGE(STATUS "Warning: Boost versions earlier than 1.37 may not compile with GCC 4.4 or later!")
+    ENDIF()
+  ENDIF()
+ENDIF()
 
 

code/branches/kicklib/cmake/PackageConfig.cmake

@@ -24 +24 @@
  #    Library files are treated separately.
  #
-
-# Check package version info
-# MAJOR: Breaking change
-# MINOR: No breaking changes by the dependency package
-#        For example any code running on 3.0 should still run on 3.1
-#        But you can specify that the code only runs on 3.1 and higher
-#        or 4.0 and higher (so both 3.1 and 4.0 will work).
-IF(MSVC)
-  SET(ALLOWED_MINIMUM_VERSIONS 4.3 6.0)
-ELSE()
-  SET(ALLOWED_MINIMUM_VERSIONS 6.0)
-ENDIF()
-
-IF(NOT EXISTS ${DEPENDENCY_PACKAGE_DIR}/version.txt)
-  SET(DEPENDENCY_VERSION 1.0)
-ELSE()
-  # Get version from file
-  FILE(READ ${DEPENDENCY_PACKAGE_DIR}/version.txt _file_content)
-  SET(_match)
-  STRING(REGEX MATCH "([0-9]+.[0-9]+)" _match ${_file_content})
-  IF(_match)
-    SET(DEPENDENCY_VERSION ${_match})
-  ELSE()
-    MESSAGE(FATAL_ERROR "The version.txt file in the dependency file has corrupt version information.")
-  ENDIF()
-ENDIF()
-
-INCLUDE(CompareVersionStrings)
-SET(_version_match FALSE)
-FOREACH(_version ${ALLOWED_MINIMUM_VERSIONS})
-  # Get major version
-  STRING(REGEX REPLACE "^([0-9]+)\\..*$" "\\1" _major_version "${_version}")
-  COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} ${_major_version} _result TRUE)
-  IF(_result EQUAL 0)
-    COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} ${_version} _result FALSE)
-    IF(NOT _result LESS 0)
-      SET(_version_match TRUE)
-    ENDIF()
-  ENDIF()
-ENDFOREACH(_version)
-IF(NOT _version_match)
-  MESSAGE(FATAL_ERROR "Your dependency package version is ${DEPENDENCY_VERSION}\n"
-          "Possible required versions: ${ALLOWED_MINIMUM_VERSIONS}\n"
-          "You can get a new version from www.orxonox.net")
-ENDIF()
 
 IF(NOT _INTERNAL_PACKAGE_MESSAGE)

code/branches/kicklib/cmake/PackageConfigMSVC.cmake

@@ -27 +27 @@
 
 IF(MSVC)
+
+  INCLUDE(CheckPackageVersion)
+  CHECK_PACKAGE_VERSION(4.3 6.0)
 
   # 64 bit system?

code/branches/kicklib/cmake/PackageConfigMinGW.cmake

@@ -28 +28 @@
 IF(MINGW)
 
+  INCLUDE(CheckPackageVersion)
+  CHECK_PACKAGE_VERSION(6.0)
+
   # 64 bit system?
   IF(CMAKE_SIZEOF_VOID_P EQUAL 8)

code/branches/kicklib/cmake/tools/CheckOGREPlugins.cmake

@@ -53 +53 @@
       NAMES ${_plugin}
       PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
-      PATH_SUFFIXES bin/Release bin/release Release release lib lib/OGRE bin
+      PATH_SUFFIXES bin/Release bin/release Release release lib lib/OGRE bin Ogre.framework/Resources
     )
     FIND_LIBRARY(OGRE_PLUGIN_${_plugin}_DEBUG
       NAMES ${_plugin}d ${_plugin}_d ${_plugin}
       PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
-      PATH_SUFFIXES bin/Debug bin/debug Debug debug lib lib/OGRE bin
+      PATH_SUFFIXES bin/Debug bin/debug Debug debug lib lib/OGRE bin Ogre.framework/Resources
     )
     # We only need at least one render system. Check at the end.

code/branches/kicklib/cmake/tools/FindALUT.cmake

@@ -1 @@
-# - Locate FreeAlut
+# Find ALUT includes and library
+#
 # This module defines
-#  ALUT_LIBRARY
-#  ALUT_FOUND, if false, do not try to link against Alut
-#  ALUT_INCLUDE_DIR, where to find the headers
+#  ALUT_INCLUDE_DIR
+#  ALUT_LIBRARY, the library to link against to use ALUT.
+#  ALUT_FOUND, If false, do not try to use ALUT
 #
-# $ALUTDIR is an environment variable that would
-# correspond to the ./configure --prefix=$ALUTDIR
-# used in building Alut.
+# Copyright © 2007, Matt Williams
+# Modified by Nicolas Schlumberger to make it work on the Tardis-Infrastucture
+# of the ETH Zurich (removed later on)
 #
-# Created by Eric Wing. This was influenced by the FindSDL.cmake module.
-# On OSX, this will prefer the Framework version (if found) over others.
-# People will have to manually change the cache values of
-# ALUT_LIBRARY to override this selection.
-# Tiger will include OpenAL as part of the System.
-# But for now, we have to look around.
-# Other (Unix) systems should be able to utilize the non-framework paths.
+# Redistribution and use is allowed according to the terms of the BSD license.
 #
 # Several changes and additions by Fabian 'x3n' Landau
-# Some simplifications by Adrian Friedli and Reto Grieder
+# Lots of simplifications by Adrian Friedli
+# Version checking by Reto Grieder
+# Adaption of the OGRE find script to ALUT by Kevin Young
 #                 > www.orxonox.net <
 
-INCLUDE(FindPackageHandleStandardArgs)
+INCLUDE(FindPackageHandleAdvancedArgs)
 INCLUDE(HandleLibraryTypes)
 
-FIND_PATH(ALUT_INCLUDE_DIR AL/alut.h
-  PATHS
-  $ENV{ALUTDIR}
-  ~/Library/Frameworks/OpenAL.framework
-  /Library/Frameworks/OpenAL.framework
-  /System/Library/Frameworks/OpenAL.framework # Tiger
-  PATH_SUFFIXES include include/OpenAL include/AL Headers
+FIND_PATH(ALUT_INCLUDE_DIR alut.h
+  PATHS $ENV{ALUTDIR}
+  PATH_SUFFIXES include include/AL ALUT
+)
+FIND_LIBRARY(ALUT_LIBRARY_OPTIMIZED
+  NAMES ALUT alut
+  PATHS $ENV{ALUTDIR}
+  PATH_SUFFIXES lib bin/Release bin/release Release release ALUT
+)
+FIND_LIBRARY(ALUT_LIBRARY_DEBUG
+  NAMES ALUTD alutd alut_d alutD alut_D
+  PATHS $ENV{ALUTDIR}
+  PATH_SUFFIXES lib bin/Debug bin/debug Debug debug ALUT
 )
 
-# I'm not sure if I should do a special casing for Apple. It is
-# unlikely that other Unix systems will find the framework path.
-# But if they do ([Next|Open|GNU]Step?),
-# do they want the -framework option also?
-IF(${ALUT_INCLUDE_DIR} MATCHES ".framework")
-
-  STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" ALUT_FRAMEWORK_PATH_TMP ${ALUT_INCLUDE_DIR})
-  IF("${ALUT_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-      OR "${ALUT_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is in default search path, don't need to use -F
-    SET (ALUT_LIBRARY_OPTIMIZED "-framework OpenAL" CACHE STRING "OpenAL framework for OSX")
-  ELSE()
-    # String is not /Library/Frameworks, need to use -F
-    SET(ALUT_LIBRARY_OPTIMIZED "-F${ALUT_FRAMEWORK_PATH_TMP} -framework OpenAL" CACHE STRING "OpenAL framework for OSX")
-  ENDIF()
-  # Clear the temp variable so nobody can see it
-  SET(ALUT_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
-
-ELSE()
-  FIND_LIBRARY(ALUT_LIBRARY_OPTIMIZED
-    NAMES alut
-    PATHS $ENV{ALUTDIR}
-    PATH_SUFFIXES lib libs
-  )
-  FIND_LIBRARY(ALUT_LIBRARY_DEBUG
-    NAMES alutd alut_d alutD alut_D
-    PATHS $ENV{ALUTDIR}
-    PATH_SUFFIXES lib libs
-  )
-ENDIF()
-
 # Handle the REQUIRED argument and set ALUT_FOUND
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALUT DEFAULT_MSG
-    ALUT_LIBRARY_OPTIMIZED
-    ALUT_INCLUDE_DIR
+# Also check the version requirements
+FIND_PACKAGE_HANDLE_ADVANCED_ARGS(ALUT DEFAULT_MSG
+  ALUT_LIBRARY_OPTIMIZED
+  ALUT_INCLUDE_DIR
 )
 
@@ -75 +47 @@
 
 MARK_AS_ADVANCED(
-    ALUT_INCLUDE_DIR
-    ALUT_LIBRARY_OPTIMIZED
-    ALUT_LIBRARY_DEBUG
+  ALUT_INCLUDE_DIR
+  ALUT_LIBRARY_OPTIMIZED
+  ALUT_LIBRARY_DEBUG
 )

code/branches/kicklib/cmake/tools/GenerateToluaBindings.cmake

@@ -32 +32 @@
  #    RUNTIME_LIBRARY_DIRECTORY - Working directory
  #
+
+# Workaround for XCode: The folder where the bind files are written to has
+# to be present beforehand.
+# We have to do this here because the header files are all stored in a single
+# location per configuration.
+IF(CMAKE_CONFIGURATION_TYPES)
+  FOREACH(_dir ${CMAKE_CONFIGURATION_TYPES})
+    FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/src/toluabind/${_dir}")
+  ENDFOREACH(_dir)
+ENDIF()
 
 FUNCTION(GENERATE_TOLUA_BINDINGS _tolua_package _target_source_files)

code/branches/kicklib/cmake/tools/TargetUtilities.cmake

@@ -169 +169 @@
     GENERATE_TOLUA_BINDINGS(${_target_name_capitalised} _${_target_name}_files
                             INPUTFILES ${_arg_TOLUA_FILES})
+    # Workaround for XCode: The folder where the bind files are written to has
+    # to be present beforehand.
+    IF(CMAKE_CONFIGURATION_TYPES)
+      FOREACH(_dir ${CMAKE_CONFIGURATION_TYPES})
+        FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_dir})
+      ENDFOREACH(_dir)
+    ENDIF()
   ENDIF()
 

code/branches/kicklib/data/gui/scripts/AudioMenu.lua

@@ -32 +32 @@
     table.insert(themeList, "Default")
     table.insert(themeList, "Drum n' Bass")
+    table.insert(themeList, "8-Bit Style")
+    table.insert(themeList, "Corny Jazz")
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
@@ -39 +41 @@
     if orxonox.getConfig("MoodManager", "mood_") == "dnb" then
         listboxwindow:setItemSelectState(1,true)
+    elseif orxonox.getConfig("MoodManager", "mood_") == "eightbit" then
+        listboxwindow:setItemSelectState(2,true)
+    elseif orxonox.getConfig("MoodManager", "mood_") == "jazzy" then
+        listboxwindow:setItemSelectState(3,true)
     else
         listboxwindow:setItemSelectState(0,true)
@@ -168 +174 @@
     if listboxwindow:isItemSelected(1) then
         orxonox.config("MoodManager", "mood_", "dnb")
+    elseif listboxwindow:isItemSelected(2) then
+        orxonox.config("MoodManager", "mood_", "eightbit")
+    elseif listboxwindow:isItemSelected(3) then
+        orxonox.config("MoodManager", "mood_", "jazzy")
     else
         orxonox.config("MoodManager", "mood_", "default")

code/branches/kicklib/src/CMakeLists.txt

@@ -69 +69 @@
 # Set the search paths for include files
 INCLUDE_DIRECTORIES(
+  # OrxonoxConfig.h
+  ${CMAKE_CURRENT_BINARY_DIR}
+
+  # All includes in "externals" should be prefixed with the path
+  # relative to "external" to avoid conflicts
+  ${CMAKE_CURRENT_SOURCE_DIR}/external
+  # Include directories needed even if only included by Orxonox
+  ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
+  ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
+
   # External
   ${OGRE_INCLUDE_DIR}
@@ -84 +94 @@
   ${DIRECTX_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
-
-  # All includes in "externals" should be prefixed with the path
-  # relative to "external" to avoid conflicts
-  ${CMAKE_CURRENT_SOURCE_DIR}/external
-  # Include directories needed even if only included by Orxonox
-  ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
-  ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
-
-  # OrxonoxConfig.h
-  ${CMAKE_CURRENT_BINARY_DIR}
 )
 

code/branches/kicklib/src/OrxonoxConfig.cmake

@@ -32 +32 @@
 
 # Global switch to disable Precompiled Header Files
-IF(PCH_COMPILER_SUPPORT)
+# Note: PCH temporarily disabled on Mac because of severe problems
+IF(PCH_COMPILER_SUPPORT AND NOT APPLE)
   OPTION(PCH_ENABLE "Global PCH switch" TRUE)
 ENDIF()
@@ -53 +54 @@
 ENDIF()
 
-# 32/64 bit system check
-IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  SET(ORXONOX_ARCH_64 TRUE)
-ELSE()
-  SET(ORXONOX_ARCH_32 TRUE)
-ENDIF()
-
 # Platforms
 SET(ORXONOX_PLATFORM_WINDOWS ${WIN32})
@@ -74 +68 @@
   CHECK_CXX_SOURCE_COMPILES("${_source}" HAVE_FORCEINLINE)
 ENDIF(MSVC)
+
+# Part of a woraround for OS X warnings. See OrxonoxConfig.h.in
+IF(HAVE_STDINT_H)
+  SET(HAVE_STDINT_H 1)
+ELSE()
+  SET(HAVE_STDINT_H 0)
+ENDIF()
 
 # Check iso646.h include (literal operators)

code/branches/kicklib/src/OrxonoxConfig.h.in

@@ -80 +80 @@
 
 // Architecture
-#cmakedefine ORXONOX_ARCH_32
-#cmakedefine ORXONOX_ARCH_64
+#if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__)
+#   define ORXONOX_ARCH_64
+#else
+#   define ORXONOX_ARCH_32
+#endif
 
 // See if we can use __forceinline or if we need to use __inline instead
 #cmakedefine HAVE_FORCEINLINE
-#ifndef FORCEINLINE
+#ifndef ORX_FORCEINLINE
 #  ifdef HAVE_FORCEINLINE
-#    define FORCEINLINE __forceinline
+#    define ORX_FORCEINLINE __forceinline
 #  else
-#    define FORCEINLINE __inline
+#    define ORX_FORCEINLINE __inline
 #  endif
 #endif
@@ -158 +161 @@
 #endif
 
-#cmakedefine HAVE_STDINT_H
-#ifdef HAVE_STDINT_H
+// On OS X some headers already define HAVE_STDINT_H and that spits out
+// some warnings. Therefore we use this syntax.
+// Note: This requires some extra code in OrxonoxConfig.cmake
+#if @HAVE_STDINT_H@
 #  include <stdint.h>
 #elif defined(ORXONOX_COMPILER_MSVC)

code/branches/kicklib/src/SpecialConfig.h.in

@@ -92 +92 @@
 
     // OGRE PLUGINS
+    // Apple has trouble finding OGRE plugins because of its install-name convention
+    // Adopting the executable_path structure for later use in app bundles
 #ifdef NDEBUG
     const char ogrePlugins[] = "@OGRE_PLUGINS_RELEASE@";
 #  ifdef DEPENDENCY_PACKAGE_ENABLE
-    const char ogrePluginsDirectory[] = ".";
+#    ifdef ORXONOX_PLATFORM_APPLE
+       const char ogrePluginsDirectory[] = "@executable_path/../Plugins";
+#    else
+       const char ogrePluginsDirectory[] = ".";
+#    endif
 #  else
     const char ogrePluginsDirectory[] = "@OGRE_PLUGINS_FOLDER_RELEASE@";
@@ -102 +108 @@
     const char ogrePlugins[] = "@OGRE_PLUGINS_DEBUG@";
 #  ifdef DEPENDENCY_PACKAGE_ENABLE
-    const char ogrePluginsDirectory[] = ".";
+#    ifdef ORXONOX_PLATFORM_APPLE
+       const char ogrePluginsDirectory[] = "@OGRE_PLUGINS_FOLDER_DEBUG@";
+#    else
+       const char ogrePluginsDirectory[] = ".";
+#    endif
 #  else
     const char ogrePluginsDirectory[] = "@OGRE_PLUGINS_FOLDER_DEBUG@";

code/branches/kicklib/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp

@@ -38 +38 @@
 int gNumGjkChecks = 0;
 
+#ifdef check
+struct CompilerError
+{
+    void CompilerError() {}
+};
+#endif
 
 btGjkPairDetector::btGjkPairDetector(const btConvexShape* objectA,const btConvexShape* objectB,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver*  penetrationDepthSolver)

code/branches/kicklib/src/external/ogreceguirenderer/CMakeLists.txt

@@ -34 +34 @@
   DEFINE_SYMBOL
     "OGRE_GUIRENDERER_EXPORTS"
-  VERSION
-    1.4.9
   LINK_LIBRARIES
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+    ${Boost_DATE_TIME_LIBRARY}
     ${OGRE_LIBRARY}
     ${CEGUI_LIBRARY}

code/branches/kicklib/src/external/ois/CMakeLists.txt

@@ -31 +31 @@
   OISKeyboard.h
   OISMouse.h
+  OISMultiTouch.h
   OISObject.h
   OISPrereqs.h
 
-COMPILATION_BEGIN OISCompilation.cpp
+  #COMPILATION_BEGIN OISCompilation.cpp
   OISEffect.cpp
   OISException.cpp
@@ -42 +43 @@
   OISKeyboard.cpp
   OISObject.cpp
-COMPILATION_END
+  #COMPILATION_END
 )
 IF(WIN32)
@@ -51 +52 @@
   ADD_SUBDIRECTORY(linux)
 ENDIF()
-
-INCLUDE_DIRECTORIES(.)
 
 ORXONOX_ADD_LIBRARY(ois_orxonox
@@ -66 +65 @@
 IF(WIN32)
   TARGET_LINK_LIBRARIES(ois_orxonox ${DIRECTX_LIBRARIES})
+ELSEIF(APPLE)
+  TARGET_LINK_LIBRARIES(ois_orxonox "/System/Library/Frameworks/IOKit.framework" "/System/Library/Frameworks/Carbon.framework")
 ENDIF()

code/branches/kicklib/src/external/ois/OIS.h

@@ -29 +29 @@
 #include "OISKeyboard.h"
 #include "OISJoyStick.h"
+#include "OISMultiTouch.h"
 #include "OISInputManager.h"
 #include "OISFactoryCreator.h"

code/branches/kicklib/src/external/ois/OISConfig.h

@@ -70 +70 @@
 @remarks
         Build in support for Win32 XInput (Xbox 360 Controller)
-@notes
-        Not Yet Implemented
 */
 //#define OIS_WIN32_XINPUT_SUPPORT

code/branches/kicklib/src/external/ois/OISInputManager.cpp

@@ -37 +37 @@
 #elif defined OIS_APPLE_PLATFORM
 #  include "mac/MacInputManager.h"
+#elif defined OIS_IPHONE_PLATFORM
+#  include "iphone/iPhoneInputManager.h"
 #elif defined OIS_XBOX_PLATFORM
 #  include "xbox/XBoxInputManager.h"
@@ -59 +61 @@
         m_wiiMoteSupport(0)
 {
+    mFactories.clear();
+    mFactoryObjects.clear();
 }
 
@@ -111 +115 @@
 #elif defined OIS_APPLE_PLATFORM
         im = new MacInputManager();
+#elif defined OIS_IPHONE_PLATFORM
+        im = new iPhoneInputManager();
 #else
         OIS_EXCEPT(E_General, "No platform library.. check build platform defines!");

code/branches/kicklib/src/external/ois/OISKeyboard.h

@@ -184 +184 @@
         {
         public:
-                KeyEvent( Object* obj, KeyCode kc, unsigned int txt ) : EventArg(obj), key(kc), text(txt) {}
+                KeyEvent(Object* obj, KeyCode kc, unsigned int txt) : EventArg(obj), key(kc), text(txt) {}
                 virtual ~KeyEvent() {}
 
@@ -201 +201 @@
         public:
                 virtual ~KeyListener() {}
-                virtual bool keyPressed( const KeyEvent &arg ) = 0;
-                virtual bool keyReleased( const KeyEvent &arg ) = 0;            
+                virtual bool keyPressed(const KeyEvent &arg) = 0;
+                virtual bool keyReleased(const KeyEvent &arg) = 0;              
         };
 
@@ -220 +220 @@
                         A KeyCode to check
                 */
-                virtual bool isKeyDown( KeyCode key ) const = 0;
+                virtual bool isKeyDown(KeyCode key) const = 0;
 
                 /**
@@ -229 +229 @@
                         Send a pointer to a class derived from KeyListener or 0 to clear the callback
                 */
-                virtual void setEventCallback( KeyListener *keyListener ) { mListener = keyListener;}
+                virtual void setEventCallback(KeyListener *keyListener) { mListener = keyListener;}
 
                 /**
@@ -254 +254 @@
                         Off, Unicode, Ascii
                 */
-                virtual void setTextTranslation( TextTranslationMode mode );
+                virtual void setTextTranslation(TextTranslationMode mode);
 
                 /**
@@ -272 +272 @@
                         The string as determined from the current locale
                 */
-                virtual const std::string& getAsString( KeyCode kc ) = 0;
+                virtual const std::string& getAsString(KeyCode kc) = 0;
 
                 //! Enum of bit position of modifer
@@ -286 +286 @@
                         Check modifier status
                 */
-                bool isModifierDown( Modifier mod ) const;
+                bool isModifierDown(Modifier mod) const;
 
                 /**
@@ -293 +293 @@
                         (in the form of 1 is down and 0 is up)
                 */
-                virtual void copyKeyStates( char keys[256] ) const = 0;
+                virtual void copyKeyStates(char keys[256]) const = 0;
                 
         protected:

code/branches/kicklib/src/external/ois/OISPrereqs.h

@@ -79 +79 @@
 #       endif
 #elif defined( __APPLE_CC__ ) // Apple OS X
-#       define OIS_APPLE_PLATFORM
-#       undef _OISExport
-#       define _OISExport __attribute__((visibility("default")))
+    // Device                                       Simulator
+#   if __IPHONE_OS_VERSION_MIN_REQUIRED >= 20201 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 20000
+//#   if __IPHONE_OS_VERSION_MIN_REQUIRED >= 30000 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 30000
+#       define OIS_IPHONE_PLATFORM
+#   else
+#       define OIS_APPLE_PLATFORM
+#   endif
+#   undef _OISExport
+#   define _OISExport __attribute__((visibility("default")))
 #else //Probably Linux
 #       define OIS_LINUX_PLATFORM
@@ -95 +101 @@
 //-------------- Common Classes, Enums, and Typdef's -------------------------//
 #define OIS_VERSION_MAJOR 1
-#define OIS_VERSION_MINOR 2 
+#define OIS_VERSION_MINOR 4
 #define OIS_VERSION_PATCH 0
-#define OIS_VERSION_NAME "Smash"
+#define OIS_VERSION_NAME "1.4.0"
 
 #define OIS_VERSION ((OIS_VERSION_MAJOR << 16) | (OIS_VERSION_MINOR << 8) | OIS_VERSION_PATCH)
@@ -110 +116 @@
         class Mouse;
         class JoyStick;
+    class MultiTouch;
         class KeyListener;
         class MouseListener;
+    class MultiTouchListener;
         class JoyStickListener;
         class Interface;
@@ -130 +138 @@
     enum Type
         {
-                OISUnknown   = 0,
-                OISKeyboard  = 1,
-                OISMouse     = 2,
-                OISJoyStick  = 3,
-                OISTablet    = 4
+                OISUnknown       = 0,
+                OISKeyboard      = 1,
+                OISMouse         = 2,
+                OISJoyStick      = 3,
+                OISTablet        = 4,
+                OISMultiTouch    = 5
         };
 

code/branches/kicklib/src/external/ois/ReadMe.txt

@@ -5 +5 @@
 The zlib/libpng License
 
-Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+Copyright (c) 2005-2010 Phillip Castaneda (pjcast -- www.wreckedgames.com)
 
 This software is provided 'as-is', without any express or implied warranty. In no 
@@ -46 +46 @@
 Win32/
         Contains Visual Studio .Net Solution Files
-        Contains CodeBlocks + MinGW + StlPort project files for OIS
+        Contains CodeBlocks project files for OIS
         
         ---- Dependencies ------------------------------------------------------
         DirectInput 8
-        Ogre & CEGUI 0.4.0 If building CEGUIOgre OIS Demo
 
-        SDL/
-                A test bed for an OIS InputManager with SDL as the backend. Not recommended;
-                however, useful for platforms with non-native OIS ports for temporary use.
 
 Linux/
         ---- Dependencies ------------------------------------------------------
         X11
-        Ogre (GLX Platform) & CEGUI 0.4.0 If building CEGUIOgre OIS Demo
-        Newer Linux Kernel (2.6+ ?) for Event API - else, use --disable-joyevents
+        Newer Linux Kernel (2.6+ ?) for Event API
 
         Steps to build on Linux:
@@ -69 +64 @@
         ---- Configure build options --------------------------------------------
         ./configure --help              --- List all configure options
-        ./configure --disable-ogre      --- Disables CEGUIOgre ActionMapping Demo
-        ./configure --disable-joyevents --- Uses /dev/input/jsX instead of 
-                                            /dev/input/eventX
+
 
 LinuxCB/
@@ -80 +73 @@
 
 Mac/
-        
-        XCode-1.5/
-                Non-complete native OIS port.
-
         XCode-2.2/
-                Working, complete, OIS port to OSX using SDL as a backend.
+                Working, mostly complete OSX vackend.

code/branches/kicklib/src/external/ois/VERSION

@@ -1 @@
-OIS v1_2 CVS updated on 2009/01/24
-Note that this is not CVS HEAD, but v1_2 branch!
-
+OIS SVN trunk updated on 2010/10/07 (revision 26)
+https://wgois.svn.sourceforge.net/svnroot/wgois/ois/trunk/

code/branches/kicklib/src/external/ois/changes_orxonox.diff

@@ -10 +10 @@
                         //Ignorable Dll interface warning...
  #           if !defined(OIS_MINGW_COMPILER)
+
+
 --- linux/EventHelpers.cpp      (revision 5668)
 +++ linux/EventHelpers.cpp      (working copy)
@@ -37 +39 @@
 +++ win32/Win32ForceFeedback.cpp
 @@ -25,7 +25,7 @@
- #include <Math.h>
+ #include <math.h>
  
  // 0 = No trace; 1 = Important traces; 2 = Debug traces
@@ -45 +47 @@
  #if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG))
    #include <iostream>
+
+
+--- mac/MacHIDManager.cpp
++++ mac/MacHIDManager.cpp
+@@ -406,6 +406,7 @@
+                        switch(iType)
+                        {
+                                case OISJoyStick:
++                {
+                                        int totalDevs = totalDevices(iType);
+                                        int freeDevs = freeDevices(iType);
+                                        int devID = totalDevs - freeDevs;
+@@ -413,6 +414,7 @@
+                                        obj = new MacJoyStick((*it)->combinedKey, bufferMode, *it, creator, devID);
+                                        (*it)->inUse = true;
+                                        return obj;
++                }
+                                case OISTablet:
+                                        //Create MacTablet
+                                        break;

code/branches/kicklib/src/external/ois/linux/LinuxInputManager.cpp

@@ -40 +40 @@
         hideMouse = true;
         mGrabs = true;
-        useXRepeat = false;
         keyboardUsed = mouseUsed = false;
 
@@ -74 +73 @@
 
         //--------- Keyboard Settings ------------//
-        i = paramList.find("XAutoRepeatOn");
-        if( i != paramList.end() )
-                if( i->second == "true" )
-                        useXRepeat = true;
-
         i = paramList.find("x11_keyboard_grab");
         if( i != paramList.end() )
@@ -172 +166 @@
         {
                 if( keyboardUsed == false )
-                        obj = new LinuxKeyboard(this, bufferMode, grabKeyboard, useXRepeat);
+                        obj = new LinuxKeyboard(this, bufferMode, grabKeyboard);
                 break;
         }

code/branches/kicklib/src/external/ois/linux/LinuxInputManager.h

@@ -101 +101 @@
                 bool mGrabs;
                 bool hideMouse;
-
-                //! By default, keyboard disables XRepeatRate
-                bool useXRepeat;
         };
 }

code/branches/kicklib/src/external/ois/linux/LinuxJoyStickEvents.cpp

@@ -96 +96 @@
         //We are in non blocking mode - we just read once, and try to fill up buffer
         input_event js[JOY_BUFFERSIZE];
-        int ret = read(mJoyStick, &js, sizeof(struct input_event) * JOY_BUFFERSIZE);
-        if( ret <= 0 )
-                return;
-
-        //Determine how many whole events re read up
-        ret /= sizeof(struct input_event);
-        for(int i = 0; i < ret; ++i)
+        while(true)
         {
-                switch(js[i].type)
+                int ret = read(mJoyStick, &js, sizeof(struct input_event) * JOY_BUFFERSIZE);
+        if( ret < 0 )
+                        break;
+
+                //Determine how many whole events re read up
+                ret /= sizeof(struct input_event);
+                for(int i = 0; i < ret; ++i)
                 {
-                case EV_KEY:  //Button
-                {
-                        int button = mButtonMap[js[i].code];
-
-                        #ifdef OIS_LINUX_JOY_DEBUG
-                          cout << "\nButton Code: " << js[i].code << ", OIS Value: " << button << endl;
-                        #endif
-
-                        //Check to see whether push or released event...
-                        if(js[i].value)
-                        {
-                                mState.mButtons[button] = true;
-                                if( mBuffered && mListener )
-                                        if(!mListener->buttonPressed(JoyStickEvent(this,mState), button)) return;
-                        }
-                        else
-                        {
-                                mState.mButtons[button] = false;
-                                if( mBuffered && mListener )
-                                        if(!mListener->buttonReleased(JoyStickEvent(this,mState), button)) return;
-                        }
-                        break;
-                }
-
-                case EV_ABS:  //Absolute Axis
-                {
-                        //A Stick (BrakeDefine is the highest possible Axis)
-                        if( js[i].code <= ABS_BRAKE )
-                        {
-                                int axis = mAxisMap[js[i].code];
-                                assert( axis < 32 && "Too many axes (Max supported is 32). Report this to OIS forums!" );
-
-                                axisMoved[axis] = true;
-
-                                //check for rescaling:
-                                if( mRanges[axis].min == JoyStick::MIN_AXIS && mRanges[axis].max != JoyStick::MAX_AXIS )
-                                {       //Scale is perfect
-                                        mState.mAxes[axis].abs = js[i].value;
+                        switch(js[i].type)
+                        {
+                        case EV_KEY:  //Button
+                        {
+                                int button = mButtonMap[js[i].code];
+
+                                #ifdef OIS_LINUX_JOY_DEBUG
+                                  cout << "\nButton Code: " << js[i].code << ", OIS Value: " << button << endl;
+                                #endif
+
+                                //Check to see whether push or released event...
+                                if(js[i].value)
+                                {
+                                        mState.mButtons[button] = true;
+                                        if( mBuffered && mListener )
+                                                if(!mListener->buttonPressed(JoyStickEvent(this,mState), button)) return;
                                 }
                                 else
-                                {       //Rescale
-                                        float proportion = (float)(js[i].value-mRanges[axis].max)/(float)(mRanges[axis].min-mRanges[axis].max);
-                                        mState.mAxes[axis].abs = (int)(32767.0f - (65535.0f * proportion));
+                                {
+                                        mState.mButtons[button] = false;
+                                        if( mBuffered && mListener )
+                                                if(!mListener->buttonReleased(JoyStickEvent(this,mState), button)) return;
                                 }
-                        }
-                        else if( js[i].code <= ABS_HAT3Y ) //A POV - Max four POVs allowed
-                        {
-                                //Normalise the POV to between 0-7
-                                //Even is X Axis, Odd is Y Axis
-                                unsigned char LinuxPovNumber = js[i].code - 16;
-                                short OIS_POVIndex = POV_MASK[LinuxPovNumber];
-
-                                //Handle X Axis first (Even) (left right)
-                                if((LinuxPovNumber & 0x0001) == 0)
+                                break;
+                        }
+
+                        case EV_ABS:  //Absolute Axis
+                        {
+                                //A Stick (BrakeDefine is the highest possible Axis)
+                                if( js[i].code <= ABS_BRAKE )
                                 {
-                                        //Why do this? Because, we use a bit field, and when this axis is east,
-                                        //it can't possibly be west too. So clear out the two X axes, then refil
-                                        //it in with the new direction bit.
-                                        //Clear the East/West Bit Flags first
-                                        mState.mPOV[OIS_POVIndex].direction &= 0x11110011;
-                                        if( js[i].value == -1 ) //Left
-                                                mState.mPOV[OIS_POVIndex].direction |= Pov::West;
-                                        else if( js[i].value == 1 ) //Right
-                                                mState.mPOV[OIS_POVIndex].direction |= Pov::East;
+                                        int axis = mAxisMap[js[i].code];
+                                        assert( axis < 32 && "Too many axes (Max supported is 32). Report this to OIS forums!" );
+
+                                        axisMoved[axis] = true;
+
+                                        //check for rescaling:
+                                        if( mRanges[axis].min == JoyStick::MIN_AXIS && mRanges[axis].max != JoyStick::MAX_AXIS )
+                                        {       //Scale is perfect
+                                                mState.mAxes[axis].abs = js[i].value;
+                                        }
+                                        else
+                                        {       //Rescale
+                                                float proportion = (float)(js[i].value-mRanges[axis].max)/(float)(mRanges[axis].min-mRanges[axis].max);
+                                                mState.mAxes[axis].abs = (int)(32767.0f - (65535.0f * proportion));
+                                        }
                                 }
-                                //Handle Y Axis (Odd) (up down)
-                                else
+                                else if( js[i].code <= ABS_HAT3Y ) //A POV - Max four POVs allowed
                                 {
-                                        //Clear the North/South Bit Flags first
-                                        mState.mPOV[OIS_POVIndex].direction &= 0x11111100;
-                                        if( js[i].value == -1 ) //Up
-                                                mState.mPOV[OIS_POVIndex].direction |= Pov::North;
-                                        else if( js[i].value == 1 ) //Down
-                                                mState.mPOV[OIS_POVIndex].direction |= Pov::South;
+                                        //Normalise the POV to between 0-7
+                                        //Even is X Axis, Odd is Y Axis
+                                        unsigned char LinuxPovNumber = js[i].code - 16;
+                                        short OIS_POVIndex = POV_MASK[LinuxPovNumber];
+
+                                        //Handle X Axis first (Even) (left right)
+                                        if((LinuxPovNumber & 0x0001) == 0)
+                                        {
+                                                //Why do this? Because, we use a bit field, and when this axis is east,
+                                                //it can't possibly be west too. So clear out the two X axes, then refil
+                                                //it in with the new direction bit.
+                                                //Clear the East/West Bit Flags first
+                                                mState.mPOV[OIS_POVIndex].direction &= 0x11110011;
+                                                if( js[i].value == -1 ) //Left
+                                                        mState.mPOV[OIS_POVIndex].direction |= Pov::West;
+                                                else if( js[i].value == 1 ) //Right
+                                                        mState.mPOV[OIS_POVIndex].direction |= Pov::East;
+                                        }
+                                        //Handle Y Axis (Odd) (up down)
+                                        else
+                                        {
+                                                //Clear the North/South Bit Flags first
+                                                mState.mPOV[OIS_POVIndex].direction &= 0x11111100;
+                                                if( js[i].value == -1 ) //Up
+                                                        mState.mPOV[OIS_POVIndex].direction |= Pov::North;
+                                                else if( js[i].value == 1 ) //Down
+                                                        mState.mPOV[OIS_POVIndex].direction |= Pov::South;
+                                        }
+
+                                        if( mBuffered && mListener )
+                                                if( mListener->povMoved( JoyStickEvent(this,mState), OIS_POVIndex) == false )
+                                                        return;
                                 }
-
-                                if( mBuffered && mListener )
-                                        if( mListener->povMoved( JoyStickEvent(this,mState), OIS_POVIndex) == false )
-                                                return;
-                        }
-                        break;
-                }
-
-                
-                case EV_REL: //Relative Axes (Do any joystick actually have a relative axis?)
-#ifdef OIS_LINUX_JOY_DEBUG
-                    cout << "\nWarning: Relatives axes not supported yet" << endl;
-#endif
-                        break;
-                default: break;
+                                break;
+                        }
+
+                        
+                        case EV_REL: //Relative Axes (Do any joystick actually have a relative axis?)
+        #ifdef OIS_LINUX_JOY_DEBUG
+                                cout << "\nWarning: Relatives axes not supported yet" << endl;
+        #endif
+                                break;
+                        default: break;
+                        }
                 }
         }

code/branches/kicklib/src/external/ois/linux/LinuxKeyboard.cpp

@@ -33 +33 @@
 #include <iostream>
 //-------------------------------------------------------------------//
-LinuxKeyboard::LinuxKeyboard(InputManager* creator, bool buffered, bool grab, bool useXRepeat)
+LinuxKeyboard::LinuxKeyboard(InputManager* creator, bool buffered, bool grab)
         : Keyboard(creator->inputSystemName(), buffered, 0, creator)
 {
@@ -43 +43 @@
         grabKeyboard = grab;
         keyFocusLost = false;
-
-        xAutoRepeat = useXRepeat;
-        oldXAutoRepeat = false;
 
         //X Key Map to KeyCode
@@ -213 +210 @@
 
         keyFocusLost = false;
-
-        if( xAutoRepeat == false )
-        {
-                //We do not want to blindly turn on autorepeat later when quiting if
-                //it was not on to begin with.. So, let us check and see first
-                XKeyboardState old;
-                XGetKeyboardControl( display, &old );
-                oldXAutoRepeat = false;
-
-                if( old.global_auto_repeat == AutoRepeatModeOn )
-                        oldXAutoRepeat = true;
-
-                XAutoRepeatOff( display );
-        }
 }
 
@@ -234 +217 @@
         if( display )
         {
-                if( oldXAutoRepeat )
-                        XAutoRepeatOn(display);
-
                 if( grabKeyboard )
                         XUngrabKeyboard(display, CurrentTime);
@@ -303 +283 @@
 
         while( XPending(display) > 0 )
-        {               XNextEvent(display, &event);            if( KeyPress == event.type )
+        {
+                XNextEvent(display, &event);            if(KeyPress == event.type)
                 {
                         unsigned int character = 0;
 
-                        if( mTextMode != Off )
+                        if(mTextMode != Off)
                         {
                                 unsigned char buffer[6] = {0,0,0,0,0,0};
@@ -332 +313 @@
                         if( event.xkey.state & Mod1Mask && key == XK_Tab )
                                 linMan->_setGrabState(false);
-                }               else if( KeyRelease == event.type )
+                }
+                else if(KeyRelease == event.type)
                 {
-                        //Mask out the modifier states X sets.. or we will get improper values
-                        event.xkey.state &= ~ShiftMask;
-                        event.xkey.state &= ~LockMask;
-
-                        //Else, it is a valid key release
-                        XLookupString(&event.xkey,NULL,0,&key,NULL);
-                        _injectKeyUp(key);              }
+                        if(!_isKeyRepeat(event))
+                        {
+                                //Mask out the modifier states X sets.. or we will get improper values
+                                event.xkey.state &= ~ShiftMask;
+                                event.xkey.state &= ~LockMask;
+
+                                XLookupString(&event.xkey,NULL,0,&key,NULL);
+                                _injectKeyUp(key);
+                        }
+                }
         }
 

code/branches/kicklib/src/external/ois/linux/LinuxKeyboard.h

@@ -34 +34 @@
         {
         public:
-                LinuxKeyboard(InputManager* creator, bool buffered, bool grab, bool useXRepeat );
+                LinuxKeyboard(InputManager* creator, bool buffered, bool grab);
                 virtual ~LinuxKeyboard();
 
@@ -59 +59 @@
 
         protected:
+                inline bool _isKeyRepeat(XEvent &event)
+                {
+                        //When a key is repeated, there will be two events: released, followed by another immediate pressed. So check to see if another pressed is present      
+                        if(!XPending(display))
+                                return false;
+
+                        XEvent e;
+                        XPeekEvent(display, &e);
+                        if(e.type == KeyPress && e.xkey.keycode == event.xkey.keycode && (e.xkey.time - event.xkey.time) < 2)
+                        {
+                                XNextEvent(display, &e);
+                                return true;
+                        }
+
+                        return false;
+                }
+
                 bool _injectKeyDown( KeySym key, int text );
                 bool _injectKeyUp( KeySym key );
@@ -75 +92 @@
                 bool keyFocusLost;
 
-                bool xAutoRepeat;
-                bool oldXAutoRepeat;
-
                 std::string mGetString;
         };

code/branches/kicklib/src/external/ois/linux/LinuxMouse.cpp

@@ -173 +173 @@
 
                         //Compute this frames Relative X & Y motion
-                        mState.X.rel = event.xmotion.x - oldXMouseX;
-                        mState.Y.rel = event.xmotion.y - oldXMouseY;
+                        int dx = event.xmotion.x - oldXMouseX;
+                        int dy = event.xmotion.y - oldXMouseY;
                 
                         //Store old values for next time to compute relative motion
@@ -180 +180 @@
                         oldXMouseY = event.xmotion.y;
 
-                        mState.X.abs += mState.X.rel;
-                        mState.Y.abs += mState.Y.rel;
+                        mState.X.abs += dx;
+                        mState.Y.abs += dy;
+                        mState.X.rel += dx;
+                        mState.Y.rel += dy;
 
                         //Check to see if we are grabbing the mouse to the window (requires clipping and warping)

code/branches/kicklib/src/external/ois/linux/LinuxPrereqs.h

@@ -32 +32 @@
 
 //! Max number of elements to collect from buffered input
-#define JOY_BUFFERSIZE 10
+#define JOY_BUFFERSIZE 64
 
 namespace OIS

code/branches/kicklib/src/external/ois/mac/CMakeLists.txt

@@ -3 +3 @@
   MacHIDManager.h
   MacInputManager.h
+  MacJoyStick.h
   MacKeyboard.h
   MacMouse.h
   MacPrereqs.h
 
-COMPILATION_BEGIN OISMacCompilation.cpp
+  #COMPILATION_BEGIN OISMacCompilation.cpp
   MacHelpers.cpp
   MacHIDManager.cpp
   MacInputManager.cpp
+  MacJoyStick.cpp
   MacKeyboard.cpp
   MacMouse.cpp
-COMPILATION_END
+  #COMPILATION_END
 )

code/branches/kicklib/src/external/ois/mac/MacHIDManager.cpp

@@ -20 +20 @@
  
  3. This notice may not be removed or altered from any source distribution.
-*/
+ */
 #include "mac/MacHIDManager.h"
+#include "mac/MacJoyStick.h"
 #include "OISException.h"
 #include "OISObject.h"
@@ -42 +43 @@
 {
         CFTypeRef temp = CFDictionaryGetValue(dict, OIS_CFString(keyName));
-
+        
         if(temp && CFGetTypeID(temp) == CFArrayGetTypeID())
                 return (CFArrayRef)temp;
@@ -53 +54 @@
 {
         CFTypeRef temp = CFDictionaryGetValue(dict, OIS_CFString(keyName));
-
+        
         if(temp && CFGetTypeID(temp) == CFStringGetTypeID())
                 return (CFStringRef)temp;
@@ -64 +65 @@
 {
         CFTypeRef temp = CFDictionaryGetValue(dict, OIS_CFString(keyName));
-
+        
         if(temp && CFGetTypeID(temp) == CFNumberGetTypeID())
                 return (CFNumberRef)temp;
@@ -83 +84 @@
 {
         CFTypeRef temp = CFArrayGetValueAtIndex(array, idx);
-
+        
         if(temp && CFGetTypeID(temp) == CFDictionaryGetTypeID())
                 return (CFDictionaryRef)temp;
@@ -93 +94 @@
 int getInt32(CFNumberRef ref)
 {
-   int r = 0;
-   if (r) 
-      CFNumberGetValue(ref, kCFNumberIntType, &r);
-   return r;
+        int r = 0;
+        if (r) 
+                CFNumberGetValue(ref, kCFNumberIntType, &r);
+        return r;
 }
 
@@ -111 +112 @@
 //------------------------------------------------------------------------------------------------------//
 void MacHIDManager::initialize()
+{
+        //Make the search more specific by adding usage flags
+        int usage = kHIDUsage_GD_Joystick;
+        int page = kHIDPage_GenericDesktop;
+        
+        io_iterator_t iterator = lookUpDevices(usage, page);
+        
+        if(iterator)
+                iterateAndOpenDevices(iterator);
+        
+        //Doesn't support multiple usage flags, iterate twice
+        usage = kHIDUsage_GD_GamePad;
+        iterator = lookUpDevices(usage, page);
+        
+        if(iterator)
+                iterateAndOpenDevices(iterator);
+}
+
+//------------------------------------------------------------------------------------------------------//
+io_iterator_t MacHIDManager::lookUpDevices(int usage, int page)
 {
         CFMutableDictionaryRef deviceLookupMap = IOServiceMatching(kIOHIDDeviceKey);
         if(!deviceLookupMap)
                 OIS_EXCEPT(E_General, "Could not setup HID device search parameters");
-
-        //Make the search more specific by adding usage flags
-        int usage = kHIDUsage_GD_GamePad | kHIDUsage_GD_Joystick,
-            page  = kHIDPage_GenericDesktop;
-
-        CFNumberRef usageRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &usage),
-                                pageRef  = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &page);
-
+        
+        CFNumberRef usageRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &usage);
+        CFNumberRef pageRef  = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &page);
+        
         CFDictionarySetValue(deviceLookupMap, CFSTR(kIOHIDPrimaryUsageKey), usageRef);
         CFDictionarySetValue(deviceLookupMap, CFSTR(kIOHIDPrimaryUsagePageKey), pageRef);
-
+        
         //IOServiceGetMatchingServices consumes the map so we do not have to release it ourself
         io_iterator_t iterator = 0;
         IOReturn result = IOServiceGetMatchingServices(kIOMasterPortDefault, deviceLookupMap, &iterator);
-        if (result == kIOReturnSuccess && iterator)
-        {
-                io_object_t hidDevice = 0;
-                while ((hidDevice = IOIteratorNext(iterator)) !=0)
+        
+        CFRelease(usageRef);
+        CFRelease(pageRef);
+        
+        if(result == kIOReturnSuccess)
+        {
+                return iterator;
+        }
+        //TODO: Throw exception instead?
+        else
+        {
+                return 0;
+        }
+}
+
+//------------------------------------------------------------------------------------------------------//
+void MacHIDManager::iterateAndOpenDevices(io_iterator_t iterator)
+{
+        io_object_t hidDevice = 0;
+        while ((hidDevice = IOIteratorNext(iterator)) !=0)
+        {
+                //Get the current registry items property map
+                CFMutableDictionaryRef propertyMap = 0;
+                if (IORegistryEntryCreateCFProperties(hidDevice, &propertyMap, kCFAllocatorDefault, kNilOptions) == KERN_SUCCESS && propertyMap)
                 {
-                        //Get the current registry items property map
-                        CFMutableDictionaryRef propertyMap = 0;
-                        if (IORegistryEntryCreateCFProperties(hidDevice, &propertyMap, kCFAllocatorDefault, kNilOptions) == KERN_SUCCESS && propertyMap)
+                        //Go through device to find all needed info
+                        HidInfo* hid = enumerateDeviceProperties(propertyMap);
+                        
+                        if(hid)
                         {
-                                //Go through device to find all needed info
-                                HidInfo* hid = enumerateDeviceProperties(propertyMap);
-                                if(hid)
-                                        mDeviceList.push_back(hid);
-                                        
                                 //todo - we need to hold an open interface so we do not have to enumerate again later
                                 //should be able to watch for device removals also
-
-                                /// Testing opening / closing interface
-                                //IOCFPlugInInterface **pluginInterface = NULL;
-                                //SInt32 score = 0;
-                                //if (IOCreatePlugInInterfaceForService(hidDevice, kIOHIDDeviceUserClientTypeID, kIOCFPlugInInterfaceID, &pluginInterface, &score) == kIOReturnSuccess)
-                                //{
-                                //      IOHIDDeviceInterface **interface;
-                                //      HRESULT pluginResult = (*pluginInterface)->QueryInterface(pluginInterface, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (void **)&(interface));
-                                //      if(pluginResult == S_OK)
-                                //              cout << "Successfully created plugin interface for device\n";
-                                //      else
-                                //              cout << "Not able to create plugin interface\n";
-
-                                //      IODestroyPlugInInterface(pluginInterface);
-
-                                //      if ((*interface)->open(interface, 0) == KERN_SUCCESS)
-                                //              cout << "Opened interface.\n";
-                                //      else
-                                //              cout << "Failed to open\n";
-
-                                //      (*interface)->close(interface);
-                                //}
-                                //
+                                
+                                // Testing opening / closing interface
+                                IOCFPlugInInterface **pluginInterface = NULL;
+                                SInt32 score = 0;
+                                if (IOCreatePlugInInterfaceForService(hidDevice, kIOHIDDeviceUserClientTypeID, kIOCFPlugInInterfaceID, &pluginInterface, &score) == kIOReturnSuccess)
+                                {
+                                        IOHIDDeviceInterface **interface;
+                                        
+                                        HRESULT pluginResult = (*pluginInterface)->QueryInterface(pluginInterface, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (void **)&(interface));
+                                        
+                                        if(pluginResult != S_OK)
+                                                OIS_EXCEPT(E_General, "Not able to create plugin interface");
+                                        
+                                        IODestroyPlugInInterface(pluginInterface);
+                                        
+                                        hid->interface = interface;
+                                        
+                                        //Check for duplicates - some devices have multiple usage
+                                        if(std::find(mDeviceList.begin(), mDeviceList.end(), hid) == mDeviceList.end())
+                                                mDeviceList.push_back(hid);
+                                }
                         }
                 }
-
-                IOObjectRelease(iterator);
-        }
-
-        CFRelease(usageRef);
-        CFRelease(pageRef);
+        }
+        
+        IOObjectRelease(iterator);
 }
 
@@ -188 +216 @@
         if (str)
                 info->vendor = CFStringGetCStringPtr(str, CFStringGetSystemEncoding());
-
+        
         str = getDictionaryItemAsRef<CFStringRef>(propertyMap, kIOHIDProductKey);
         if (str)
                 info->productKey = CFStringGetCStringPtr(str, CFStringGetSystemEncoding());
-                
+        
         info->combinedKey = info->vendor + " " + info->productKey;
-
+        
         //Go through all items in this device (i.e. buttons, hats, sticks, axes, etc)
         CFArrayRef array = getDictionaryItemAsRef<CFArrayRef>(propertyMap, kIOHIDElementKey);
@@ -200 +228 @@
                 for (int i = 0; i < CFArrayGetCount(array); i++)
                         parseDeviceProperties(getArrayItemAsRef<CFDictionaryRef>(array, i));
-
+        
         return info;
 }
@@ -209 +237 @@
         if(!properties)
                 return;
-
+        
         CFArrayRef array = getDictionaryItemAsRef<CFArrayRef>(properties, kIOHIDElementKey);
         if (array)
@@ -227 +255 @@
                                         switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsagePageKey)))
                                         {
-                                        case kHIDPage_GenericDesktop:
-                                                switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsageKey)))
+                                                case kHIDPage_GenericDesktop:
+                                                        switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsageKey)))
                                                 {
-                                                case kHIDUsage_GD_Pointer:
-                                                        cout << "\tkHIDUsage_GD_Pointer\n";
-                                                        parseDevicePropertiesGroup(element);
+                                                        case kHIDUsage_GD_Pointer:
+                                                                cout << "\tkHIDUsage_GD_Pointer\n";
+                                                                parseDevicePropertiesGroup(element);
+                                                                break;
+                                                        case kHIDUsage_GD_X:
+                                                        case kHIDUsage_GD_Y:
+                                                        case kHIDUsage_GD_Z:
+                                                        case kHIDUsage_GD_Rx:
+                                                        case kHIDUsage_GD_Ry:
+                                                        case kHIDUsage_GD_Rz:
+                                                                cout << "\tAxis\n";
+                                                                break;
+                                                        case kHIDUsage_GD_Slider:
+                                                        case kHIDUsage_GD_Dial:
+                                                        case kHIDUsage_GD_Wheel:
+                                                                cout << "\tUnsupported kHIDUsage_GD_Wheel\n";
+                                                                break;
+                                                        case kHIDUsage_GD_Hatswitch:
+                                                                cout << "\tUnsupported - kHIDUsage_GD_Hatswitch\n";
+                                                                break;
+                                                }
                                                         break;
-                                                case kHIDUsage_GD_X:
-                                                case kHIDUsage_GD_Y:
-                                                case kHIDUsage_GD_Z:
-                                                case kHIDUsage_GD_Rx:
-                                                case kHIDUsage_GD_Ry:
-                                                case kHIDUsage_GD_Rz:
-                                                        cout << "\tAxis\n";
+                                                case kHIDPage_Button:
+                                                        cout << "\tkHIDPage_Button\n";
                                                         break;
-                                                case kHIDUsage_GD_Slider:
-                                                case kHIDUsage_GD_Dial:
-                                                case kHIDUsage_GD_Wheel:
-                                                        cout << "\tUnsupported kHIDUsage_GD_Wheel\n";
-                                                        break;
-                                                case kHIDUsage_GD_Hatswitch:
-                                                        cout << "\tUnsupported - kHIDUsage_GD_Hatswitch\n";
-                                                        break;
-                                                }
-                                                break;
-                                        case kHIDPage_Button:
-                                                cout << "\tkHIDPage_Button\n";
-                                                break;
                                         }
                                 }
@@ -267 +295 @@
         if(!properties)
                 return;
-
+        
         CFArrayRef array = getDictionaryItemAsRef<CFArrayRef>(properties, kIOHIDElementKey);
         if(array)
@@ -278 +306 @@
                                 switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsagePageKey)))
                                 {
-                                case kHIDPage_GenericDesktop:
-                                        switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsageKey)))
+                                        case kHIDPage_GenericDesktop:
+                                                switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsageKey)))
                                         {
-                                        case kHIDUsage_GD_X:
-                                        case kHIDUsage_GD_Y:
-                                        case kHIDUsage_GD_Z:
-                                        case kHIDUsage_GD_Rx:
-                                        case kHIDUsage_GD_Ry:
-                                        case kHIDUsage_GD_Rz:
-                                                cout << "\t\tAxis\n";
+                                                case kHIDUsage_GD_X:
+                                                case kHIDUsage_GD_Y:
+                                                case kHIDUsage_GD_Z:
+                                                case kHIDUsage_GD_Rx:
+                                                case kHIDUsage_GD_Ry:
+                                                case kHIDUsage_GD_Rz:
+                                                        cout << "\t\tAxis\n";
+                                                        break;
+                                                case kHIDUsage_GD_Slider:
+                                                case kHIDUsage_GD_Dial:
+                                                case kHIDUsage_GD_Wheel:
+                                                        cout << "\tUnsupported - kHIDUsage_GD_Wheel\n";
+                                                        break;
+                                                case kHIDUsage_GD_Hatswitch:
+                                                        cout << "\tUnsupported - kHIDUsage_GD_Hatswitch\n";
+                                                        break;
+                                        }
                                                 break;
-                                        case kHIDUsage_GD_Slider:
-                                        case kHIDUsage_GD_Dial:
-                                        case kHIDUsage_GD_Wheel:
-                                                cout << "\tUnsupported - kHIDUsage_GD_Wheel\n";
+                                        case kHIDPage_Button:
                                                 break;
-                                        case kHIDUsage_GD_Hatswitch:
-                                                cout << "\tUnsupported - kHIDUsage_GD_Hatswitch\n";
-                                                break;
-                                        }
-                                        break;
-                                case kHIDPage_Button:
-                                        break;
                                 }
                         }
@@ -317 +345 @@
                         ret.insert(std::make_pair((*it)->type, (*it)->combinedKey));
         }
-
+        
         return ret;
 }
@@ -326 +354 @@
         int ret = 0;
         HidInfoList::iterator it = mDeviceList.begin(), end = mDeviceList.end();
-
+        
         for(; it != end; ++it)
         {
@@ -341 +369 @@
         int ret = 0;
         HidInfoList::iterator it = mDeviceList.begin(), end = mDeviceList.end();
-
+        
         for(; it != end; ++it)
         {
@@ -347 +375 @@
                         ret++;
         }
-
+        
         return ret;
 }
@@ -355 +383 @@
 {
         HidInfoList::iterator it = mDeviceList.begin(), end = mDeviceList.end();
-
+        
         for(; it != end; ++it)
         {
@@ -367 +395 @@
 //--------------------------------------------------------------------------------//
 Object* MacHIDManager::createObject(InputManager* creator, Type iType, bool bufferMode, 
-                                                                          const std::string & vendor)
+                                                                        const std::string & vendor)
 {
         Object *obj = 0;
-
+        
         HidInfoList::iterator it = mDeviceList.begin(), end = mDeviceList.end();
         for(; it != end; ++it)
@@ -376 +404 @@
                 if((*it)->inUse == false && (*it)->type == iType && (vendor == "" || (*it)->combinedKey == vendor))
                 {
-                        //create device
+                        switch(iType)
+                        {
+                                case OISJoyStick:
+                {
+                                        int totalDevs = totalDevices(iType);
+                                        int freeDevs = freeDevices(iType);
+                                        int devID = totalDevs - freeDevs;
+                                        
+                                        obj = new MacJoyStick((*it)->combinedKey, bufferMode, *it, creator, devID);
+                                        (*it)->inUse = true;
+                                        return obj;
+                }
+                                case OISTablet:
+                                        //Create MacTablet
+                                        break;
+                                default:
+                                        break;
+                        }
                 }
         }
-
-        if( obj == 0 )
-                OIS_EXCEPT(E_InputDeviceNonExistant, "No devices match requested type.");
-
+        
         return obj;
 }

code/branches/kicklib/src/external/ois/mac/MacHIDManager.h

@@ -70 +70 @@
 
                 void initialize();
+                
+                void iterateAndOpenDevices(io_iterator_t iterator);
+                io_iterator_t lookUpDevices(int usage, int page);
 
                 //FactoryCreator Overrides

code/branches/kicklib/src/external/ois/mac/MacInputManager.cpp

@@ -188 +188 @@
         }
         default:
+        {
+                obj = mHIDManager->createObject(creator, iType, bufferMode, vendor);
                 break;
+        }
         }
 

code/branches/kicklib/src/external/ois/mac/MacKeyboard.cpp

@@ -199 +199 @@
         char macChar;
         
-        // TODO clean this up
         if (mTextMode == Unicode)
         {
                 //get string size
                 UInt32 stringsize;
-                //status = GetEventParameter( theEvent, 'kuni', typeUnicodeText, NULL, 0, &stringsize, NULL);
-                //status = GetEventParameter( theEvent, 'kuni', typeUnicodeText, NULL, sizeof(UniChar)*10, NULL, &text );
                 status = GetEventParameter( theEvent, 'kuni', typeUnicodeText, NULL, sizeof(UniChar) * 10, &stringsize, &text );
-                std::cout << "String length: " << stringsize << std::endl;
-                
-                //wstring unitext;
-                //for (int i=0;i<10;i++) unitext += (wchar_t)text[i];
-                //wcout << "Unicode out: " << unitext << endl;
                 
                 if(stringsize > 0)

code/branches/kicklib/src/external/ois/win32/Win32ForceFeedback.cpp

@@ -21 +21 @@
     3. This notice may not be removed or altered from any source distribution.
 */
-#include "Win32/Win32ForceFeedback.h"
+#include "win32/Win32ForceFeedback.h"
 #include "OISException.h"
-#include <Math.h>
+#include <math.h>
 
 // 0 = No trace; 1 = Important traces; 2 = Debug traces

code/branches/kicklib/src/external/ois/win32/Win32ForceFeedback.h

@@ -26 +26 @@
 #include "OISPrereqs.h"
 #include "OISForceFeedback.h"
-#include "Win32/Win32Prereqs.h"
+#include "win32/Win32Prereqs.h"
 
 namespace OIS

code/branches/kicklib/src/external/ois/win32/Win32InputManager.cpp

@@ -21 +21 @@
     3. This notice may not be removed or altered from any source distribution.
 */
-#include "Win32/Win32InputManager.h"
-#include "Win32/Win32Keyboard.h"
-#include "Win32/Win32Mouse.h"
-#include "Win32/Win32JoyStick.h"
+#include "win32/Win32InputManager.h"
+#include "win32/Win32KeyBoard.h"
+#include "win32/Win32Mouse.h"
+#include "win32/Win32JoyStick.h"
 #include "OISException.h"
 
@@ -75 +75 @@
         hInst = GetModuleHandle(0);
 
-        //Create the input system
+        //Create the device
         hr = DirectInput8Create( hInst, DIRECTINPUT_VERSION, IID_IDirectInput8, (VOID**)&mDirectInput, NULL );
     if (FAILED(hr))     
@@ -118 +118 @@
 {
         //Enumerate all attached devices
-        mDirectInput->EnumDevices(NULL , _DIEnumDevCallback, this, DIEDFL_ATTACHEDONLY); 
+        mDirectInput->EnumDevices(NULL, _DIEnumDevCallback, this, DIEDFL_ATTACHEDONLY);
+
+#ifdef OIS_WIN32_XINPUT_SUPPORT
+        //let's check how many possible XInput devices we may have (max 4)... 
+        for(int i = 0; i < 3; ++i)
+        {
+                XINPUT_STATE state;
+                if(XInputGetState(i, &state) != ERROR_DEVICE_NOT_CONNECTED)
+                {       //Once we found 1, just check our whole list against devices
+                        Win32JoyStick::CheckXInputDevices(unusedJoyStickList);
+                        break;
+                }
+        }
+#endif
 }
 
@@ -134 +147 @@
         {
                 JoyStickInfo jsInfo;
+                jsInfo.isXInput = false;
+                jsInfo.productGuid = lpddi->guidProduct;
                 jsInfo.deviceID = lpddi->guidInstance;
                 jsInfo.vendor = lpddi->tszInstanceName;

code/branches/kicklib/src/external/ois/win32/Win32InputManager.h

@@ -26 +26 @@
 #include "OISInputManager.h"
 #include "OISFactoryCreator.h"
-#include "Win32/Win32Prereqs.h"
+#include "win32/Win32Prereqs.h"
 
 namespace OIS

code/branches/kicklib/src/external/ois/win32/Win32JoyStick.cpp

@@ -21 +21 @@
     3. This notice may not be removed or altered from any source distribution.
 */
-#include "Win32/Win32JoyStick.h"
-#include "Win32/Win32InputManager.h"
-#include "Win32/Win32ForceFeedback.h"
+#include "win32/Win32JoyStick.h"
+#include "win32/Win32InputManager.h"
+#include "win32/Win32ForceFeedback.h"
 #include "OISEvents.h"
 #include "OISException.h"
 
 #include <cassert>
+#include <wbemidl.h>
+#include <oleauto.h>
+//#include <wmsstd.h>
+#ifndef SAFE_RELEASE
+#define SAFE_RELEASE(x) \
+   if(x != NULL)        \
+   {                    \
+      x->Release();     \
+      x = NULL;         \
+   }
+#endif
+
+#ifdef OIS_WIN32_XINPUT_SUPPORT
+#       pragma comment(lib, "xinput.lib")
+#endif
 
 //DX Only defines macros for the JOYSTICK not JOYSTICK2, so fix it
@@ -40 +55 @@
 #define DIJOFS_SLIDER3(n) (FIELD_OFFSET(DIJOYSTATE2, rglFSlider)+(n) * sizeof(LONG))
 
+#define XINPUT_TRANSLATED_BUTTON_COUNT 12
+#define XINPUT_TRANSLATED_AXIS_COUNT 6
+
 using namespace OIS;
 
 //--------------------------------------------------------------------------------------------------//
-Win32JoyStick::Win32JoyStick( InputManager* creator, IDirectInput8* pDI,
-        bool buffered, DWORD coopSettings, const JoyStickInfo &info )
-        : JoyStick(info.vendor, buffered, info.devId, creator)
-{
-        mDirectInput = pDI;
-        coopSetting = coopSettings;
-        mJoyStick = 0;
-
-        deviceGuid = info.deviceID;
-
-        ff_device = 0;
+Win32JoyStick::Win32JoyStick( InputManager* creator, IDirectInput8* pDI, bool buffered, DWORD coopSettings, const JoyStickInfo &info ) :
+        JoyStick(info.vendor, buffered, info.devId, creator),
+        mDirectInput(pDI),
+        coopSetting(coopSettings),
+        mJoyStick(0),
+        mJoyInfo(info),
+        mFfDevice(0)
+{
 }
 
@@ -59 +74 @@
 Win32JoyStick::~Win32JoyStick()
 {
-        delete ff_device;
+        delete mFfDevice;
 
         if(mJoyStick)
@@ -69 +84 @@
 
         //Return joystick to pool
-        JoyStickInfo js;
-        js.deviceID = deviceGuid;
-        js.devId = mDevID;
-        js.vendor = mVendor;
-        static_cast<Win32InputManager*>(mCreator)->_returnJoyStick(js);
+        static_cast<Win32InputManager*>(mCreator)->_returnJoyStick(mJoyInfo);
 }
 
@@ -79 +90 @@
 void Win32JoyStick::_initialize()
 {
-        //Clear old state
-        mState.mAxes.clear();
-
-        if (ff_device)
-        {
-                delete ff_device;
-                ff_device = 0;
-        }
-
-        // Create direct input joystick device.
-        if(FAILED(mDirectInput->CreateDevice(deviceGuid, &mJoyStick, NULL)))
-                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> Could not initialize joy device!");
-
-        // Set DIJoystick2 data format.
-        if(FAILED(mJoyStick->SetDataFormat(&c_dfDIJoystick2)))
-                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> data format error!");
-
-        // Set cooperative level as specified when creating input manager.
-        HWND hwin = ((Win32InputManager*)mCreator)->getWindowHandle();
-        if(FAILED(mJoyStick->SetCooperativeLevel( hwin, coopSetting)))
-                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> failed to set cooperation level!");
-
-        // Set buffer size.
-        DIPROPDWORD dipdw;
-        dipdw.diph.dwSize       = sizeof(DIPROPDWORD);
-        dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-        dipdw.diph.dwObj        = 0;
-        dipdw.diph.dwHow        = DIPH_DEVICE;
-        dipdw.dwData            = JOYSTICK_DX_BUFFERSIZE;
-
-        if( FAILED(mJoyStick->SetProperty(DIPROP_BUFFERSIZE, &dipdw.diph)) )
-                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize >> Failed to set buffer size property" );
-
-        // Enumerate all axes/buttons/sliders/force feedback/etc before aquiring
-        _enumerate();
-
-        mState.clear();
-
-        capture();
+    if (mJoyInfo.isXInput)
+    {
+        _enumerate();
+    }
+    else
+    {
+            //Clear old state
+            mState.mAxes.clear();
+
+            delete mFfDevice;
+            mFfDevice = 0;
+
+            DIPROPDWORD dipdw;
+
+            dipdw.diph.dwSize       = sizeof(DIPROPDWORD);
+            dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+            dipdw.diph.dwObj        = 0;
+            dipdw.diph.dwHow        = DIPH_DEVICE;
+            dipdw.dwData            = JOYSTICK_DX_BUFFERSIZE;
+
+            if(FAILED(mDirectInput->CreateDevice(mJoyInfo.deviceID, &mJoyStick, NULL)))
+                    OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> Could not initialize joy device!");
+
+            if(FAILED(mJoyStick->SetDataFormat(&c_dfDIJoystick2)))
+                    OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> data format error!");
+
+            HWND hwin = ((Win32InputManager*)mCreator)->getWindowHandle();
+
+            if(FAILED(mJoyStick->SetCooperativeLevel( hwin, coopSetting)))
+                    OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> failed to set cooperation level!");
+
+            if( FAILED(mJoyStick->SetProperty(DIPROP_BUFFERSIZE, &dipdw.diph)) )
+                    OIS_EXCEPT( E_General, "Win32Mouse::Win32Mouse >> Failed to set buffer size property" );
+
+            //Enumerate all axes/buttons/sliders/etc before aquiring
+            _enumerate();
+
+            mState.clear();
+
+            capture();
+    }
 }
 
@@ -123 +136 @@
 void Win32JoyStick::_enumerate()
 {
-        // Get joystick capabilities.
-        mDIJoyCaps.dwSize = sizeof(DIDEVCAPS);
-        if( FAILED(mJoyStick->GetCapabilities(&mDIJoyCaps)) )
-                OIS_EXCEPT( E_General, "Win32JoyStick::_enumerate >> Failed to get capabilities" );
-
-        // => Number of POVs
-        mPOVs = (short)mDIJoyCaps.dwPOVs;
-
-        // => Number of buttons and axes.
-        mState.mButtons.resize(mDIJoyCaps.dwButtons);
-        mState.mAxes.resize(mDIJoyCaps.dwAxes);
-
-        // Enumerate all Force Feedback effects (if any)
-        mJoyStick->EnumEffects(DIEnumEffectsCallback, this, DIEFT_ALL);
-
-        //Reset the axis mapping enumeration value
-        _AxisNumber = 0;
-
-        // Enumerate and set axis constraints (and check FF Axes)
-        mJoyStick->EnumObjects(DIEnumDeviceObjectsCallback, this, DIDFT_AXIS);
+    if (mJoyInfo.isXInput)
+    {
+        mPOVs = 1;
+
+        mState.mButtons.resize(XINPUT_TRANSLATED_BUTTON_COUNT);
+            mState.mAxes.resize(XINPUT_TRANSLATED_AXIS_COUNT);
+    }
+    else
+    {
+                // Get joystick capabilities.
+                mDIJoyCaps.dwSize = sizeof(DIDEVCAPS);
+                if( FAILED(mJoyStick->GetCapabilities(&mDIJoyCaps)) )
+                        OIS_EXCEPT( E_General, "Win32JoyStick::_enumerate >> Failed to get capabilities" );
+
+            mPOVs = (short)mDIJoyCaps.dwPOVs;
+
+            mState.mButtons.resize(mDIJoyCaps.dwButtons);
+            mState.mAxes.resize(mDIJoyCaps.dwAxes);
+
+            //Reset the axis mapping enumeration value
+            _AxisNumber = 0;
+
+            //Enumerate Force Feedback (if any)
+            mJoyStick->EnumEffects(DIEnumEffectsCallback, this, DIEFT_ALL);
+
+            //Enumerate and set axis constraints (and check FF Axes)
+            mJoyStick->EnumObjects(DIEnumDeviceObjectsCallback, this, DIDFT_AXIS);
+    }
 }
 
@@ -191 +212 @@
         if((lpddoi->dwFlags & DIDOI_FFACTUATOR) != 0 )
         {
-                if( _this->ff_device )
+                if( _this->mFfDevice )
                 {
-                        _this->ff_device->_addFFAxis();
+                        _this->mFfDevice->_addFFAxis();
                 }
         }
@@ -200 +221 @@
         //as DInput has no API to query the device for these capabilities
         //(the only way to know is to try them ...)
-        if( _this->ff_device )
-        {
-            _this->ff_device->_setGainSupport(true);
-            _this->ff_device->_setAutoCenterSupport(true);
+        if( _this->mFfDevice )
+        {
+            _this->mFfDevice->_setGainSupport(true);
+            _this->mFfDevice->_setAutoCenterSupport(true);
         }
 
@@ -215 +236 @@
 
         //Create the FF instance only after we know there is at least one effect type
-        if( _this->ff_device == 0 )
-          _this->ff_device = new Win32ForceFeedback(_this->mJoyStick, &_this->mDIJoyCaps);
-
-        _this->ff_device->_addEffectSupport( pdei );
+        if( _this->mFfDevice == 0 )
+                _this->mFfDevice = new Win32ForceFeedback(_this->mJoyStick, &_this->mDIJoyCaps);
+
+        _this->mFfDevice->_addEffectSupport(pdei);
 
         return DIENUM_CONTINUE;
@@ -226 +247 @@
 void Win32JoyStick::capture()
 {
+#ifdef OIS_WIN32_XINPUT_SUPPORT
+        //handle xbox controller differently
+    if (mJoyInfo.isXInput)
+        {
+                captureXInput();
+                return;
+        }
+#endif
+
+        //handle directinput based devices
         DIDEVICEOBJECTDATA diBuff[JOYSTICK_DX_BUFFERSIZE];
         DWORD entries = JOYSTICK_DX_BUFFERSIZE;
@@ -241 +272 @@
 
                 // Poll the device to read the current state
-            mJoyStick->Poll();
+                mJoyStick->Poll();
                 hr = mJoyStick->GetDeviceData( sizeof(DIDEVICEOBJECTDATA), diBuff, &entries, 0 );
                 //Perhaps the user just tabbed away
@@ -353 +384 @@
 
 //--------------------------------------------------------------------------------------------------//
+void Win32JoyStick::captureXInput()
+{
+#ifdef OIS_WIN32_XINPUT_SUPPORT
+    XINPUT_STATE inputState;
+        if (XInputGetState((DWORD)mJoyInfo.xInputDev, &inputState) != ERROR_SUCCESS)
+        memset(&inputState, 0, sizeof(inputState));
+
+    //Sticks and triggers
+        int value;
+    bool axisMoved[XINPUT_TRANSLATED_AXIS_COUNT] = {false,false,false,false,false,false};
+
+        //LeftY
+        value = -(int)inputState.Gamepad.sThumbLY;
+        mState.mAxes[0].rel = value - mState.mAxes[0].abs;
+        mState.mAxes[0].abs = value;
+        if(mState.mAxes[0].rel != 0)
+        axisMoved[0] = true;
+
+        //LeftX
+    mState.mAxes[1].rel = inputState.Gamepad.sThumbLX - mState.mAxes[1].abs;
+    mState.mAxes[1].abs = inputState.Gamepad.sThumbLX;
+
+        if(mState.mAxes[1].rel != 0)
+        axisMoved[1] = true;
+
+        //RightY
+        value = -(int)inputState.Gamepad.sThumbRY;           
+    mState.mAxes[2].rel = value - mState.mAxes[2].abs;
+    mState.mAxes[2].abs = value;
+        if(mState.mAxes[2].rel != 0)
+        axisMoved[2] = true;
+
+        //RightX
+    mState.mAxes[3].rel = inputState.Gamepad.sThumbRX - mState.mAxes[3].abs;
+    mState.mAxes[3].abs = inputState.Gamepad.sThumbRX;
+        if(mState.mAxes[3].rel != 0)
+                axisMoved[3] = true;
+
+        //Left trigger
+    value = inputState.Gamepad.bLeftTrigger * 129;
+        if(value > JoyStick::MAX_AXIS)
+                value = JoyStick::MAX_AXIS;
+
+    mState.mAxes[4].rel = value - mState.mAxes[4].abs;
+    mState.mAxes[4].abs = value;
+        if(mState.mAxes[4].rel != 0)
+                axisMoved[4] = true;
+
+        //Right trigger
+    value = (int)inputState.Gamepad.bRightTrigger * 129;
+        if(value > JoyStick::MAX_AXIS)
+                value = JoyStick::MAX_AXIS;
+
+        mState.mAxes[5].rel = value - mState.mAxes[5].abs;
+    mState.mAxes[5].abs = value;
+        if(mState.mAxes[5].rel != 0)
+                axisMoved[5] = true;
+    
+    //POV
+    int previousPov = mState.mPOV[0].direction;        
+    int& pov = mState.mPOV[0].direction;
+    pov = Pov::Centered;        
+    if (inputState.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP)
+        pov |= Pov::North;
+    else if (inputState.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN)
+        pov |= Pov::South;
+    if (inputState.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT)
+        pov |= Pov::West;
+    else if (inputState.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT)
+        pov |= Pov::East;
+    
+    //Buttons - The first 4 buttons don't need to be checked since they represent the dpad
+    bool previousButtons[XINPUT_TRANSLATED_BUTTON_COUNT];
+    std::copy(mState.mButtons.begin(), mState.mButtons.end(), previousButtons);
+    for (size_t i = 0; i < XINPUT_TRANSLATED_BUTTON_COUNT; i++)
+        mState.mButtons[i] = (inputState.Gamepad.wButtons & (1 << (i + 4))) != 0;
+
+    //Send events
+    if (mBuffered && mListener)
+    {
+            JoyStickEvent joystickEvent(this, mState);
+
+            //Axes
+            for (int i = 0; i < XINPUT_TRANSLATED_AXIS_COUNT; i++)
+        {
+                    if (axisMoved[i] && !mListener->axisMoved(joystickEvent, i))
+                            return;
+        }
+
+        //POV
+        if (previousPov != pov && !mListener->povMoved(joystickEvent, 0))
+            return;
+
+        //Buttons
+        for (int i = 0; i < XINPUT_TRANSLATED_BUTTON_COUNT; i++)
+        {
+            if (!previousButtons[i] && mState.mButtons[i])
+            {
+                if (!mListener->buttonPressed(joystickEvent, i))
+                    return;
+            }
+            else if (previousButtons[i] && !mState.mButtons[i])
+            {
+                if (!mListener->buttonReleased(joystickEvent, i))
+                    return;
+            }
+        }
+    }
+#endif
+}
+
+//--------------------------------------------------------------------------------------------------//
 bool Win32JoyStick::_doButtonClick( int button, DIDEVICEOBJECTDATA& di )
 {
@@ -410 +553 @@
 Interface* Win32JoyStick::queryInterface(Interface::IType type)
 {
-        //Thought about using covariant return type here.. however,
-        //some devices may allow LED light changing, or other interface stuff
-
-        if( ff_device && type == Interface::ForceFeedback )
-                return ff_device;
+        if( mFfDevice && type == Interface::ForceFeedback )
+                return mFfDevice;
         else
                 return 0;
 }
+
+//--------------------------------------------------------------------------------------------------//
+void Win32JoyStick::CheckXInputDevices(JoyStickInfoList &joys)
+{
+    IWbemLocator*           pIWbemLocator  = NULL;
+    IEnumWbemClassObject*   pEnumDevices   = NULL;
+    IWbemClassObject*       pDevices[20]   = {0};
+    IWbemServices*          pIWbemServices = NULL;
+    BSTR                    bstrNamespace  = NULL;
+    BSTR                    bstrDeviceID   = NULL;
+    BSTR                    bstrClassName  = NULL;
+    DWORD                   uReturned      = 0;
+    bool                    bIsXinputDevice= false;
+        DWORD                   iDevice        = 0;
+        int                     xDevice        = 0;
+    VARIANT                 var;
+    HRESULT                 hr;
+
+        if(joys.size() == 0)
+                return;
+
+    // CoInit if needed
+    hr = CoInitialize(NULL);
+    bool bCleanupCOM = SUCCEEDED(hr);
+
+    // Create WMI
+    hr = CoCreateInstance(__uuidof(WbemLocator), NULL, CLSCTX_INPROC_SERVER, __uuidof(IWbemLocator), (LPVOID*)&pIWbemLocator);
+    if( FAILED(hr) || pIWbemLocator == NULL )
+        goto LCleanup;
+
+    bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );
+        if( bstrNamespace == NULL )
+                goto LCleanup;
+
+    bstrClassName = SysAllocString( L"Win32_PNPEntity" );
+        if( bstrClassName == NULL )
+                goto LCleanup;
+
+    bstrDeviceID  = SysAllocString( L"DeviceID" );
+        if( bstrDeviceID == NULL )
+                goto LCleanup;
+    
+    // Connect to WMI 
+    hr = pIWbemLocator->ConnectServer( bstrNamespace, NULL, NULL, 0L, 0L, NULL, NULL, &pIWbemServices );
+    if( FAILED(hr) || pIWbemServices == NULL )
+        goto LCleanup;
+
+    // Switch security level to IMPERSONATE. 
+    CoSetProxyBlanket(pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE );                    
+
+    hr = pIWbemServices->CreateInstanceEnum( bstrClassName, 0, NULL, &pEnumDevices ); 
+    if( FAILED(hr) || pEnumDevices == NULL )
+        goto LCleanup;
+
+    // Loop over all devices
+    for( ;; )
+    {
+        // Get 20 at a time
+        hr = pEnumDevices->Next(5000, 20, pDevices, &uReturned);
+        if( FAILED(hr) )
+            goto LCleanup;
+
+        if( uReturned == 0 )
+            break;
+
+        for(iDevice = 0; iDevice < uReturned; iDevice++)
+        {
+            // For each device, get its device ID
+            hr = pDevices[iDevice]->Get(bstrDeviceID, 0L, &var, NULL, NULL);
+            if(SUCCEEDED(hr) && var.vt == VT_BSTR && var.bstrVal != NULL)
+            {
+                // Check if the device ID contains "IG_".  If it does, then it's an XInput device - This information can not be found from DirectInput 
+                if(wcsstr(var.bstrVal, L"IG_"))
+                {
+                    // If it does, then get the VID/PID from var.bstrVal
+                    DWORD dwPid = 0, dwVid = 0;
+                    WCHAR* strVid = wcsstr( var.bstrVal, L"VID_" );
+                    if(strVid && swscanf_s( strVid, L"VID_%4X", &dwVid ) != 1)
+                                                dwVid = 0;
+
+                    WCHAR* strPid = wcsstr( var.bstrVal, L"PID_" );
+                    if(strPid && swscanf_s( strPid, L"PID_%4X", &dwPid ) != 1)
+                        dwPid = 0;
+
+                    // Compare the VID/PID to the DInput device
+                    DWORD dwVidPid = MAKELONG(dwVid, dwPid);
+                                        for(JoyStickInfoList::iterator i = joys.begin(); i != joys.end(); ++i)
+                                        {
+                                                if(dwVidPid == i->productGuid.Data1)
+                                                {
+                                                        i->isXInput = true;
+                                                        i->xInputDev = xDevice;
+                                                }
+                                        }
+
+                                        if(joys.size() == 0)
+                                                goto LCleanup;
+                }
+            }
+
+            SAFE_RELEASE(pDevices[iDevice]);
+        }
+    }
+
+LCleanup:
+    if(bstrNamespace)
+        SysFreeString(bstrNamespace);
+
+    if(bstrDeviceID)
+        SysFreeString(bstrDeviceID);
+
+    if(bstrClassName)
+        SysFreeString(bstrClassName);
+
+    for(iDevice=0; iDevice < 20; iDevice++)
+        SAFE_RELEASE(pDevices[iDevice]);
+
+    SAFE_RELEASE(pEnumDevices);
+    SAFE_RELEASE(pIWbemLocator);
+    SAFE_RELEASE(pIWbemServices);
+
+    if(bCleanupCOM)
+        CoUninitialize();
+}

code/branches/kicklib/src/external/ois/win32/Win32JoyStick.h

@@ -25 +25 @@
 
 #include "OISJoyStick.h"
-#include "Win32/Win32Prereqs.h"
+#include "win32/Win32Prereqs.h"
 
 namespace OIS
@@ -41 +41 @@
                 virtual void capture();
 
+                //! hanlde xinput
+                void captureXInput();
+
                 /** @copydoc Object::queryInterface */
                 virtual Interface* queryInterface(Interface::IType type);
@@ -46 +49 @@
                 /** @copydoc Object::_initialize */
                 virtual void _initialize();
+
+                /**
+                @remarks
+                        Enum each PNP device using WMI and check each device ID to see if it contains 
+                        "IG_" (ex. "VID_045E&PID_028E&IG_00").  If it does, then it's an XInput device
+                        Unfortunately this information can not be found by just using DirectInput 
+                */
+                static void CheckXInputDevices(JoyStickInfoList &joys);
 
         protected:
@@ -61 +72 @@
                 IDirectInputDevice8* mJoyStick;
                 DIDEVCAPS mDIJoyCaps;
+                DWORD coopSetting;
 
-                DWORD coopSetting;
-                GUID deviceGuid;
+        JoyStickInfo mJoyInfo;
 
                 //! A force feedback device
-                Win32ForceFeedback* ff_device;
+                Win32ForceFeedback* mFfDevice;
 
                 //! Mapping

code/branches/kicklib/src/external/ois/win32/Win32KeyBoard.cpp

@@ -21 +21 @@
     3. This notice may not be removed or altered from any source distribution.
 */
-#include "Win32/Win32InputManager.h"
-#include "Win32/Win32KeyBoard.h"
+#include "win32/Win32InputManager.h"
+#include "win32/Win32KeyBoard.h"
 #include "OISException.h"
 #include "OISEvents.h"
@@ -287 +287 @@
 
 //--------------------------------------------------------------------------------------------------//
-const std::string& Win32Keyboard::getAsString( KeyCode kc )
+const std::string& Win32Keyboard::getAsString(KeyCode kc)
 {
         char temp[256];
@@ -297 +297 @@
         prop.diph.dwHow = DIPH_BYOFFSET;
 
-        if ( SUCCEEDED( mKeyboard->GetProperty( DIPROP_KEYNAME, &prop.diph ) ) )
+        if (SUCCEEDED(mKeyboard->GetProperty(DIPROP_KEYNAME, &prop.diph)))
         {
                 // convert the WCHAR in "wsz" to multibyte
-                if ( WideCharToMultiByte( CP_ACP, 0, prop.wsz, -1, temp, sizeof(temp), NULL, NULL) )
-                        return mGetString.assign( temp );
+                if (WideCharToMultiByte(CP_ACP, 0, prop.wsz, -1, temp, sizeof(temp), NULL, NULL))
+                        return mGetString.assign(temp);
         }
 
         std::stringstream ss;
         ss << "Key_" << (int)kc;
-        return mGetString.assign( ss.str() );
+        return mGetString.assign(ss.str());
 }
 

code/branches/kicklib/src/external/ois/win32/Win32KeyBoard.h

@@ -25 +25 @@
 
 #include "OISKeyboard.h"
-#include "Win32/Win32Prereqs.h"
+#include "win32/Win32Prereqs.h"
 
 namespace OIS
@@ -42 +42 @@
                         A combination of DI Flags (see DX Help for info on input device settings)
                 */
-                Win32Keyboard( InputManager* creator, IDirectInput8* pDI, bool buffered, DWORD coopSettings );
+                Win32Keyboard(InputManager* creator, IDirectInput8* pDI, bool buffered, DWORD coopSettings);
                 virtual ~Win32Keyboard();
 
                 /** @copydoc Keyboard::isKeyDown */
-                virtual bool isKeyDown( KeyCode key ) const;
+                virtual bool isKeyDown(KeyCode key) const;
                 
                 /** @copydoc Keyboard::getAsString */
-                virtual const std::string& getAsString( KeyCode kc );
+                virtual const std::string& getAsString(KeyCode kc);
 
                 /** @copydoc Keyboard::copyKeyStates */
-                virtual void copyKeyStates( char keys[256] ) const;
+                virtual void copyKeyStates(char keys[256]) const;
 
                 /** @copydoc Object::setBuffered */

code/branches/kicklib/src/external/ois/win32/Win32Mouse.cpp

@@ -21 +21 @@
     3. This notice may not be removed or altered from any source distribution.
 */
-#include "Win32/Win32Mouse.h"
-#include "Win32/Win32InputManager.h"
+#include "win32/Win32Mouse.h"
+#include "win32/Win32InputManager.h"
 #include "OISException.h"
 #include "OISEvents.h"

code/branches/kicklib/src/external/ois/win32/Win32Mouse.h

@@ -25 +25 @@
 
 #include "OISMouse.h"
-#include "Win32/Win32Prereqs.h"
+#include "win32/Win32Prereqs.h"
 
 namespace OIS

code/branches/kicklib/src/external/ois/win32/Win32Prereqs.h

@@ -29 +29 @@
 #include <dinput.h>
 
+#ifdef OIS_WIN32_XINPUT_SUPPORT
+#       include <XInput.h>
+#endif
+
 //Max number of elements to collect from buffered DirectInput
 #define KEYBOARD_DX_BUFFERSIZE 17
-#define MOUSE_DX_BUFFERSIZE 64
-#define JOYSTICK_DX_BUFFERSIZE 124
+#define MOUSE_DX_BUFFERSIZE 128
+#define JOYSTICK_DX_BUFFERSIZE 129
 
 //MinGW defines
@@ -55 +59 @@
                 int devId;
                 GUID deviceID;
+                GUID productGuid;
                 std::string vendor;
+        bool isXInput;
+                int xInputDev;
         };
 
-        typedef std::vector< JoyStickInfo > JoyStickInfoList;
+        typedef std::vector<JoyStickInfo> JoyStickInfoList;
 }
 

code/branches/kicklib/src/libraries/core/Core.cc

@@ -81 +81 @@
 
     SetCommandLineArgument(settingsFile, "orxonox.ini").information("THE configuration file");
+#ifndef ORXONOX_PLATFORM_APPLE
     SetCommandLineSwitch(noIOConsole).information("Use this if you don't want to use the IOConsole (for instance for Lua debugging)");
+#endif
 
 #ifdef ORXONOX_PLATFORM_WINDOWS
@@ -156 +158 @@
         this->setConfigValues();
 
-        // create persistent io console
+#ifndef ORXONOX_PLATFORM_APPLE
+        // Create persistent IO console
         if (CommandLineParser::getValue("noIOConsole").getBool())
         {
@@ -163 +166 @@
         if (this->bStartIOConsole_)
             this->ioConsole_.reset(new IOConsole());
+#endif
 
         // creates the class hierarchy for all classes with factories

code/branches/kicklib/src/libraries/core/CorePrereqs.h

@@ -54 +54 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _CorePrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _CoreExport  __attribute__ ((visibility("default")))
+#  define _CorePrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _CoreExport
+#  define _CorePrivate
 #endif
 

code/branches/kicklib/src/libraries/core/DynLib.cc

@@ -42 +42 @@
 #endif
 
-#ifdef ORXONOX_PLATFORM_LINUX
+#ifdef ORXONOX_PLATFORM_UNIX
 #  include <dlfcn.h>
 #endif
 
 #ifdef ORXONOX_PLATFORM_APPLE
-#  include <macPlugins.h>
+#   include <OSX/macUtils.h> // OGRE include
 #endif
 
@@ -75 +75 @@
         if (name.substr(name.length() - 3, 3) != ".so")
            name += ".so";
+#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+        // dlopen() does not add .dylib to the filename, like windows does for .dll
+        if (name.substr(name.length() - 6, 6) != ".dylib")
+            name += ".dylib";
+#elif OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+        // Although LoadLibraryEx will add .dll itself when you only specify the library name,
+        // if you include a relative path then it does not. So, add it to be sure.
+        if (name.substr(name.length() - 4, 4) != ".dll")
+            name += ".dll";
 #endif
 
@@ -127 +136 @@
         LocalFree( lpMsgBuf );
         return ret;
-#elif defined(ORXONOX_PLATFORM_LINUX)
+#elif defined(ORXONOX_PLATFORM_UNIX)
         return std::string(dlerror());
-#elif defined(ORXONOX_PLATFORM_APPLE)
-        return std::string(mac_errorBundle());
 #else
         return "";
 #endif
     }
-
 }

code/branches/kicklib/src/libraries/core/DynLib.h

@@ -52 +52 @@
 typedef struct HINSTANCE__* hInstance;
 
-#elif defined(ORXONOX_PLATFORM_LINUX)
+#elif defined(ORXONOX_PLATFORM_UNIX)
 #    define DYNLIB_HANDLE void*
 #    define DYNLIB_LOAD( a ) dlopen( a, RTLD_LAZY | RTLD_GLOBAL)
 #    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
 #    define DYNLIB_UNLOAD( a ) dlclose( a )
-
-#elif defined(ORXONOX_PLATFORM_APPLE)
-#    define DYNLIB_HANDLE CFBundleRef
-#    define DYNLIB_LOAD( a ) mac_loadExeBundle( a )
-#    define DYNLIB_GETSYM( a, b ) mac_getBundleSym( a, b )
-#    define DYNLIB_UNLOAD( a ) mac_unloadExeBundle( a )
 #endif
 
@@ -116 +110 @@
 
     protected:
-
         /// Handle to the loaded library.
         DYNLIB_HANDLE m_hInst;

code/branches/kicklib/src/libraries/core/GUIManager.cc

@@ -436 +436 @@
     void GUIManager::buttonPressed(MouseButtonCode::ByEnum id)
     {
+        //guiSystem_->injectMouseButtonDown(convertButton(id));
         this->protectedCall(boost::bind(&CEGUI::System::injectMouseButtonDown, _1, convertButton(id)));
     }

code/branches/kicklib/src/libraries/core/GraphicsManager.cc

@@ -269 +269 @@
 
         Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, ogreWindowEventListener_.get());
-
+                
+// HACK
+#ifdef ORXONOX_PLATFORM_APPLE
+        //INFO: This will give our window focus, and not lock it to the terminal
+        ProcessSerialNumber psn = {0, kCurrentProcess};
+        TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+        SetFrontProcess(&psn);
+#endif
+// End of HACK
+                
         // create a full screen default viewport
         // Note: This may throw when adding a viewport with an existing z-order!

code/branches/kicklib/src/libraries/core/Identifier.h

@@ -123 +123 @@
 
             /// Returns the unique ID of the class.
-            FORCEINLINE unsigned int getClassID() const { return this->classID_; }
+            ORX_FORCEINLINE unsigned int getClassID() const { return this->classID_; }
 
             /// Returns the list of all existing objects of this class.
@@ -486 +486 @@
     */
     template <class T, class U>
-    FORCEINLINE T orxonox_cast(U* source)
+    ORX_FORCEINLINE T orxonox_cast(U* source)
     {
 #ifdef ORXONOX_COMPILER_MSVC

code/branches/kicklib/src/libraries/core/OrxonoxClass.h

@@ -135 +135 @@
                 Returns NULL if the no pointer was found.
             */
-            FORCEINLINE void* getDerivedPointer(unsigned int classID)
+            ORX_FORCEINLINE void* getDerivedPointer(unsigned int classID)
             {
                 for (int i = this->objectPointers_.size() - 1; i >= 0; --i)
@@ -146 +146 @@
 
             /// Version of getDerivedPointer with template
-            template <class T> FORCEINLINE T* getDerivedPointer(unsigned int classID)
+            template <class T> ORX_FORCEINLINE T* getDerivedPointer(unsigned int classID)
             {   return static_cast<T*>(this->getDerivedPointer(classID));   }
             /// Const version of getDerivedPointer with template
-            template <class T> FORCEINLINE const T* getDerivedPointer(unsigned int classID) const
+            template <class T> ORX_FORCEINLINE const T* getDerivedPointer(unsigned int classID) const
             {   return const_cast<OrxonoxClass*>(this)->getDerivedPointer<T>(classID);   }
 

code/branches/kicklib/src/libraries/core/PathConfig.cc

@@ -97 +97 @@
 #elif defined(ORXONOX_PLATFORM_APPLE)
         char buffer[1024];
-        unsigned long path_len = 1023;
+        uint32_t path_len = 1023;
         if (_NSGetExecutablePath(buffer, &path_len))
             ThrowException(General, "Could not retrieve executable path.");
@@ -127 +127 @@
 #endif
 
-        executablePath_ = bf::path(buffer);
-#ifndef ORXONOX_PLATFORM_APPLE
-        executablePath_ = executablePath_.branch_path(); // remove executable name
-#endif
+        // Remove executable filename
+        executablePath_ = bf::path(buffer).branch_path();
 
         /////////////////////
@@ -208 +206 @@
 
             // Get user directory
-#  ifdef ORXONOX_PLATFORM_UNIX /* Apple? */
+#ifdef ORXONOX_PLATFORM_UNIX
             char* userDataPathPtr(getenv("HOME"));
-#  else
+#elif ORXONOX_PLATFORM_APPLE
+            char* userDataPathPtr(getenv("HOME"));
+#else
             char* userDataPathPtr(getenv("APPDATA"));
-#  endif
+#endif
             if (userDataPathPtr == NULL)
                 ThrowException(General, "Could not retrieve user data path.");

code/branches/kicklib/src/libraries/core/Super.h

@@ -94 +94 @@
         struct SuperFunctionCondition<functionnumber, T, 0, templatehack2> \
         { \
-            static void check() \
+            static void superCheck() \
             { \
                 SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0)); \
-                SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::check(); \
+                SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::superCheck(); \
             } \
             \
@@ -132 +132 @@
         struct SuperFunctionCondition<functionnumber, baseclass, 0, templatehack2> \
         { \
-            static void check() \
-            { \
-                SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::check(); \
+            static void superCheck() \
+            { \
+                SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::superCheck(); \
             } \
         };
@@ -150 +150 @@
         struct SuperFunctionCondition<functionnumber, T, 0, templatehack2>
         {
-            static void check()
+            static void superCheck()
             {
                 // This call to the apply-function is the whole check. By calling the function with
@@ -156 +156 @@
                 SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0));
 
-                // Go go the check for of next super-function (functionnumber + 1)
-                SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::check();
+                // Go go the superCheck for of next super-function (functionnumber + 1)
+                SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::superCheck();
             }
 
@@ -202 +202 @@
         struct SuperFunctionCondition<functionnumber, baseclass, 0, templatehack2> \
         { \
-            // The check function acts like the fallback - it advances to the check for the next super-function (functionnumber + 1)
-            static void check() \
-            { \
-                SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::check(); \
+            // The superCheck function acts like the fallback - it advances to the check for the next super-function (functionnumber + 1)
+            static void superCheck() \
+            { \
+                SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::superCheck(); \
             } \
         };
@@ -303 +303 @@
         struct SuperFunctionCondition
         {
-            static void check() {}
+            static void superCheck() {}
         };
 
@@ -338 +338 @@
             struct SuperFunctionCondition<functionnumber, T, templatehack1, templatehack2> \
             { \
-                static void check() \
+                static void superCheck() \
                 { \
-                    SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::check(); \
+                    SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::superCheck(); \
                 } \
             }; \
@@ -421 +421 @@
             // If this function gets called, the header-file of the super function is not
             // included, so this fallback template (templatehack not specialized) is used
-            static void check()
+            static void superCheck()
             {
                 // Calls the condition-check of the next super-function (functionnumber + 1)
-                SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::check();
+                SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::superCheck();
             }
         };
@@ -574 +574 @@
         virtual void createSuperFunctionCaller() const
         {
-            SuperFunctionCondition<0, T, 0, 0>::check();
+            SuperFunctionCondition<0, T, 0, 0>::superCheck();
         }
 

code/branches/kicklib/src/libraries/core/command/Functor.h

@@ -244 +244 @@
             FunctorMember(O* object = 0) : object_(object), bSafeMode_(false) {}
             virtual ~FunctorMember() { if (this->bSafeMode_) { this->unregisterObject(this->object_); } }
+            virtual ~FunctorMember() {}
 
             /// Calls the function-pointer with up to five arguments and an object. In case of a static-function, the object can be NULL. @return Returns the return-value of the function (if any; MT_Type::Null otherwise)

code/branches/kicklib/src/libraries/core/input/InputDevice.h

@@ -184 +184 @@
     protected:
         //! Common code for all button pressed events (updates pressed buttons list and calls the input states)
-        FORCEINLINE void buttonPressed(ButtonTypeParam button)
+        ORX_FORCEINLINE void buttonPressed(ButtonTypeParam button)
         {
             // check whether the button already is in the list (can happen when focus was lost)
@@ -201 +201 @@
 
         //! Common code for all button released events (updates pressed buttons list and calls the input states)
-        FORCEINLINE void buttonReleased(ButtonTypeParam button)
+        ORX_FORCEINLINE void buttonReleased(ButtonTypeParam button)
         {
             // remove the button from the pressedButtons_ list

code/branches/kicklib/src/libraries/core/input/InputState.h

@@ -176 +176 @@
     };
 
-    FORCEINLINE void InputState::update(float dt)
+    ORX_FORCEINLINE void InputState::update(float dt)
     {
         for (unsigned int i = 0; i < handlers_.size(); ++i)
@@ -183 +183 @@
     }
 
-    FORCEINLINE void InputState::update(float dt, unsigned int device)
+    ORX_FORCEINLINE void InputState::update(float dt, unsigned int device)
     {
         switch (device)
@@ -205 +205 @@
 
     template <typename EventType, class ButtonTypeParam>
-    FORCEINLINE void InputState::buttonEvent(unsigned int device, ButtonTypeParam button)
+    ORX_FORCEINLINE void InputState::buttonEvent(unsigned int device, ButtonTypeParam button)
     {
         assert(device < handlers_.size());
@@ -216 +216 @@
     }
 
-    FORCEINLINE void InputState::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
+    ORX_FORCEINLINE void InputState::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
     {
         if (handlers_[mouseIndex_s] != NULL)
@@ -222 +222 @@
     }
 
-    FORCEINLINE void InputState::mouseScrolled(int abs, int rel)
+    ORX_FORCEINLINE void InputState::mouseScrolled(int abs, int rel)
     {
         if (handlers_[mouseIndex_s] != NULL)
@@ -228 +228 @@
     }
 
-    FORCEINLINE void InputState::joyStickAxisMoved(unsigned int device, unsigned int axis, float value)
+    ORX_FORCEINLINE void InputState::joyStickAxisMoved(unsigned int device, unsigned int axis, float value)
     {
         assert(device < handlers_.size());

code/branches/kicklib/src/libraries/network/LANDiscoverable.cc

@@ -29 +29 @@
 #include "LANDiscoverable.h"
 
-#include "NetworkPrereqs.h"
-#include "packet/ServerInformation.h"
-
 #include <enet/enet.h>
 #include <cassert>
 #include <cstring>
+
+#include "util/Debug.h"
+#include "packet/ServerInformation.h"
 
 namespace orxonox

code/branches/kicklib/src/libraries/network/NetworkPrereqs.h

@@ -52 +52 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _NetworkPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _NetworkExport  __attribute__ ((visibility("default")))
+#  define _NetworkPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _NetworkExport
+#  define _NetworkPrivate
 #endif
 

code/branches/kicklib/src/libraries/tools/BulletConversions.h

@@ -43 +43 @@
     struct ConverterExplicit<orxonox::Vector3, btVector3>
     {
-        FORCEINLINE static bool convert(btVector3* output, const orxonox::Vector3& input)
+        ORX_FORCEINLINE static bool convert(btVector3* output, const orxonox::Vector3& input)
         {
             output->setX(input.x);
@@ -56 +56 @@
     struct ConverterExplicit<btVector3, orxonox::Vector3>
     {
-        FORCEINLINE static bool convert(orxonox::Vector3* output, const btVector3& input)
+        ORX_FORCEINLINE static bool convert(orxonox::Vector3* output, const btVector3& input)
         {
             output->x = input.x();
@@ -69 +69 @@
     struct ConverterExplicit<orxonox::Quaternion, btQuaternion>
     {
-        FORCEINLINE static bool convert(btQuaternion* output, const orxonox::Quaternion& input)
+        ORX_FORCEINLINE static bool convert(btQuaternion* output, const orxonox::Quaternion& input)
         {
             output->setW(input.w);
@@ -83 +83 @@
     struct ConverterExplicit<btQuaternion, orxonox::Quaternion>
     {
-        FORCEINLINE static bool convert(orxonox::Quaternion* output, const btQuaternion& input)
+        ORX_FORCEINLINE static bool convert(orxonox::Quaternion* output, const btQuaternion& input)
         {
             output->w = input.w();

code/branches/kicklib/src/libraries/tools/ToolsPrereqs.h

@@ -52 +52 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _ToolsPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _ToolsExport  __attribute__ ((visibility("default")))
+#  define _ToolsPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _ToolsExport
+#  define _ToolsPrivate
 #endif
 

code/branches/kicklib/src/libraries/util/Convert.h

@@ -143 +143 @@
     struct ConverterFallback
     {
-        FORCEINLINE static bool convert(ToType* output, const FromType& input)
+        ORX_FORCEINLINE static bool convert(ToType* output, const FromType& input)
         {
             COUT(2) << "Could not convert value of type " << typeid(FromType).name()
@@ -155 +155 @@
     struct ConverterFallback<FromType*, ToType*>
     {
-        FORCEINLINE static bool convert(ToType** output, FromType* const input)
+        ORX_FORCEINLINE static bool convert(ToType** output, FromType* const input)
         {
             ToType* temp = dynamic_cast<ToType*>(input);
@@ -182 +182 @@
 struct ConverterStringStream
 {
-    FORCEINLINE static bool convert(ToType* output, const FromType& input)
+    ORX_FORCEINLINE static bool convert(ToType* output, const FromType& input)
     {
         return orxonox::ConverterFallback<FromType, ToType>::convert(output, input);
@@ -198 +198 @@
     /// Fallback operator <<() (delegates to orxonox::ConverterFallback)
     template <class FromType>
-    FORCEINLINE bool operator <<(std::ostream& outstream,  const FromType& input)
+    ORX_FORCEINLINE bool operator <<(std::ostream& outstream,  const FromType& input)
     {
         std::string temp;
@@ -215 +215 @@
 struct ConverterStringStream<FromType, std::string>
 {
-    FORCEINLINE static bool convert(std::string* output, const FromType& input)
+    ORX_FORCEINLINE static bool convert(std::string* output, const FromType& input)
     {
         using namespace fallbackTemplates;
@@ -241 +241 @@
     /// Fallback operator >>() (delegates to orxonox::ConverterFallback)
     template <class ToType>
-    FORCEINLINE bool operator >>(std::istream& instream, ToType& output)
+    ORX_FORCEINLINE bool operator >>(std::istream& instream, ToType& output)
     {
         std::string input(static_cast<std::istringstream&>(instream).str());
@@ -252 +252 @@
 struct ConverterStringStream<std::string, ToType>
 {
-    FORCEINLINE static bool convert(ToType* output, const std::string& input)
+    ORX_FORCEINLINE static bool convert(ToType* output, const std::string& input)
     {
         using namespace fallbackTemplates;
@@ -276 +276 @@
     /// %Template delegates to ::ConverterStringStream
     template <class FromType, class ToType>
-    FORCEINLINE bool convertImplicitely(ToType* output, const FromType& input, Loki::Int2Type<false>)
+    ORX_FORCEINLINE bool convertImplicitely(ToType* output, const FromType& input, Loki::Int2Type<false>)
     {
         return ConverterStringStream<FromType, ToType>::convert(output, input);
@@ -283 +283 @@
     /// Makes an implicit cast from \a FromType to \a ToType
     template <class FromType, class ToType>
-    FORCEINLINE bool convertImplicitely(ToType* output, const FromType& input, Loki::Int2Type<true>)
+    ORX_FORCEINLINE bool convertImplicitely(ToType* output, const FromType& input, Loki::Int2Type<true>)
     {
         (*output) = static_cast<ToType>(input);
@@ -303 +303 @@
     {
         enum { probe = ImplicitConversion<FromType, ToType>::exists };
-        FORCEINLINE static bool convert(ToType* output, const FromType& input)
+        ORX_FORCEINLINE static bool convert(ToType* output, const FromType& input)
         {
             // Use the probe's value to delegate to the right function
@@ -327 +327 @@
     */
     template <class FromType, class ToType>
-    FORCEINLINE bool convertValue(ToType* output, const FromType& input)
+    ORX_FORCEINLINE bool convertValue(ToType* output, const FromType& input)
     {
         return ConverterExplicit<FromType, ToType>::convert(output, input);
@@ -348 +348 @@
     */
     template<class FromType, class ToType>
-    FORCEINLINE bool convertValue(ToType* output, const FromType& input, const ToType& fallback)
+    ORX_FORCEINLINE bool convertValue(ToType* output, const FromType& input, const ToType& fallback)
     {
         if (convertValue(output, input))
@@ -361 +361 @@
     /// Directly returns the converted value, but uses the fallback on failure. @see convertValue
     template<class FromType, class ToType>
-    FORCEINLINE ToType getConvertedValue(const FromType& input, const ToType& fallback)
+    ORX_FORCEINLINE ToType getConvertedValue(const FromType& input, const ToType& fallback)
     {
         ToType output;
@@ -380 +380 @@
     */
     template<class ToType, class FromType>
-    FORCEINLINE ToType multi_cast(const FromType& input)
+    ORX_FORCEINLINE ToType multi_cast(const FromType& input)
     {
         ToType output;
@@ -395 +395 @@
     struct ConverterExplicit<const char*, ToType>
     {
-        FORCEINLINE static bool convert(ToType* output, const char* input)
+        ORX_FORCEINLINE static bool convert(ToType* output, const char* input)
         {
             return convertValue<std::string, ToType>(output, input);
@@ -405 +405 @@
     struct ConverterExplicit<char, std::string>
     {
-        FORCEINLINE static bool convert(std::string* output, const char input)
+        ORX_FORCEINLINE static bool convert(std::string* output, const char input)
         {
             *output = input;
@@ -415 +415 @@
     struct ConverterExplicit<unsigned char, std::string>
     {
-        FORCEINLINE static bool convert(std::string* output, const unsigned char input)
+        ORX_FORCEINLINE static bool convert(std::string* output, const unsigned char input)
         {
             *output = input;
@@ -425 +425 @@
     struct ConverterExplicit<std::string, char>
     {
-        FORCEINLINE static bool convert(char* output, const std::string& input)
+        ORX_FORCEINLINE static bool convert(char* output, const std::string& input)
         {
             if (!input.empty())
@@ -438 +438 @@
     struct ConverterExplicit<std::string, unsigned char>
     {
-        FORCEINLINE static bool convert(unsigned char* output, const std::string& input)
+        ORX_FORCEINLINE static bool convert(unsigned char* output, const std::string& input)
         {
             if (!input.empty())
@@ -453 +453 @@
     struct ConverterExplicit<bool, std::string>
     {
-        FORCEINLINE static bool convert(std::string* output, const bool& input)
+        ORX_FORCEINLINE static bool convert(std::string* output, const bool& input)
         {
             if (input)

code/branches/kicklib/src/libraries/util/MathConvert.h

@@ -51 +51 @@
     struct ConverterExplicit<orxonox::Vector2, std::string>
     {
-        FORCEINLINE static bool convert(std::string* output, const orxonox::Vector2& input)
+        ORX_FORCEINLINE static bool convert(std::string* output, const orxonox::Vector2& input)
         {
             std::ostringstream ostream;
@@ -67 +67 @@
     struct ConverterExplicit<orxonox::Vector3, std::string>
     {
-        FORCEINLINE static bool convert(std::string* output, const orxonox::Vector3& input)
+        ORX_FORCEINLINE static bool convert(std::string* output, const orxonox::Vector3& input)
         {
             std::ostringstream ostream;
@@ -83 +83 @@
     struct ConverterExplicit<orxonox::Vector4, std::string>
     {
-        FORCEINLINE static bool convert(std::string* output, const orxonox::Vector4& input)
+        ORX_FORCEINLINE static bool convert(std::string* output, const orxonox::Vector4& input)
         {
             std::ostringstream ostream;
@@ -99 +99 @@
     struct ConverterExplicit<orxonox::Quaternion, std::string>
     {
-        FORCEINLINE static bool convert(std::string* output, const orxonox::Quaternion& input)
+        ORX_FORCEINLINE static bool convert(std::string* output, const orxonox::Quaternion& input)
         {
             std::ostringstream ostream;
@@ -115 +115 @@
     struct ConverterExplicit<orxonox::ColourValue, std::string>
     {
-        FORCEINLINE static bool convert(std::string* output, const orxonox::ColourValue& input)
+        ORX_FORCEINLINE static bool convert(std::string* output, const orxonox::ColourValue& input)
         {
             std::ostringstream ostream;
@@ -157 +157 @@
     struct ConverterFallback<orxonox::Radian, ToType>
     {
-        FORCEINLINE static bool convert(ToType* output, const orxonox::Radian& input)
+        ORX_FORCEINLINE static bool convert(ToType* output, const orxonox::Radian& input)
         {
             return convertValue<Ogre::Real, ToType>(output, input.valueRadians());
@@ -167 +167 @@
     struct ConverterFallback<orxonox::Degree, ToType>
     {
-        FORCEINLINE static bool convert(ToType* output, const orxonox::Degree& input)
+        ORX_FORCEINLINE static bool convert(ToType* output, const orxonox::Degree& input)
         {
             return convertValue<Ogre::Real, ToType>(output, input.valueDegrees());
@@ -177 +177 @@
     struct ConverterFallback<FromType, orxonox::Radian>
     {
-        FORCEINLINE static bool convert(orxonox::Radian* output, const FromType& input)
+        ORX_FORCEINLINE static bool convert(orxonox::Radian* output, const FromType& input)
         {
             float temp;
@@ -194 +194 @@
     struct ConverterFallback<FromType, orxonox::Degree>
     {
-        FORCEINLINE static bool convert(orxonox::Degree* output, const FromType& input)
+        ORX_FORCEINLINE static bool convert(orxonox::Degree* output, const FromType& input)
         {
             float temp;

code/branches/kicklib/src/libraries/util/SharedPtr.h

@@ -163 +163 @@
             public:
                 SharedCounter() : count_(1) {}
+                virtual ~SharedCounter() {}
                 virtual void destroy() = 0;
 
@@ -186 +187 @@
         _UtilExport SmallObjectAllocator& createSharedCounterPool();
 
-        FORCEINLINE SmallObjectAllocator& getSharedCounterPool()
+        ORX_FORCEINLINE SmallObjectAllocator& getSharedCounterPool()
         {
             static SmallObjectAllocator& instance = createSharedCounterPool();

code/branches/kicklib/src/libraries/util/SignalHandler.h

@@ -70 +70 @@
 
     /// The SignalHandler is used to catch signals like SIGSEGV and write a backtrace to the logfile.
-    class SignalHandler : public Singleton<SignalHandler>
+    class _UtilExport SignalHandler : public Singleton<SignalHandler>
     {
         friend class Singleton<SignalHandler>;

code/branches/kicklib/src/libraries/util/UtilPrereqs.h

@@ -52 +52 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _UtilPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _UtilExport  __attribute__ ((visibility("default")))
+#  define _UtilPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _UtilExport
+#  define _UtilPrivate
 #endif
 

code/branches/kicklib/src/modules/designtools/DesignToolsPrereqs.h

@@ -53 +53 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _DesignToolsPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _DesignToolsExport  __attribute__ ((visibility("default")))
+#  define _DesignToolsPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _DesignToolsExport
+#  define _DesignToolsPrivate
 #endif
 

code/branches/kicklib/src/modules/notifications/NotificationsPrereqs.h

@@ -53 +53 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _NotificationsPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _NotificationsExport  __attribute__ ((visibility("default")))
+#  define _NotificationsPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _NotificationsExport
+#  define _NotificationsPrivate
 #endif
 

code/branches/kicklib/src/modules/objects/ObjectsPrereqs.h

@@ -53 +53 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _ObjectsPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _ObjectsExport  __attribute__ ((visibility("default")))
+#  define _ObjectsPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _ObjectsExport
+#  define _ObjectsPrivate
 #endif
 

code/branches/kicklib/src/modules/overlays/OverlaysPrereqs.h

@@ -53 +53 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _OverlaysPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _OverlaysExport  __attribute__ ((visibility("default")))
+#  define _OverlaysPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _OverlaysExport
+#  define _OverlaysPrivate
 #endif
 

code/branches/kicklib/src/modules/pickup/PickupPrereqs.h

@@ -53 +53 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _PickupPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _PickupExport  __attribute__ ((visibility("default")))
+#  define _PickupPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _PickupExport
+#  define _PickupPrivate
 #endif
 

code/branches/kicklib/src/modules/pong/PongPrereqs.h

@@ -53 +53 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _PongPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _PongExport  __attribute__ ((visibility("default")))
+#  define _PongPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _PongExport
+#  define _PongPrivate
 #endif
 

code/branches/kicklib/src/modules/questsystem/QuestEffect.cc

@@ -68 +68 @@
     /*static*/ bool QuestEffect::invokeEffects(PlayerInfo* player, std::list<QuestEffect*> & effects)
     {
-        bool check = true;
+        bool temp = true;
 
         COUT(4) << "Invoking QuestEffects on player: " << player << " ."  << std::endl;
 
         for (std::list<QuestEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++)
-            check = check && (*effect)->invoke(player);
+            temp = temp && (*effect)->invoke(player);
 
-        return check;
+        return temp;
     }
 

code/branches/kicklib/src/modules/questsystem/QuestEffectBeacon.cc

@@ -143 +143 @@
         COUT(4) << "QuestEffectBeacon executed on player: " << player << " ." << std::endl;
 
-        bool check = QuestEffect::invokeEffects(player, this->effects_); // Invoke the QuestEffects on the PlayerInfo.
-        if(check)
+        bool temp = QuestEffect::invokeEffects(player, this->effects_); // Invoke the QuestEffects on the PlayerInfo.
+        if(temp)
         {
             this->decrementTimes(); // Decrement the number of times the beacon can be used.

code/branches/kicklib/src/modules/questsystem/QuestsystemPrereqs.h

@@ -53 +53 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _QuestsystemPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _QuestsystemExport  __attribute__ ((visibility("default")))
+#  define _QuestsystemPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _QuestsystemExport
+#  define _QuestsystemPrivate
 #endif
 

code/branches/kicklib/src/modules/questsystem/effects/AddReward.cc

@@ -105 +105 @@
         COUT(5) << "AddReward on player: " << player << " ." << std::endl;
 
-        bool check = true;
+        bool temp = true;
         for ( std::list<Rewardable*>::iterator reward = this->rewards_.begin(); reward != this->rewards_.end(); ++reward )
-            check = check && (*reward)->reward(player);
+            temp = temp && (*reward)->reward(player);
 
         COUT(4) << "Rewardable successfully added to player." << player << " ." << std::endl;
 
-        return check;
+        return temp;
     }
 

code/branches/kicklib/src/modules/weapons/WeaponsPrereqs.h

@@ -53 +53 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _WeaponsPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _WeaponsExport  __attribute__ ((visibility("default")))
+#  define _WeaponsPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _WeaponsExport
+#  define _WeaponsPrivate
 #endif
 

code/branches/kicklib/src/orxonox/MoodManager.cc

@@ -50 +50 @@
 
         // Checking for the existence of the folder for the default mood
-        const std::string& path = "ambient/" + MoodManager::defaultMood_ + "/.";
-        if (!Resource::exists(path))
+        const std::string& patha = "ambient/" + MoodManager::defaultMood_ + "/.";
+        if (!Resource::exists(patha))
         {
             // TODO: Non-fatal error handling (non-critical resource missing)
             COUT(2) << "Mood Warning: Folder for default mood (" << MoodManager::defaultMood_ << ") does not exist!" << std::endl;
         }
+        
+        // @TODO
+        // Creating a vector of the available moods to enable easy mood selection by Lua/CEGUI        
     }
 

code/branches/kicklib/src/orxonox/OrxonoxPrereqs.h

@@ -53 +53 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _OrxonoxPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _OrxonoxExport  __attribute__ ((visibility("default")))
+#  define _OrxonoxPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _OrxonoxExport
+#  define _OrxonoxPrivate
 #endif
 

code/branches/kicklib/src/orxonox/sound/AmbientSound.cc

@@ -42 +42 @@
 
         // Ambient sounds always fade in
-        this->setVolume(0);
+        this->setVolume(0.0f);
     }
 

code/branches/kicklib/src/orxonox/sound/BaseSound.cc

@@ -31 +31 @@
 #include <cassert>
 #include <vector>
+
+#ifdef ORXONOX_PLATFORM_APPLE
+#include "openal/al.h"
+#else
 #include <al.h>
+#endif
 
 #include "util/Math.h"

code/branches/kicklib/src/orxonox/sound/SoundBuffer.cc

@@ -30 +30 @@
 #include "SoundBuffer.h"
 
+#if defined(ORXONOX_PLATFORM_APPLE)
+#include <ALUT/alut.h>
+#else
 #include <AL/alut.h>
+#endif
 #include <vorbis/vorbisfile.h>
 

code/branches/kicklib/src/orxonox/sound/SoundManager.cc

@@ -31 +31 @@
 #include "SoundManager.h"
 
+#if defined(__APPLE__)
+#include <ALUT/alut.h>
+#else
 #include <AL/alut.h>
+#endif
 #include <utility>
 #include <loki/ScopeGuard.h>
@@ -73 +77 @@
         this->bDestructorCalled_ = false;
 
+        // Clear error messages (might be problematic on some systems)
+        alGetError();
+        alutGetError();
+
         // See whether we even want to load
         bool bDisableSound_ = false;
         SetConfigValue(bDisableSound_, false);
         if (bDisableSound_)
-            ThrowException(InitialisationAborted, "Sound: Not loading at all");
-
+            ThrowException(InitialisationAborted, "Sound: Not loading at all");        
         if (!alutInitWithoutContext(NULL, NULL))
             ThrowException(InitialisationFailed, "Sound Error: ALUT initialisation failed: " << alutGetErrorString(alutGetError()));
@@ -126 +133 @@
         GameMode::setPlaysSound(true);
         Loki::ScopeGuard resetPlaysSoundGuard = Loki::MakeGuard(&GameMode::setPlaysSound, false);
-
+        
         // Get some information about the sound
         if (const char* version = alGetString(AL_VERSION))
-            COUT(4) << "Sound: --- OpenAL Version: " << version << std::endl;
+            COUT(4) << "Sound: --- OpenAL Version: " << version << std::endl;            
         if (const char* vendor = alGetString(AL_VENDOR))
             COUT(4) << "Sound: --- OpenAL Vendor : " << vendor << std::endl;

code/branches/kicklib/src/orxonox/sound/SoundStreamer.cc

@@ -27 +27 @@
 #include "SoundStreamer.h"
 
+#ifdef ORXONOX_PLATFORM_APPLE
+#include "openal/al.h"
+#else
 #include <al.h>
+#endif
+
 #include <vorbis/vorbisfile.h>
 #include "SoundManager.h"

code/branches/kicklib/src/orxonox/sound/WorldSound.cc

@@ -30 +30 @@
 #include "WorldSound.h"
 
+#if defined(__APPLE__)
+#include <ALUT/alut.h>
+#else
 #include <AL/alut.h>
+#endif
 #include "util/Math.h"
 #include "core/CoreIncludes.h"