Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 138093 | Differences between
and this patch

Collapse All | Expand All

(-)ogrenew.orig/Samples/Common/bin/resources.cfg (+7 lines)
Lines 21-23 Link Here
21 
Zip=../../Media/packs/fresneldemo.zip
 21 
Zip=../../Media/packs/fresneldemo.zip
22 
Zip=../../Media/packs/ogretestmap.zip
 22 
Zip=../../Media/packs/ogretestmap.zip
23 
Zip=../../Media/packs/skybox.zip
 23 
Zip=../../Media/packs/skybox.zip
24 
FileSystem=../../../Media/datafiles/configs
25 
FileSystem=../../../Media/datafiles/fonts
26 
FileSystem=../../../Media/datafiles/imagesets
27 
FileSystem=../../../Media/datafiles/layouts
28 
FileSystem=../../../Media/datafiles/looknfeel
29 
FileSystem=../../../Media/datafiles/lua_scripts
30 
FileSystem=../../../Media/datafiles/schemes
(-)ogrenew.orig/Samples/Common/bin/resources.cfg.in (+7 lines)
Lines 20-22 Link Here
20 
Zip=@OGRE_MEDIADIR@/packs/fresneldemo.zip
 20 
Zip=@OGRE_MEDIADIR@/packs/fresneldemo.zip
21 
Zip=@OGRE_MEDIADIR@/packs/ogretestmap.zip
 21 
Zip=@OGRE_MEDIADIR@/packs/ogretestmap.zip
22 
Zip=@OGRE_MEDIADIR@/packs/skybox.zip
 22 
Zip=@OGRE_MEDIADIR@/packs/skybox.zip
23 
FileSystem=@OGRE_MEDIADIR@/datafiles/configs
24 
FileSystem=@OGRE_MEDIADIR@/datafiles/fonts
25 
FileSystem=@OGRE_MEDIADIR@/datafiles/imagesets
26 
FileSystem=@OGRE_MEDIADIR@/datafiles/layouts
27 
FileSystem=@OGRE_MEDIADIR@/datafiles/looknfeel
28 
FileSystem=@OGRE_MEDIADIR@/datafiles/lua_scripts
29 
FileSystem=@OGRE_MEDIADIR@/datafiles/schemes
(-)ogrenew.orig/Samples/Common/CEGUIRenderer/include/OgreCEGUITexture.h (-1 / +1 lines)
Lines 106-112 Link Here
106 
	\return
 106 
	\return
107 
		Nothing.
 107 
		Nothing.
108 
	*/
 108 
	*/
109 
	virtual void	loadFromMemory(const void* buffPtr, uint buffWidth, uint buffHeight);
 109 
	virtual void	loadFromMemory(const void* buffPtr, uint buffWidth, uint buffHeight, PixelFormat pixelFormat = CEGUI::Texture::PF_RGBA);
110 

          110
          

        

        

          111
          

          111
          

        

        

          112
          
	/*!

          112
          
	/*!

        



(-)ogrenew.orig/Samples/Common/CEGUIRenderer/src/OgreCEGUITexture.cpp
      (-2 / +2 lines)




  

    
      
            Lines 141-147
          
      
      
        Link Here
      
    
  

        

          141
          
}

          141
          
}

        

        

          142
          
#define byteSwap(x) _byteSwap((unsigned char*) &x,sizeof(x))

          142
          
#define byteSwap(x) _byteSwap((unsigned char*) &x,sizeof(x))

        

        

          143
          

          143
          

        

          
            

              144
              
void OgreCEGUITexture::loadFromMemory(const void* buffPtr, uint buffWidth, uint buffHeight)


              144
              
void OgreCEGUITexture::loadFromMemory(const void* buffPtr, uint buffWidth, uint buffHeight, PixelFormat pixelFormat)

            

        

          145
          
{

          145
          
{

        

        

          146
          
	using namespace Ogre;

          146
          
	using namespace Ogre;

        

        

          147
          

          147
          

        

  

    
      
            Lines 164-170
          
      
      
        Link Here
      
    
  

        

          164
          
#endif

          164
          
#endif

        

        

          165
          

          165
          

        

        

          166
          
	// try to create a Ogre::Texture from the input data

          166
          
	// try to create a Ogre::Texture from the input data

        

          
            

              167
              
	d_ogre_texture = TextureManager::getSingleton().loadRawData(getUniqueName(), "General", odc, buffWidth, buffHeight, PF_A8R8G8B8, TEX_TYPE_2D, 0, 1.0f);


              167
              
	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);

            

        

          168
          

          168
          

        

        

          169
          
	// if we got a pointer cache some details

          169
          
	// if we got a pointer cache some details

        

        

          170
          
	if (!d_ogre_texture.isNull())

          170
          
	if (!d_ogre_texture.isNull())

        



(-)ogrenew.orig/Samples/Makefile.am
      (-3 lines)




  

    
      
            Lines 3-10
          
      
      
        Link Here
      
    
  

        

          3
          
RenderToTexture Water CubeMapping Dot3Bump Smoke CelShading Fresnel Shadows \

          3
          
RenderToTexture Water CubeMapping Dot3Bump Smoke CelShading Fresnel Shadows \

        

        

          4
          
DynTex VolumeTex Grass DeferredShading

          4
          
DynTex VolumeTex Grass DeferredShading

        

        

          5
          

          5
          

        

            

              6
              
if HAVE_CEGUI

              
              
            

            

              7
              
SUBDIRS += Gui FacialAnimation OceanDemo Compositor

            

            

              8
              
endif

            

        

          9
          

          6
          

        






  

  Return to bug 138093