Changeset 11454

Timestamp:

Oct 15, 2017, 4:29:18 PM (7 years ago)

Author:

landauf

Message:

reverted some changes in cmake script; also inject time pulse to CeguiContext (this is recommended by the cegui documentation)

Location:

code/branches/ogre1.9

Files:

• cmake/tools/FindCEGUI.cmake (modified) (5 diffs)
• src/libraries/core/GUIManager.cc (modified) (2 diffs)

code/branches/ogre1.9/cmake/tools/FindCEGUI.cmake

@@ -32 +32 @@
 
 # Determine CEGUI's version
-#FIND_FILE(CEGUI_VERSION_FILE Version.h
-#  PATHS $ENV{CEGUIDIR}
-#  PATH_SUFFIXES include include/CEGUI include/cegui-0.8.4/CEGUI
-#)
-file(GLOB CEGUI_VERSION_FILE "/usr/include/cegui-*/CEGUI/Version.h")
-message("Found File: " ${CEGUI_VERSION_FILE})
+FIND_FILE(CEGUI_VERSION_FILE CEGUIVersion.h Version.h
+  PATHS $ENV{CEGUIDIR}
+  PATH_SUFFIXES include include/CEGUI
+)
 DETERMINE_VERSION(CEGUI ${CEGUI_VERSION_FILE})
-message("Found Version: ${CEGUI_VERSION}")
 
 # Find CEGUI headers
 COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.8" _version_0_8_compare)
-message("CEGUI Version: ${_version_0_8_compare}")
 # Version 0.8 introduced a new directory and file naming convention
 IF(_version_0_8_compare GREATER -1)
@@ -49 +45 @@
   FIND_PATH(CEGUI_INCLUDE_DIR CEGUI/CEGUI.h
     PATHS $ENV{CEGUIDIR}
-    PATH_SUFFIXES include/cegui-${CEGUI_VERSION}/
+    PATH_SUFFIXES include
   )
 ELSE()
@@ -106 +102 @@
     # For Mac OS X, tolua++ is a separate framework in the dependency package
     ${DEP_FRAMEWORK_DIR}
-    #NO_DEFAULT_PATH # Don't attempt to find tolua++ installed on the system
+  NO_DEFAULT_PATH # Don't attempt to find tolua++ installed on the system
 )
 # Find CEGUI Tolua++ libraries
@@ -122 +118 @@
 # Newer versions of CEGUI have the renderer for OGRE shipped with them
 COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.7" _version_0_7_compare TRUE)
-message("another version: ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre")
 IF(_version_0_7_compare GREATER -1)
   # Find CEGUI OGRE Renderer headers
@@ -129 +124 @@
       $ENV{CEGUIDIR}
       $ENV{CEGUIOGRERENDERERDIR}
-      ${CEGUI_INCLUDE_DIR}/CEGUI/RendererModules/Ogre
+      ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre
     PATH_SUFFIXES include include/CEGUI
   )

code/branches/ogre1.9/src/libraries/core/GUIManager.cc

@@ -482 +482 @@
         assert(guiSystem_);
         this->protectedCeguiSystemCall(std::bind(&CEGUI::System::injectTimePulse, arg::_1, time.getDeltaTime()));
+#if CEGUI_VERSION >= 0x000800
+        this->protectedCeguiContextCall(std::bind(&CEGUI::GUIContext::injectTimePulse, arg::_1, time.getDeltaTime()));
+#endif
     }
 
@@ -907 +910 @@
 #if CEGUI_VERSION >= 0x000800
         this->guiRenderer_->setDisplaySize(CEGUI::Sizef((float)newWidth, (float)newHeight));
-        this->rootWindow_->setSize(CEGUI::Size<CEGUI::UDim>(CEGUI::UDim(1, (float)newWidth), CEGUI::UDim(1, (float)newHeight)));
+        this->rootWindow_->setSize(CEGUI::USize(CEGUI::UDim(1, (float)newWidth), CEGUI::UDim(1, (float)newHeight)));
 #else
         this->guiRenderer_->setDisplaySize(CEGUI::Size((float)newWidth, (float)newHeight));