Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11454 for code


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ogre1.9/cmake/tools/FindCEGUI.cmake

    r11211 r11454  
    3232
    3333# Determine CEGUI's version
    34 #FIND_FILE(CEGUI_VERSION_FILE Version.h
    35 #  PATHS $ENV{CEGUIDIR}
    36 #  PATH_SUFFIXES include include/CEGUI include/cegui-0.8.4/CEGUI
    37 #)
    38 file(GLOB CEGUI_VERSION_FILE "/usr/include/cegui-*/CEGUI/Version.h")
    39 message("Found File: " ${CEGUI_VERSION_FILE})
     34FIND_FILE(CEGUI_VERSION_FILE CEGUIVersion.h Version.h
     35  PATHS $ENV{CEGUIDIR}
     36  PATH_SUFFIXES include include/CEGUI
     37)
    4038DETERMINE_VERSION(CEGUI ${CEGUI_VERSION_FILE})
    41 message("Found Version: ${CEGUI_VERSION}")
    4239
    4340# Find CEGUI headers
    4441COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.8" _version_0_8_compare)
    45 message("CEGUI Version: ${_version_0_8_compare}")
    4642# Version 0.8 introduced a new directory and file naming convention
    4743IF(_version_0_8_compare GREATER -1)
     
    4945  FIND_PATH(CEGUI_INCLUDE_DIR CEGUI/CEGUI.h
    5046    PATHS $ENV{CEGUIDIR}
    51     PATH_SUFFIXES include/cegui-${CEGUI_VERSION}/
     47    PATH_SUFFIXES include
    5248  )
    5349ELSE()
     
    106102    # For Mac OS X, tolua++ is a separate framework in the dependency package
    107103    ${DEP_FRAMEWORK_DIR}
    108     #NO_DEFAULT_PATH # Don't attempt to find tolua++ installed on the system
     104  NO_DEFAULT_PATH # Don't attempt to find tolua++ installed on the system
    109105)
    110106# Find CEGUI Tolua++ libraries
     
    122118# Newer versions of CEGUI have the renderer for OGRE shipped with them
    123119COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.7" _version_0_7_compare TRUE)
    124 message("another version: ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre")
    125120IF(_version_0_7_compare GREATER -1)
    126121  # Find CEGUI OGRE Renderer headers
     
    129124      $ENV{CEGUIDIR}
    130125      $ENV{CEGUIOGRERENDERERDIR}
    131       ${CEGUI_INCLUDE_DIR}/CEGUI/RendererModules/Ogre
     126      ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre
    132127    PATH_SUFFIXES include include/CEGUI
    133128  )
  • code/branches/ogre1.9/src/libraries/core/GUIManager.cc

    r11453 r11454  
    482482        assert(guiSystem_);
    483483        this->protectedCeguiSystemCall(std::bind(&CEGUI::System::injectTimePulse, arg::_1, time.getDeltaTime()));
     484#if CEGUI_VERSION >= 0x000800
     485        this->protectedCeguiContextCall(std::bind(&CEGUI::GUIContext::injectTimePulse, arg::_1, time.getDeltaTime()));
     486#endif
    484487    }
    485488
     
    907910#if CEGUI_VERSION >= 0x000800
    908911        this->guiRenderer_->setDisplaySize(CEGUI::Sizef((float)newWidth, (float)newHeight));
    909         this->rootWindow_->setSize(CEGUI::Size<CEGUI::UDim>(CEGUI::UDim(1, (float)newWidth), CEGUI::UDim(1, (float)newHeight)));
     912        this->rootWindow_->setSize(CEGUI::USize(CEGUI::UDim(1, (float)newWidth), CEGUI::UDim(1, (float)newHeight)));
    910913#else
    911914        this->guiRenderer_->setDisplaySize(CEGUI::Size((float)newWidth, (float)newHeight));
Note: See TracChangeset for help on using the changeset viewer.