freeminer/irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrong texture type fixed. Support for emulator with MSVC added.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1728 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
hybrid 2008-11-13 00:15:58 +00:00
parent 31066c2beb
commit 50cff44069
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/Irrlicht/COGLESDriver.h
View File

@ -25,6 +25,9 @@
#include <GLES/egl.h>
#include <GLES/gl.h>
#ifdef _MSC_VER
#pragma comment(lib, "libgles_cm.lib")
#endif
namespace irr
{

2
source/Irrlicht/COGLESTexture.cpp
View File

@ -314,7 +314,7 @@ const core::dimension2d<s32>& COGLES1Texture::getSize() const
//! returns driver type of texture, i.e. the driver, which created the texture
E_DRIVER_TYPE COGLES1Texture::getDriverType() const
{
return EDT_OPENGL;
return EDT_OGLES1;
}

44
source/Irrlicht/Irrlicht9.0.vcproj
View File

@ -752,11 +752,11 @@
>
</File>
<File
RelativePath="..\..\include\SSkinMeshBuffer.h"
RelativePath="..\..\include\SParticle.h"
>
</File>
<File
RelativePath="..\..\include\SParticle.h"
RelativePath="..\..\include\SSkinMeshBuffer.h"
>
</File>
<File
@ -1652,6 +1652,30 @@
>
</File>
</Filter>
<Filter
Name="OpenGL-ES1"
>
<File
RelativePath=".\COGLESDriver.cpp"
>
</File>
<File
RelativePath=".\COGLESDriver.h"
>
</File>
<File
RelativePath=".\COGLESMaterialRenderer.h"
>
</File>
<File
RelativePath=".\COGLESTexture.cpp"
>
</File>
<File
RelativePath=".\COGLESTexture.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="scene impl"
@ -2271,14 +2295,6 @@
RelativePath="CIrrMeshWriter.h"
>
</File>
<File
RelativePath="CSTLMeshWriter.cpp"
>
</File>
<File
RelativePath="CSTLMeshWriter.h"
>
</File>
<File
RelativePath="COBJMeshWriter.cpp"
>
@ -2287,6 +2303,14 @@
RelativePath="COBJMeshWriter.h"
>
</File>
<File
RelativePath="CSTLMeshWriter.cpp"
>
</File>
<File
RelativePath="CSTLMeshWriter.h"
>
</File>
</Filter>
</Filter>
<Filter