 Michaël Lemaire
|
4a710c0977
|
Merge branch 'master' into vegetation
Conflicts:
src/interface/commandline/tests.cpp
src/render/opengl/OpenGLPart.h
src/render/opengl/OpenGLRenderer.cpp
src/render/opengl/OpenGLRenderer.h
src/render/opengl/OpenGLShaderProgram.h
src/render/opengl/OpenGLSharedState.h
src/render/software/SoftwareCanvasRenderer.h
|
2015-12-13 17:16:26 +01:00 |
|
|
Michaël Lemaire
|
7d4989b670
|
using namespace std
|
2015-12-11 00:36:50 +01:00 |
|
|
Michaël Lemaire
|
479dcb03ac
|
Added opengl resources deleting at exit (textures, arrays...)
|
2015-12-10 23:41:42 +01:00 |
|
|
Michaël Lemaire
|
9196be4c05
|
Merge branch 'master' into vegetation
Conflicts:
src/render/opengl/OpenGLShaderProgram.cpp
src/render/opengl/OpenGLShaderProgram.h
src/render/opengl/opengl_global.h
|
2015-12-08 01:28:15 +01:00 |
|
|
Michaël Lemaire
|
f242f55f81
|
Switched OpenGL to core profile
|
2015-12-07 23:32:55 +01:00 |
|
|
Michaël Lemaire
|
c7e868ef11
|
Better OpenGL error checking + opengl header refactoring
|
2015-12-03 23:04:50 +01:00 |
|
|
Michaël Lemaire
|
d2efb599d9
|
Made the vegetation impostors face the camera
|
2015-11-29 19:18:36 +01:00 |
|
|
Michaël Lemaire
|
9d7a7a0ff7
|
Added vegetation impostors to OpenGL renderer
This is currently an unoptimized and broken version, to be improved
|
2015-11-25 23:15:58 +01:00 |
|
|
Michaël Lemaire
|
5e9b37d52c
|
Fixed small memory leaks and uninitialized values
|
2015-11-24 00:58:09 +01:00 |
|
|
Michaël Lemaire
|
88d2a78b70
|
Enforced coding style using clang-format
|
2015-11-09 22:30:46 +01:00 |
|
|
Michaël Lemaire
|
c52eeac71d
|
[WIP] Added the simplex sampler to opengl water shader
|
2014-01-05 20:37:51 +01:00 |
|
|
Michaël Lemaire
|
992089f0ef
|
Added textures to OpenGLSharedState
|
2013-12-22 18:05:11 +01:00 |
|
|
Michaël Lemaire
|
645bada91b
|
Added camera to OpenGLSharedState
|
2013-12-22 17:30:48 +01:00 |
|
|
Michaël Lemaire
|
666420bbb2
|
New OpenGLSharedState class to manage shader variables
|
2013-12-22 15:04:33 +01:00 |
|