Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 102846 Details for
Bug 138093
dev-games/ogre ~amd64 keyword request
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
files/cegui-0.5.0.patch
cegui-0.5.0.patch (text/plain), 3.70 KB, created by
Sergey Belyashov
on 2006-11-27 07:53:50 UTC
(
hide
)
Description:
files/cegui-0.5.0.patch
Filename:
MIME Type:
Creator:
Sergey Belyashov
Created:
2006-11-27 07:53:50 UTC
Size:
3.70 KB
patch
obsolete
>diff -ruN ogrenew.orig/Samples/Common/bin/resources.cfg ogrenew/Samples/Common/bin/resources.cfg >--- ogrenew.orig/Samples/Common/bin/resources.cfg 2006-11-27 18:13:44.000000000 +0300 >+++ ogrenew/Samples/Common/bin/resources.cfg 2006-11-27 18:19:51.000000000 +0300 >@@ -21,3 +21,10 @@ > Zip=../../Media/packs/fresneldemo.zip > Zip=../../Media/packs/ogretestmap.zip > Zip=../../Media/packs/skybox.zip >+FileSystem=../../../Media/datafiles/configs >+FileSystem=../../../Media/datafiles/fonts >+FileSystem=../../../Media/datafiles/imagesets >+FileSystem=../../../Media/datafiles/layouts >+FileSystem=../../../Media/datafiles/looknfeel >+FileSystem=../../../Media/datafiles/lua_scripts >+FileSystem=../../../Media/datafiles/schemes >diff -ruN ogrenew.orig/Samples/Common/bin/resources.cfg.in ogrenew/Samples/Common/bin/resources.cfg.in >--- ogrenew.orig/Samples/Common/bin/resources.cfg.in 2006-11-27 18:13:44.000000000 +0300 >+++ ogrenew/Samples/Common/bin/resources.cfg.in 2006-11-27 18:20:53.000000000 +0300 >@@ -20,3 +20,10 @@ > Zip=@OGRE_MEDIADIR@/packs/fresneldemo.zip > Zip=@OGRE_MEDIADIR@/packs/ogretestmap.zip > Zip=@OGRE_MEDIADIR@/packs/skybox.zip >+FileSystem=@OGRE_MEDIADIR@/datafiles/configs >+FileSystem=@OGRE_MEDIADIR@/datafiles/fonts >+FileSystem=@OGRE_MEDIADIR@/datafiles/imagesets >+FileSystem=@OGRE_MEDIADIR@/datafiles/layouts >+FileSystem=@OGRE_MEDIADIR@/datafiles/looknfeel >+FileSystem=@OGRE_MEDIADIR@/datafiles/lua_scripts >+FileSystem=@OGRE_MEDIADIR@/datafiles/schemes >\ РконÑе Ñайла Ð½ÐµÑ Ð½Ð¾Ð²Ð¾Ð¹ ÑÑÑоки >diff -ruN ogrenew.orig/Samples/Common/CEGUIRenderer/include/OgreCEGUITexture.h ogrenew/Samples/Common/CEGUIRenderer/include/OgreCEGUITexture.h >--- ogrenew.orig/Samples/Common/CEGUIRenderer/include/OgreCEGUITexture.h 2006-11-27 18:13:44.000000000 +0300 >+++ ogrenew/Samples/Common/CEGUIRenderer/include/OgreCEGUITexture.h 2006-11-27 18:17:16.000000000 +0300 >@@ -106,7 +106,7 @@ > \return > Nothing. > */ >- virtual void loadFromMemory(const void* buffPtr, uint buffWidth, uint buffHeight); >+ virtual void loadFromMemory(const void* buffPtr, uint buffWidth, uint buffHeight, PixelFormat pixelFormat = CEGUI::Texture::PF_RGBA); > > > /*! >diff -ruN ogrenew.orig/Samples/Common/CEGUIRenderer/src/OgreCEGUITexture.cpp ogrenew/Samples/Common/CEGUIRenderer/src/OgreCEGUITexture.cpp >--- ogrenew.orig/Samples/Common/CEGUIRenderer/src/OgreCEGUITexture.cpp 2006-11-27 18:13:44.000000000 +0300 >+++ ogrenew/Samples/Common/CEGUIRenderer/src/OgreCEGUITexture.cpp 2006-11-27 18:18:44.000000000 +0300 >@@ -141,7 +141,7 @@ > } > #define byteSwap(x) _byteSwap((unsigned char*) &x,sizeof(x)) > >-void OgreCEGUITexture::loadFromMemory(const void* buffPtr, uint buffWidth, uint buffHeight) >+void OgreCEGUITexture::loadFromMemory(const void* buffPtr, uint buffWidth, uint buffHeight, PixelFormat pixelFormat) > { > using namespace Ogre; > >@@ -164,7 +164,7 @@ > #endif > > // try to create a Ogre::Texture from the input data >- d_ogre_texture = TextureManager::getSingleton().loadRawData(getUniqueName(), "General", odc, buffWidth, buffHeight, PF_A8R8G8B8, TEX_TYPE_2D, 0, 1.0f); >+ d_ogre_texture = TextureManager::getSingleton().loadRawData(getUniqueName(), "General", odc, buffWidth, buffHeight, pixelFormat == CEGUI::Texture::PF_RGB ? PF_R8G8B8 : PF_A8R8G8B8, TEX_TYPE_2D, 0, 1.0f); > > // if we got a pointer cache some details > if (!d_ogre_texture.isNull()) >diff -ruN ogrenew.orig/Samples/Makefile.am ogrenew/Samples/Makefile.am >--- ogrenew.orig/Samples/Makefile.am 2006-11-27 18:13:44.000000000 +0300 >+++ ogrenew/Samples/Makefile.am 2006-11-27 18:22:15.000000000 +0300 >@@ -3,8 +3,4 @@ > RenderToTexture Water CubeMapping Dot3Bump Smoke CelShading Fresnel Shadows \ > DynTex VolumeTex Grass DeferredShading > >-if HAVE_CEGUI >-SUBDIRS += Gui FacialAnimation OceanDemo Compositor >-endif >- >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 138093
:
90347
|
90349
|
90450
|
90505
|
90506
|
90507
|
90508
|
92933
|
92934
|
93058
|
93060
|
93073
|
93075
|
97636
|
99275
|
101973
|
101977
|
102845
|
102846
|
108276
|
108281
|
108842
|
108888
|
109451
|
109453
|
122825
|
122826