Experiment (and failed) OGL-ES2

master
Chris 2011-11-20 22:33:29 +08:00
parent 1312fe9017
commit 7a5d8020f4
8 changed files with 167 additions and 17 deletions

View File

@ -31,6 +31,11 @@ namespace video
IVideoDriver* createOGLES1Driver(const SIrrlichtCreationParameters& params, IVideoDriver* createOGLES1Driver(const SIrrlichtCreationParameters& params,
video::SExposedVideoData& data, io::IFileSystem* io, video::SExposedVideoData& data, io::IFileSystem* io,
MIrrIPhoneDevice const & device); MIrrIPhoneDevice const & device);
#if defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_)
IVideoDriver* createOGLES2Driver(const SIrrlichtCreationParameters& params,
video::SExposedVideoData& data, io::IFileSystem* io,
MIrrIPhoneDevice const & device);
#endif
} }
} }
@ -125,6 +130,18 @@ void CIrrDeviceIPhone::createDriver()
#endif #endif
break; break;
case video::EDT_OGLES2:
#ifdef _IRR_COMPILE_WITH_OGLES2_
{
video::SExposedVideoData data;
VideoDriver = video::createOGLES2Driver(
CreationParams, data, FileSystem, IrrIPhoneDevice);
}
#else
os::Printer::log("No OpenGL-ES2 support compiled in.", ELL_ERROR);
#endif
break;
case video::EDT_SOFTWARE: case video::EDT_SOFTWARE:
case video::EDT_BURNINGSVIDEO: case video::EDT_BURNINGSVIDEO:
case video::EDT_DIRECT3D8: case video::EDT_DIRECT3D8:

View File

@ -18,8 +18,13 @@
#include "CImage.h" #include "CImage.h"
#include "os.h" #include "os.h"
#include <EGL/egl.h> #if defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_)
#include <GLES2/gl2.h> # include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES2/glext.h>
#else
# include <EGL/egl.h>
# include <GLES2/gl2.h>
#endif
namespace irr namespace irr
{ {
@ -36,8 +41,7 @@ namespace video
: CNullDriver(io, params.WindowSize), COGLES2ExtensionHandler(), : CNullDriver(io, params.WindowSize), COGLES2ExtensionHandler(),
CurrentRenderMode(ERM_NONE), ResetRenderStates(true), CurrentRenderMode(ERM_NONE), ResetRenderStates(true),
Transformation3DChanged(true), AntiAlias(params.AntiAlias), Transformation3DChanged(true), AntiAlias(params.AntiAlias),
RenderTargetTexture(0), CurrentRendertargetSize(0, 0), ColorFormat(ECF_R8G8B8), RenderTargetTexture(0), CurrentRendertargetSize(0, 0), ColorFormat(ECF_R8G8B8)
EglDisplay(EGL_NO_DISPLAY)
#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) #if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
, HDc(0) , HDc(0)
#elif defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_) #elif defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_)
@ -55,15 +59,18 @@ namespace video
#endif #endif
ExposedData = data; ExposedData = data;
#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) #if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
EglDisplay = EGL_NO_DISPLAY;
EglWindow = (NativeWindowType)data.OpenGLWin32.HWnd; EglWindow = (NativeWindowType)data.OpenGLWin32.HWnd;
HDc = GetDC((HWND)EglWindow); HDc = GetDC((HWND)EglWindow);
EglDisplay = eglGetDisplay((NativeDisplayType)HDc); EglDisplay = eglGetDisplay((NativeDisplayType)HDc);
#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_) #elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)
EglDisplay = EGL_NO_DISPLAY;
EglWindow = (NativeWindowType)ExposedData.OpenGLLinux.X11Window; EglWindow = (NativeWindowType)ExposedData.OpenGLLinux.X11Window;
EglDisplay = eglGetDisplay((NativeDisplayType)ExposedData.OpenGLLinux.X11Display); EglDisplay = eglGetDisplay((NativeDisplayType)ExposedData.OpenGLLinux.X11Display);
#elif defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_) #elif defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_)
Device = device; Device = device;
#endif #endif
#ifdef EGL_VERSION_1_0
if (EglDisplay == EGL_NO_DISPLAY) if (EglDisplay == EGL_NO_DISPLAY)
{ {
os::Printer::log("Getting OpenGL-ES2 display."); os::Printer::log("Getting OpenGL-ES2 display.");
@ -231,6 +238,7 @@ namespace video
// set vsync // set vsync
if (params.Vsync) if (params.Vsync)
eglSwapInterval(EglDisplay, 1); eglSwapInterval(EglDisplay, 1);
#endif
} }
@ -240,6 +248,7 @@ namespace video
deleteMaterialRenders(); deleteMaterialRenders();
deleteAllTextures(); deleteAllTextures();
#if defined(EGL_VERSION_1_0)
// HACK : the following is commented because destroying the context crashes under Linux (Thibault 04-feb-10) // HACK : the following is commented because destroying the context crashes under Linux (Thibault 04-feb-10)
/*eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); /*eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
eglDestroyContext(EglDisplay, EglContext); eglDestroyContext(EglDisplay, EglContext);
@ -249,6 +258,7 @@ namespace video
#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) #if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
if (HDc) if (HDc)
ReleaseDC((HWND)EglWindow, HDc); ReleaseDC((HWND)EglWindow, HDc);
#endif
#endif #endif
delete TwoDRenderer; delete TwoDRenderer;
@ -264,7 +274,9 @@ namespace video
Name = glGetString(GL_VERSION); Name = glGetString(GL_VERSION);
printVersion(); printVersion();
#if defined(EGL_VERSION_1_0)
os::Printer::log(eglQueryString(EglDisplay, EGL_CLIENT_APIS)); os::Printer::log(eglQueryString(EglDisplay, EGL_CLIENT_APIS));
#endif
// print renderer information // print renderer information
vendorName = glGetString(GL_VENDOR); vendorName = glGetString(GL_VENDOR);
@ -275,7 +287,9 @@ namespace video
CurrentTexture[i] = 0; CurrentTexture[i] = 0;
// load extensions // load extensions
initExtensions(this, initExtensions(this,
EglDisplay, #if defined(EGL_VERSION_1_0)
EglDisplay,
#endif
stencilBuffer); stencilBuffer);
StencilBuffer = stencilBuffer; StencilBuffer = stencilBuffer;
@ -393,6 +407,7 @@ namespace video
{ {
CNullDriver::endScene(); CNullDriver::endScene();
#if defined(EGL_VERSION_1_0)
eglSwapBuffers(EglDisplay, EglSurface); eglSwapBuffers(EglDisplay, EglSurface);
EGLint g = eglGetError(); EGLint g = eglGetError();
if (EGL_SUCCESS != g) if (EGL_SUCCESS != g)
@ -407,6 +422,7 @@ namespace video
return false; return false;
} }
return true; return true;
#endif
} }
@ -2827,6 +2843,7 @@ namespace irr
{ {
namespace video namespace video
{ {
#if !defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_)
#if defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined(_IRR_COMPILE_WITH_SDL_DEVICE_) || defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_CONSOLE_DEVICE_) #if defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined(_IRR_COMPILE_WITH_SDL_DEVICE_) || defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_CONSOLE_DEVICE_)
IVideoDriver* createOGLES2Driver(const SIrrlichtCreationParameters& params, IVideoDriver* createOGLES2Driver(const SIrrlichtCreationParameters& params,
@ -2855,6 +2872,8 @@ namespace video
} }
#endif // _IRR_COMPILE_WITH_OSX_DEVICE_ #endif // _IRR_COMPILE_WITH_OSX_DEVICE_
#endif
// ----------------------------------- // -----------------------------------
// IPHONE VERSION // IPHONE VERSION
// ----------------------------------- // -----------------------------------

View File

@ -24,7 +24,12 @@
#ifdef _IRR_COMPILE_WITH_OGLES2_ #ifdef _IRR_COMPILE_WITH_OGLES2_
#include <EGL/eglplatform.h> #if defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_)
# include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES2/glext.h>
#else
# include <EGL/eglplatform.h>
#endif
#include "CNullDriver.h" #include "CNullDriver.h"
#include "IMaterialRendererServices.h" #include "IMaterialRendererServices.h"
@ -442,10 +447,18 @@ namespace video
#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_ #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
HDC HDc; HDC HDc;
#endif #endif
#if defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_)
MIrrIPhoneDevice Device;
GLuint ViewFramebuffer;
GLuint ViewRenderbuffer;
GLuint ViewDepthRenderbuffer;
#else
NativeWindowType EglWindow; NativeWindowType EglWindow;
void* EglDisplay; void* EglDisplay;
void* EglSurface; void* EglSurface;
void* EglContext; void* EglContext;
#endif
COGLES2FixedPipelineShader* FixedPipeline; COGLES2FixedPipelineShader* FixedPipeline;
COGLES2Renderer2d* TwoDRenderer; COGLES2Renderer2d* TwoDRenderer;

View File

@ -136,12 +136,15 @@ namespace video
void COGLES2ExtensionHandler::initExtensions(COGLES2Driver* driver, void COGLES2ExtensionHandler::initExtensions(COGLES2Driver* driver,
EGLDisplay display, bool withStencil) #ifdef EGL_VERSION_1_0
EGLDisplay display,
#endif
bool withStencil)
{ {
const f32 egl_ver = core::fast_atof(reinterpret_cast<const c8*>(eglQueryString(display, EGL_VERSION))); //const f32 ogl_ver = core::fast_atof(reinterpret_cast<const c8*>(glGetString(GL_VERSION)));
EGLVersion = static_cast<u16>(core::floor32(egl_ver) * 100 + core::round32(core::fract(egl_ver) * 10.0f)); //EGLVersion = static_cast<u16>(core::floor32(ogl_ver) * 100 + core::round32(core::fract(ogl_ver) * 10.0f));
core::stringc eglExtensions = eglQueryString(display, EGL_EXTENSIONS); //core::stringc eglExtensions = eglQueryString(display, EGL_EXTENSIONS);
os::Printer::log(eglExtensions.c_str()); //os::Printer::log(eglExtensions.c_str());
const core::stringc stringVer(glGetString(GL_VERSION)); const core::stringc stringVer(glGetString(GL_VERSION));
const f32 ogl_ver = core::fast_atof(stringVer.c_str() + 10); const f32 ogl_ver = core::fast_atof(stringVer.c_str() + 10);

View File

@ -10,8 +10,13 @@
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_OGLES2_ #ifdef _IRR_COMPILE_WITH_OGLES2_
#include <EGL/egl.h> #if defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_)
#include <GLES2/gl2.h> # include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES2/glext.h>
#else
# include <EGL/eglplatform.h>
# include <GLES2/gl2.h>
#endif
// seems to be missing... // seems to be missing...
typedef char GLchar; typedef char GLchar;
#if defined(_IRR_OGLES2_USE_EXTPOINTER_) #if defined(_IRR_OGLES2_USE_EXTPOINTER_)
@ -179,7 +184,10 @@ namespace video
void dump() const; void dump() const;
void initExtensions(COGLES2Driver* driver, void initExtensions(COGLES2Driver* driver,
EGLDisplay display, bool withStencil); #ifdef EGL_VERSION_1_0
EGLDisplay display,
#endif
bool withStencil);
protected: protected:
u16 EGLVersion; u16 EGLVersion;

View File

@ -17,7 +17,12 @@
#include "EVertexAttributes.h" #include "EVertexAttributes.h"
#include "COGLES2Texture.h" #include "COGLES2Texture.h"
#if defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_)
#include <OpenGLES/ES1/gl.h>
#include <OpenGLES/ES1/glext.h>
#else
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#endif
namespace irr namespace irr
{ {

View File

@ -16,9 +16,14 @@
#include "CColorConverter.h" #include "CColorConverter.h"
#include "irrString.h" #include "irrString.h"
#include <GLES2/gl2.h> #if defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_)
#include <GLES2/gl2ext.h> # include <OpenGLES/ES2/gl.h>
#include <EGL/egl.h> # include <OpenGLES/ES2/glext.h>
#else
# include <GLES2/gl2.h>
# include <GLES2/gl2ext.h>
# include <EGL/egl.h>
#endif
namespace namespace
{ {

View File

@ -584,6 +584,24 @@
839A2EAD14779B05001E91D6 /* COGLESMaterialRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 839A2E9614779B04001E91D6 /* COGLESMaterialRenderer.h */; }; 839A2EAD14779B05001E91D6 /* COGLESMaterialRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 839A2E9614779B04001E91D6 /* COGLESMaterialRenderer.h */; };
839A2EAE14779B05001E91D6 /* COGLESExtensionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 839A2E9714779B04001E91D6 /* COGLESExtensionHandler.h */; }; 839A2EAE14779B05001E91D6 /* COGLESExtensionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 839A2E9714779B04001E91D6 /* COGLESExtensionHandler.h */; };
839A2EAF14779B05001E91D6 /* COGLESExtensionHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 839A2E9814779B04001E91D6 /* COGLESExtensionHandler.cpp */; }; 839A2EAF14779B05001E91D6 /* COGLESExtensionHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 839A2E9814779B04001E91D6 /* COGLESExtensionHandler.cpp */; };
83BED1A21479348000B51A7E /* COGLES2Driver.h in Headers */ = {isa = PBXBuildFile; fileRef = 83BED1911479348000B51A7E /* COGLES2Driver.h */; };
83BED1A31479348000B51A7E /* COGLES2ExtensionHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83BED1921479348000B51A7E /* COGLES2ExtensionHandler.cpp */; };
83BED1A41479348100B51A7E /* COGLES2ExtensionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 83BED1931479348000B51A7E /* COGLES2ExtensionHandler.h */; };
83BED1A51479348100B51A7E /* COGLES2FixedPipelineShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83BED1941479348000B51A7E /* COGLES2FixedPipelineShader.cpp */; };
83BED1A61479348100B51A7E /* COGLES2FixedPipelineShader.h in Headers */ = {isa = PBXBuildFile; fileRef = 83BED1951479348000B51A7E /* COGLES2FixedPipelineShader.h */; };
83BED1A71479348100B51A7E /* COGLES2MaterialRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 83BED1961479348000B51A7E /* COGLES2MaterialRenderer.h */; };
83BED1A81479348100B51A7E /* COGLES2NormalMapRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83BED1971479348000B51A7E /* COGLES2NormalMapRenderer.cpp */; };
83BED1A91479348100B51A7E /* COGLES2NormalMapRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 83BED1981479348000B51A7E /* COGLES2NormalMapRenderer.h */; };
83BED1AA1479348100B51A7E /* COGLES2ParallaxMapRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83BED1991479348000B51A7E /* COGLES2ParallaxMapRenderer.cpp */; };
83BED1AB1479348100B51A7E /* COGLES2ParallaxMapRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 83BED19A1479348000B51A7E /* COGLES2ParallaxMapRenderer.h */; };
83BED1AC1479348100B51A7E /* COGLES2Renderer2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83BED19B1479348000B51A7E /* COGLES2Renderer2D.cpp */; };
83BED1AD1479348100B51A7E /* COGLES2Renderer2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 83BED19C1479348000B51A7E /* COGLES2Renderer2D.h */; };
83BED1AE1479348100B51A7E /* COGLES2SLMaterialRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83BED19D1479348000B51A7E /* COGLES2SLMaterialRenderer.cpp */; };
83BED1AF1479348100B51A7E /* COGLES2SLMaterialRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 83BED19E1479348000B51A7E /* COGLES2SLMaterialRenderer.h */; };
83BED1B01479348100B51A7E /* COGLES2Texture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83BED19F1479348000B51A7E /* COGLES2Texture.cpp */; };
83BED1B11479348100B51A7E /* COGLES2Texture.h in Headers */ = {isa = PBXBuildFile; fileRef = 83BED1A01479348000B51A7E /* COGLES2Texture.h */; };
83BED1B21479348100B51A7E /* COGLES2Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 83BED1A11479348000B51A7E /* COGLES2Utils.h */; };
83BED1CF14793A0D00B51A7E /* COGLES2Driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83BED1CE14793A0D00B51A7E /* COGLES2Driver.cpp */; };
95154774133CD9DA008D792F /* aabbox3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CFA7C0A0A88742800B03626 /* aabbox3d.h */; settings = {ATTRIBUTES = (Public, ); }; }; 95154774133CD9DA008D792F /* aabbox3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CFA7C0A0A88742800B03626 /* aabbox3d.h */; settings = {ATTRIBUTES = (Public, ); }; };
95154775133CD9DA008D792F /* CMeshBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0910B9FD0D1F64B300D46B04 /* CMeshBuffer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 95154775133CD9DA008D792F /* CMeshBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0910B9FD0D1F64B300D46B04 /* CMeshBuffer.h */; settings = {ATTRIBUTES = (Public, ); }; };
95154776133CD9DA008D792F /* coreutil.h in Headers */ = {isa = PBXBuildFile; fileRef = 0910B9FE0D1F64B300D46B04 /* coreutil.h */; settings = {ATTRIBUTES = (Public, ); }; }; 95154776133CD9DA008D792F /* coreutil.h in Headers */ = {isa = PBXBuildFile; fileRef = 0910B9FE0D1F64B300D46B04 /* coreutil.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -2102,6 +2120,24 @@
839A2E9614779B04001E91D6 /* COGLESMaterialRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLESMaterialRenderer.h; sourceTree = "<group>"; }; 839A2E9614779B04001E91D6 /* COGLESMaterialRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLESMaterialRenderer.h; sourceTree = "<group>"; };
839A2E9714779B04001E91D6 /* COGLESExtensionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLESExtensionHandler.h; sourceTree = "<group>"; }; 839A2E9714779B04001E91D6 /* COGLESExtensionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLESExtensionHandler.h; sourceTree = "<group>"; };
839A2E9814779B04001E91D6 /* COGLESExtensionHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COGLESExtensionHandler.cpp; sourceTree = "<group>"; }; 839A2E9814779B04001E91D6 /* COGLESExtensionHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COGLESExtensionHandler.cpp; sourceTree = "<group>"; };
83BED1911479348000B51A7E /* COGLES2Driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLES2Driver.h; sourceTree = "<group>"; };
83BED1921479348000B51A7E /* COGLES2ExtensionHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COGLES2ExtensionHandler.cpp; sourceTree = "<group>"; };
83BED1931479348000B51A7E /* COGLES2ExtensionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLES2ExtensionHandler.h; sourceTree = "<group>"; };
83BED1941479348000B51A7E /* COGLES2FixedPipelineShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COGLES2FixedPipelineShader.cpp; sourceTree = "<group>"; };
83BED1951479348000B51A7E /* COGLES2FixedPipelineShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLES2FixedPipelineShader.h; sourceTree = "<group>"; };
83BED1961479348000B51A7E /* COGLES2MaterialRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLES2MaterialRenderer.h; sourceTree = "<group>"; };
83BED1971479348000B51A7E /* COGLES2NormalMapRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COGLES2NormalMapRenderer.cpp; sourceTree = "<group>"; };
83BED1981479348000B51A7E /* COGLES2NormalMapRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLES2NormalMapRenderer.h; sourceTree = "<group>"; };
83BED1991479348000B51A7E /* COGLES2ParallaxMapRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COGLES2ParallaxMapRenderer.cpp; sourceTree = "<group>"; };
83BED19A1479348000B51A7E /* COGLES2ParallaxMapRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLES2ParallaxMapRenderer.h; sourceTree = "<group>"; };
83BED19B1479348000B51A7E /* COGLES2Renderer2D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COGLES2Renderer2D.cpp; sourceTree = "<group>"; };
83BED19C1479348000B51A7E /* COGLES2Renderer2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLES2Renderer2D.h; sourceTree = "<group>"; };
83BED19D1479348000B51A7E /* COGLES2SLMaterialRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COGLES2SLMaterialRenderer.cpp; sourceTree = "<group>"; };
83BED19E1479348000B51A7E /* COGLES2SLMaterialRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLES2SLMaterialRenderer.h; sourceTree = "<group>"; };
83BED19F1479348000B51A7E /* COGLES2Texture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COGLES2Texture.cpp; sourceTree = "<group>"; };
83BED1A01479348000B51A7E /* COGLES2Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLES2Texture.h; sourceTree = "<group>"; };
83BED1A11479348000B51A7E /* COGLES2Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLES2Utils.h; sourceTree = "<group>"; };
83BED1CE14793A0D00B51A7E /* COGLES2Driver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COGLES2Driver.cpp; sourceTree = "<group>"; };
959726FD12C18FFC00BF73D3 /* IrrFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = IrrFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 959726FD12C18FFC00BF73D3 /* IrrFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = IrrFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
959726FE12C18FFC00BF73D3 /* IrrFramework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "IrrFramework-Info.plist"; path = "svn/irrlicht1.7/source/Irrlicht/MacOSX/IrrFramework-Info.plist"; sourceTree = SYSTEM_DEVELOPER_DIR; }; 959726FE12C18FFC00BF73D3 /* IrrFramework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "IrrFramework-Info.plist"; path = "svn/irrlicht1.7/source/Irrlicht/MacOSX/IrrFramework-Info.plist"; sourceTree = SYSTEM_DEVELOPER_DIR; };
95972B8312C19A5C00BF73D3 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 95972B8312C19A5C00BF73D3 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
@ -2903,6 +2939,7 @@
0910BA8B0D1F71D600D46B04 /* video */ = { 0910BA8B0D1F71D600D46B04 /* video */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
83BED18F1479346900B51A7E /* OpenGLES2 */,
839A2E9314779AF7001E91D6 /* OpenGLES */, 839A2E9314779AF7001E91D6 /* OpenGLES */,
0910BA8C0D1F729400D46B04 /* Burning Video */, 0910BA8C0D1F729400D46B04 /* Burning Video */,
0910BA8D0D1F72DB00D46B04 /* Direct3D8 */, 0910BA8D0D1F72DB00D46B04 /* Direct3D8 */,
@ -3719,6 +3756,31 @@
name = OpenGLES; name = OpenGLES;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
83BED18F1479346900B51A7E /* OpenGLES2 */ = {
isa = PBXGroup;
children = (
83BED1911479348000B51A7E /* COGLES2Driver.h */,
83BED1CE14793A0D00B51A7E /* COGLES2Driver.cpp */,
83BED1921479348000B51A7E /* COGLES2ExtensionHandler.cpp */,
83BED1931479348000B51A7E /* COGLES2ExtensionHandler.h */,
83BED1941479348000B51A7E /* COGLES2FixedPipelineShader.cpp */,
83BED1951479348000B51A7E /* COGLES2FixedPipelineShader.h */,
83BED1961479348000B51A7E /* COGLES2MaterialRenderer.h */,
83BED1971479348000B51A7E /* COGLES2NormalMapRenderer.cpp */,
83BED1981479348000B51A7E /* COGLES2NormalMapRenderer.h */,
83BED1991479348000B51A7E /* COGLES2ParallaxMapRenderer.cpp */,
83BED19A1479348000B51A7E /* COGLES2ParallaxMapRenderer.h */,
83BED19B1479348000B51A7E /* COGLES2Renderer2D.cpp */,
83BED19C1479348000B51A7E /* COGLES2Renderer2D.h */,
83BED19D1479348000B51A7E /* COGLES2SLMaterialRenderer.cpp */,
83BED19E1479348000B51A7E /* COGLES2SLMaterialRenderer.h */,
83BED19F1479348000B51A7E /* COGLES2Texture.cpp */,
83BED1A01479348000B51A7E /* COGLES2Texture.h */,
83BED1A11479348000B51A7E /* COGLES2Utils.h */,
);
name = OpenGLES2;
sourceTree = "<group>";
};
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */ /* Begin PBXHeadersBuildPhase section */
@ -3986,6 +4048,16 @@
839A2EAB14779B05001E91D6 /* COGLESTexture.h in Headers */, 839A2EAB14779B05001E91D6 /* COGLESTexture.h in Headers */,
839A2EAD14779B05001E91D6 /* COGLESMaterialRenderer.h in Headers */, 839A2EAD14779B05001E91D6 /* COGLESMaterialRenderer.h in Headers */,
839A2EAE14779B05001E91D6 /* COGLESExtensionHandler.h in Headers */, 839A2EAE14779B05001E91D6 /* COGLESExtensionHandler.h in Headers */,
83BED1A21479348000B51A7E /* COGLES2Driver.h in Headers */,
83BED1A41479348100B51A7E /* COGLES2ExtensionHandler.h in Headers */,
83BED1A61479348100B51A7E /* COGLES2FixedPipelineShader.h in Headers */,
83BED1A71479348100B51A7E /* COGLES2MaterialRenderer.h in Headers */,
83BED1A91479348100B51A7E /* COGLES2NormalMapRenderer.h in Headers */,
83BED1AB1479348100B51A7E /* COGLES2ParallaxMapRenderer.h in Headers */,
83BED1AD1479348100B51A7E /* COGLES2Renderer2D.h in Headers */,
83BED1AF1479348100B51A7E /* COGLES2SLMaterialRenderer.h in Headers */,
83BED1B11479348100B51A7E /* COGLES2Texture.h in Headers */,
83BED1B21479348100B51A7E /* COGLES2Utils.h in Headers */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -5404,6 +5476,14 @@
839A2E9214779A0F001E91D6 /* COGLESDriver.cpp in Sources */, 839A2E9214779A0F001E91D6 /* COGLESDriver.cpp in Sources */,
839A2EAC14779B05001E91D6 /* COGLESTexture.cpp in Sources */, 839A2EAC14779B05001E91D6 /* COGLESTexture.cpp in Sources */,
839A2EAF14779B05001E91D6 /* COGLESExtensionHandler.cpp in Sources */, 839A2EAF14779B05001E91D6 /* COGLESExtensionHandler.cpp in Sources */,
83BED1A31479348000B51A7E /* COGLES2ExtensionHandler.cpp in Sources */,
83BED1A51479348100B51A7E /* COGLES2FixedPipelineShader.cpp in Sources */,
83BED1A81479348100B51A7E /* COGLES2NormalMapRenderer.cpp in Sources */,
83BED1AA1479348100B51A7E /* COGLES2ParallaxMapRenderer.cpp in Sources */,
83BED1AC1479348100B51A7E /* COGLES2Renderer2D.cpp in Sources */,
83BED1AE1479348100B51A7E /* COGLES2SLMaterialRenderer.cpp in Sources */,
83BED1B01479348100B51A7E /* COGLES2Texture.cpp in Sources */,
83BED1CF14793A0D00B51A7E /* COGLES2Driver.cpp in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };