Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:ykoba
cegui
fix-build-ogre-13.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fix-build-ogre-13.patch of Package cegui
diff -Nur cegui-0.8.7+git20200906/cegui/include/CEGUI/RendererModules/Ogre/Renderer.h new/cegui/include/CEGUI/RendererModules/Ogre/Renderer.h --- cegui-0.8.7+git20200906/cegui/include/CEGUI/RendererModules/Ogre/Renderer.h 2022-04-06 15:47:28.064974478 +0200 +++ new/cegui/include/CEGUI/RendererModules/Ogre/Renderer.h 2022-04-06 15:47:18.832882778 +0200 @@ -64,13 +64,13 @@ class Matrix4; } -#if (CEGUI_OGRE_VERSION >= (2 << 16)) +#if (CEGUI_OGRE_VERSION >= (2 << 16)) && (CEGUI_OGRE_VERSION < (13 << 16)) // The new Ogre Compositor2 system has to be used since ViewPorts // no longer have the required functionality #define CEGUI_USE_OGRE_COMPOSITOR2 #endif -#if (CEGUI_OGRE_VERSION >= ((2 << 16) | (1 << 8) | 0)) +#if (CEGUI_OGRE_VERSION >= ((2 << 16) | (1 << 8) | 0)) && (CEGUI_OGRE_VERSION < (13 << 16)) // The HLMS has to be used since fixed pipeline is disabled #define CEGUI_USE_OGRE_HLMS #include <OgreRenderOperation.h> diff -Nur cegui-0.8.7+git20200906/cegui/src/RendererModules/Ogre/Texture.cpp new/cegui/src/RendererModules/Ogre/Texture.cpp --- cegui-0.8.7+git20200906/cegui/src/RendererModules/Ogre/Texture.cpp 2022-04-06 15:47:28.088974716 +0200 +++ new/cegui/src/RendererModules/Ogre/Texture.cpp 2022-04-06 16:16:35.132697255 +0200 @@ -31,7 +31,7 @@ #include "CEGUI/RendererModules/Ogre/ImageCodec.h" #include <OgreTextureManager.h> #include <OgreHardwarePixelBuffer.h> - +#include <sstream> // Start of CEGUI namespace section namespace CEGUI { diff -Nur cegui-0.8.7+git20200906/samples_framework/src/CEGuiOgreBaseApplication.cpp new/samples_framework/src/CEGuiOgreBaseApplication.cpp --- cegui-0.8.7+git20200906/samples_framework/src/CEGuiOgreBaseApplication.cpp 2022-04-06 15:47:28.208975908 +0200 +++ new/samples_framework/src/CEGuiOgreBaseApplication.cpp 2022-04-06 17:04:37.478685677 +0200 @@ -80,12 +80,23 @@ // Create the scene manager SceneManager* sm = d_ogreRoot-> +#if (OGRE_VERSION >= ((13 << 16))) + createSceneManager(DefaultSceneManagerFactory::FACTORY_TYPE_NAME, "SampleSceneMgr"); + + SceneNode* camNode = sm->getRootSceneNode()->createChildSceneNode(); + d_camera = sm->createCamera("SampleCam"); + camNode->setPosition(0,0,500); + camNode->lookAt(Vector3(0,0,-300), Node::TransformSpace::TS_WORLD); + d_camera->setNearClipDistance(5); + camNode->attachObject(d_camera); +#else createSceneManager(ST_GENERIC, "SampleSceneMgr"); // Create and initialise the camera d_camera = sm->createCamera("SampleCam"); d_camera->setPosition(Vector3(0,0,500)); d_camera->lookAt(Vector3(0,0,-300)); d_camera->setNearClipDistance(5); +#endif // Create a viewport covering whole window Viewport* vp = d_window->addViewport(d_camera); @@ -389,8 +400,11 @@ unsigned int width, height, depth; int left, top; - +#if (OGRE_VERSION >= (13 << 16)) + window->getMetrics(width, height, left, top); +#else window->getMetrics(width, height, depth, left, top); +#endif const OIS::MouseState& mouseState = d_mouse->getMouseState(); mouseState.width = width; mouseState.height = height;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor