mirror of
https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1.git
synced 2026-03-20 23:13:33 +00:00
revert all code back except platform
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
|
||||
/*static*/ int Textures::textureChanges = 0;
|
||||
/*static*/ bool Textures::MIPMAP = false;
|
||||
const TextureId Textures::InvalidId = -1;
|
||||
/*static*/ const TextureId Textures::InvalidId = -1;
|
||||
|
||||
Textures::Textures( Options* options_, AppPlatform* platform_ )
|
||||
: clamp(false),
|
||||
|
||||
@@ -23,18 +23,18 @@
|
||||
/*public*/ static const int C = 2; // The Z value of the plane's normal
|
||||
/*public*/ static const int D = 3; // The distance the plane is from the origin
|
||||
|
||||
/*public*/ float** m_Frustum; // = /*new*/ float[16][16];
|
||||
/*public*/ float* proj; // = /*new*/ float[16];
|
||||
/*public*/ float* modl; // = /*new*/ float[16];
|
||||
/*public*/ float* clip; // = /*new*/ float[16];
|
||||
/*public*/ float[][] m_Frustum = /*new*/ float[16][16];
|
||||
/*public*/ float[] proj = /*new*/ float[16];
|
||||
/*public*/ float[] modl = /*new*/ float[16];
|
||||
/*public*/ float[] clip = /*new*/ float[16];
|
||||
/*
|
||||
/*public*/ FrustumData(float** mFrustum, float* proj, float* modl, float* clip)
|
||||
/*public*/ FrustumData(float[][] mFrustum, float[] proj, float[] modl, float[] clip)
|
||||
{
|
||||
m_Frustum = mFrustum;
|
||||
this->proj = proj;
|
||||
this->modl = modl;
|
||||
this->clip = clip;
|
||||
}
|
||||
}*/
|
||||
/*public*/ bool pointInFrustum(float x, float y, float z)
|
||||
{
|
||||
for (int i = 0; i < 6; i++)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "../Options.h"
|
||||
|
||||
// Android should always run OPENGL_ES
|
||||
#if defined(ANDROID) || defined(__APPLE__) || defined(PLATFORM_DESKTOP)
|
||||
#if defined(ANDROID) || defined(__APPLE__) || defined(RPI)
|
||||
#define OPENGL_ES
|
||||
#endif
|
||||
|
||||
@@ -17,9 +17,7 @@
|
||||
#import <OpenGLES/ES1/gl.height>
|
||||
#import <OpenGLES/ES1/glext.height>
|
||||
#else
|
||||
// #include <GLES/gl.h>
|
||||
#include <glad/glad.h>
|
||||
|
||||
#include <glad/glad.h>
|
||||
#if defined(ANDROID)
|
||||
#include<GLES/glext.h>
|
||||
#endif
|
||||
@@ -30,13 +28,14 @@
|
||||
#include <WinSock2.h>
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
// #include <gl/glew.h>
|
||||
// #include <gl/GL.h>
|
||||
#include <gl/glew.h>
|
||||
#include <gl/GL.h>
|
||||
|
||||
#define glFogx(a,b) glFogi(a,b)
|
||||
#define glOrthof(a,b,c,d,e,f) glOrtho(a,b,c,d,e,f)
|
||||
#endif
|
||||
|
||||
|
||||
#define GLERRDEBUG 1
|
||||
#if GLERRDEBUG
|
||||
//#define GLERR(x) if((x) != 0) { LOGI("GLError: " #x "(%d)\n", __LINE__) }
|
||||
|
||||
Reference in New Issue
Block a user