/SleekThink.depend
76186,10 → 76186,7
<string.h>
<fstream>
 
1421890101 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/define.h
<opengl/GLee.h>
<opengl/GLTool.h>
<iostream>
1422762107 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/define.h
 
1419819419 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/texture/texture.h
<iosfwd>
77603,13 → 77600,13
"../sleek/start.h"
"../sleek/driver/mesh.h"
 
1422752144 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/app/GameEngine.cpp
1422762252 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/app/GameEngine.cpp
"GameCore.h"
"GameEngine.h"
"light.h"
"../sleek/loader/texture_loader.h"
 
1420770021 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/app/light.h
1422762241 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/app/light.h
 
1422752130 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/app/GameMenu.cpp
"GameCore.h"
77624,7 → 77621,7
"texture.h"
"../core/math/aabbox.h"
 
1422752197 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/app/main.cpp
1422753941 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/app/main.cpp
"../sleek/device/splash.h"
"../sleek/loader/texture_loader.h"
"GameCore.h"
79441,7 → 79438,7
 
1324743734 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/node/camera/freefly.cpp
 
1420905154 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/node/camera/frustum.cpp
1422762497 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/node/camera/frustum.cpp
"frustum.h"
<math.h>
 
79980,7 → 79977,7
"format/txt.h"
"format/x.h"
 
1421726532 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/node/engine.h
1422762525 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/node/engine.h
"../device/device.h"
"../driver/fbo.h"
"billboard/billboard.h"
80917,7 → 80914,7
"cursor.h"
"../driver/fbo.h"
 
1422752653 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/mesh_3ds.cpp
1422753113 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/mesh_3ds.cpp
"mesh_3ds.h"
"../driver/mesh.h"
"../compile.h"
80934,7 → 80931,7
"../mesh/mesh.h"
"../compile.h"
 
1422752829 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/mesh_txt.cpp
1422753113 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/mesh_txt.cpp
"mesh_txt.h"
"../library/glm/detail/func_geometric.hpp"
"../driver/mesh.h"
80944,7 → 80941,7
"../mesh/mesh.h"
"../compile.h"
 
1422752816 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/texture_bmp.cpp
1422753113 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/texture_bmp.cpp
"texture_bmp.h"
"../driver/texture.h"
"../compile.h"
80954,7 → 80951,7
"../driver/texture.h"
"../driver/texture.h"
 
1422752822 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/texture_png.cpp
1422753113 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/texture_png.cpp
"texture_png.h"
"../driver/texture.h"
"../compile.h"
81213,7 → 81210,7
"ogl_texture.h"
"ogl_vbo.h"
 
1421726113 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/context.h
1422762232 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/context.h
"../compile.h"
"../device/device_stub.h"
"../math/aabbox.h"
81223,8 → 81220,6
"texture.h"
"texture_array.h"
"texture3d.h"
<GL/glx.h>
<windows.h>
 
1420904887 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/math/pixel.cpp
"pixel.h"
81259,7 → 81254,7
1422751507 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/texture_tiff.h
"texture_loader.h"
 
1422752806 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/texture_tiff.cpp
1422753113 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/texture_tiff.cpp
"texture_tiff.h"
"../driver/texture.h"
"../compile.h"
81375,7 → 81370,7
<memory.h>
<GL/gl.h>
 
1421727473 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/node/engine.cpp
1422762537 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/node/engine.cpp
"engine.h"
<algorithm>
 
81501,7 → 81496,8
 
1420577544 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/identifier.cpp
 
1420900435 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_context.h
1422762183 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_context.h
"ogl.h"
"../context.h"
 
1420936740 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_driver.cpp
81509,13 → 81505,15
"ogl_context.h"
"ogl_driver.h"
 
1420768757 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_driver.h
1422762373 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_driver.h
"ogl.h"
"../driver.h"
 
1420843507 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_fbo.cpp
"ogl_fbo.h"
 
1420843080 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_fbo.h
1422762373 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_fbo.h
"ogl.h"
"../fbo.h"
 
1420905888 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_context.cpp
81528,10 → 81526,12
"ogl_vbo.h"
"ogl_shader.h"
 
1420836150 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_texture.h
1422762373 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_texture.h
"ogl.h"
"../context.h"
 
1420837115 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_vbo.h
1422762373 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_vbo.h
"ogl.h"
"../context.h"
 
1420836570 source:/mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_texture.cpp
81550,7 → 81550,8
<stdlib.h>
<string.h>
 
1420841998 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_shader.h
1422762373 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl_shader.h
"ogl.h"
"../shader.h"
 
1420774213 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/math/fps_counter.h
81677,3 → 81678,9
1422752729 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/loader/mesh_txt.h
"mesh_loader.h"
 
1422762335 /mnt/windows1/Development/Project/Xtrem-Coder/Sleek Think/src/sleek/driver/ogl3/ogl.h
<opengl/GLee.h>
<opengl/GLTool.h>
<GL/glx.h>
<windows.h>
 
/bin/SleekThink
Cannot display: file marked as a binary type.
svn:mime-type = application/x-executable
/src/app/GameEngine.cpp
126,8 → 126,8
// if(a->key[KEY_KEY_A]) smgr->enableThread(engine::etf_all);
// if(a->key[KEY_KEY_Z]) smgr->disableThread(engine::etf_all);
//! wireframe view, disable and enable
if(a->key[KEY_KEY_W]) glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
if(a->key[KEY_KEY_X]) glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
// if(a->key[KEY_KEY_W]) glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
// if(a->key[KEY_KEY_X]) glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
//! vertex buffer object, disable and enable
if(a->key[KEY_KEY_Q])
{
/src/app/light.h
1,25 → 1,25
 
inline void light_test() noexcept
{
GLfloat lightZeroPosition[] = {5.0f, 0.0f, -15.0f, 1.0f};
GLfloat lightOnePosition[] = {-10.0f, 0.0f, -10.0f, 0.0f};
GLfloat lightZeroColor[] = {1.f, 1.0f, 1.f, 1.0f};
GLfloat lightOneColor[] = {1.f, 1.f, 1.f, 1.0f};
 
glLightfv(GL_LIGHT0, GL_POSITION, lightZeroPosition);
glLightfv(GL_LIGHT0, GL_DIFFUSE, lightZeroColor);
glLightfv(GL_LIGHT0, GL_SPECULAR, lightZeroColor);
glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.01f);
glLightfv(GL_LIGHT1, GL_POSITION, lightOnePosition);
glLightfv(GL_LIGHT1, GL_DIFFUSE, lightOneColor);
glLightfv(GL_LIGHT1, GL_SPECULAR, lightOneColor);
glLightf(GL_LIGHT1, GL_LINEAR_ATTENUATION, 0.01f);
glEnable(GL_LIGHT0);
glEnable(GL_LIGHT1);
 
GLfloat white[] = {1.0f, 1.0f, 1.0f, 1.0f};
 
glMaterialfv(GL_FRONT, GL_DIFFUSE, white);
glMaterialfv(GL_FRONT, GL_SPECULAR, white);
glMaterialf(GL_FRONT, GL_SHININESS, 80.0f);
// GLfloat lightZeroPosition[] = {5.0f, 0.0f, -15.0f, 1.0f};
// GLfloat lightOnePosition[] = {-10.0f, 0.0f, -10.0f, 0.0f};
// GLfloat lightZeroColor[] = {1.f, 1.0f, 1.f, 1.0f};
// GLfloat lightOneColor[] = {1.f, 1.f, 1.f, 1.0f};
//
// glLightfv(GL_LIGHT0, GL_POSITION, lightZeroPosition);
// glLightfv(GL_LIGHT0, GL_DIFFUSE, lightZeroColor);
// glLightfv(GL_LIGHT0, GL_SPECULAR, lightZeroColor);
// glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.01f);
// glLightfv(GL_LIGHT1, GL_POSITION, lightOnePosition);
// glLightfv(GL_LIGHT1, GL_DIFFUSE, lightOneColor);
// glLightfv(GL_LIGHT1, GL_SPECULAR, lightOneColor);
// glLightf(GL_LIGHT1, GL_LINEAR_ATTENUATION, 0.01f);
// glEnable(GL_LIGHT0);
// glEnable(GL_LIGHT1);
//
// GLfloat white[] = {1.0f, 1.0f, 1.0f, 1.0f};
//
// glMaterialfv(GL_FRONT, GL_DIFFUSE, white);
// glMaterialfv(GL_FRONT, GL_SPECULAR, white);
// glMaterialf(GL_FRONT, GL_SHININESS, 80.0f);
}
/src/sleek/define.h
1,18 → 1,6
#ifndef DEFINE
#define DEFINE
 
#define GL_GLEXT_LEGACY 1
#define GLEW_STATIC 1
#define GL3_PROTOTYPES 1
 
//#include <opengl/gl.h>
//#include <opengl/gl3.h>
#include <opengl/GLee.h>
//#include <opengl/glew.h>
 
#include <opengl/GLTool.h>
#include <iostream>
 
#if defined __linux
#define x11_device_support
// #define xf86_device_support
/src/sleek/driver/context.h
12,12 → 12,6
#include "texture_array.h"
#include "texture3d.h"
 
#if defined __linux
#include <GL/glx.h>
#elif defined WIN32 || WIN64
#include <windows.h>
#endif
 
namespace sleek
{
namespace driver
/src/sleek/driver/ogl3/ogl.h
0,0 → 1,17
#define GL_GLEXT_LEGACY 1
#define GLEW_STATIC 1
#define GL3_PROTOTYPES 1
 
//#include <opengl/gl.h>
//#include <opengl/gl3.h>
#include <opengl/GLee.h>
//#include <opengl/glew.h>
 
#include <opengl/GLTool.h>
 
 
#if defined __linux
#include <GL/glx.h>
#elif defined WIN32 || WIN64
#include <windows.h>
#endif
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: src/sleek/driver/ogl3/ogl_context.h
===================================================================
--- src/sleek/driver/ogl3/ogl_context.h (revision 5)
+++ src/sleek/driver/ogl3/ogl_context.h (revision 6)
@@ -1,6 +1,7 @@
#ifndef __OGL_CONTEXT_HEADER__
#define __OGL_CONTEXT_HEADER__
+#include "ogl.h"
#include "../context.h"
namespace sleek
/src/sleek/driver/ogl3/ogl_driver.h
1,6 → 1,7
#ifndef OGL_DRIVER
#define OGL_DRIVER
 
#include "ogl.h"
#include "../driver.h"
 
namespace sleek
/src/sleek/driver/ogl3/ogl_fbo.h
1,6 → 1,7
#ifndef OGL_FBO
#define OGL_FBO
 
#include "ogl.h"
#include "../fbo.h"
 
namespace sleek
/src/sleek/driver/ogl3/ogl_shader.h
1,6 → 1,7
#ifndef OGL_SHADER
#define OGL_SHADER
 
#include "ogl.h"
#include "../shader.h"
 
namespace sleek
/src/sleek/driver/ogl3/ogl_texture.h
1,6 → 1,7
#ifndef OGL_TEXTURE_2D
#define OGL_TEXTURE_2D
 
#include "ogl.h"
#include "../context.h"
 
namespace sleek
/src/sleek/driver/ogl3/ogl_vbo.h
1,6 → 1,7
#ifndef OGL_VBO
#define OGL_VBO
 
#include "ogl.h"
#include "../context.h"
 
namespace sleek
/src/sleek/node/camera/camera.cpp
4,6 → 4,12
#include "../../library/glm/gtc/type_ptr.hpp"
#include "camera.h"
 
/**
* TODO remove ogl include
*/
 
#include "GL/gl.h"
 
namespace sleek
{
namespace scene3d
/src/sleek/node/camera/frustum.cpp
20,9 → 20,13
float modl[16]; // This will hold our modelview matrix
float clip[16]; // This will hold the clipping planes
 
glGetFloatv( GL_PROJECTION_MATRIX, proj );
glGetFloatv( GL_MODELVIEW_MATRIX, modl );
/**
* TODO add driver get matrix
*/
 
// glGetFloatv( GL_PROJECTION_MATRIX, proj );
// glGetFloatv( GL_MODELVIEW_MATRIX, modl );
 
clip[ 0] = modl[ 0] * proj[ 0] + modl[ 1] * proj[ 4] + modl[ 2] * proj[ 8] + modl[ 3] * proj[12];
clip[ 1] = modl[ 0] * proj[ 1] + modl[ 1] * proj[ 5] + modl[ 2] * proj[ 9] + modl[ 3] * proj[13];
clip[ 2] = modl[ 0] * proj[ 2] + modl[ 1] * proj[ 6] + modl[ 2] * proj[10] + modl[ 3] * proj[14];
/src/sleek/node/engine.cpp
39,21 → 39,6
 
/* ***************************************** */
 
void engine::setFog(const f32 start, const f32 end, const f32 density, const math::pixel &color) noexcept
{
GLuint fogfilter = 0;
GLuint fogMode[] = { GL_EXP, GL_EXP2, GL_LINEAR };
const GLfloat fogColor[4]= { (float)color.getRed()/255, (float)color.getGreen()/255, (float)color.getBlue()/255, 1.0f };
 
glFogi(GL_FOG_MODE, fogMode[fogfilter]);
glFogfv(GL_FOG_COLOR, fogColor);
glFogf(GL_FOG_DENSITY, 0.35f);
glHint(GL_FOG_HINT, GL_DONT_CARE);
glFogf(GL_FOG_START, start);
glFogf(GL_FOG_END, end);
glEnable(GL_FOG);
}
 
void engine::clear() noexcept
{
while(nd.size())
64,16 → 49,14
 
void engine::render() noexcept
{
glPushMatrix();
std::sort(nd.begin(), nd.end());
cm->manage(screen->getCurrentEvent());
cm->render();
for(register u32 i = 0; i<nd.size(); ++i)
{
Node *tmp = nd[i];
tmp->render();
}
glPopMatrix();
std::sort(nd.begin(), nd.end());
cm->manage(screen->getCurrentEvent());
cm->render();
for(register u32 i = 0; i<nd.size(); ++i)
{
Node *tmp = nd[i];
tmp->render();
}
}
 
void engine::enableDebugDraw(bool a) noexcept
/src/sleek/node/engine.h
35,8 → 35,6
 
void clear() noexcept;
 
void setFog(const f32 start, const f32 end, const f32 density, const math::pixel &color) noexcept;
 
void enableDebugDraw(bool) noexcept;
bool isDebugDraw() const noexcept;