 Michaël Lemaire
|
c1d6a3261c
|
Removed global string include in system_global.h
|
2015-12-30 00:43:35 +01:00 |
|
|
Michaël Lemaire
|
c5d73f96a2
|
Small source code improvements
|
2015-12-16 00:31:07 +01:00 |
|
|
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
|
9cece93ec1
|
Refactored opengl parts
|
2015-12-11 01:12:55 +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
|
e346f07c22
|
Merge branch 'master' into vegetation
Conflicts:
src/render/opengl/OpenGLRenderer.cpp
src/render/opengl/OpenGLRenderer.h
src/render/opengl/OpenGLShaderProgram.cpp
src/render/opengl/OpenGLShaderProgram.h
src/render/opengl/OpenGLSharedState.cpp
|
2015-12-04 00:04:07 +01:00 |
|
|
Michaël Lemaire
|
c7e868ef11
|
Better OpenGL error checking + opengl header refactoring
|
2015-12-03 23:04:50 +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
|
6166031c8b
|
Speeded up compile time
Reworked *_global.h heavy inclusions
|
2015-11-18 19:37:00 +01:00 |
|
|
Michaël Lemaire
|
88d2a78b70
|
Enforced coding style using clang-format
|
2015-11-09 22:30:46 +01:00 |
|
|
Michaël Lemaire
|
f97823604e
|
Introduced VertexArray object to handle terrain vertex data
This will be used later with opengl vertex arrays
|
2013-12-23 17:24:05 +01:00 |
|
|
Michaël Lemaire
|
ac5c0fd584
|
Refactored opengl terrain rendering for future use of shaders
|
2013-12-23 14:09:52 +01:00 |
|
|
Michaël Lemaire
|
8098482d50
|
Retrograded to OpenGL 3.0 functions
|
2013-12-23 10:26:29 +01:00 |
|
|
Michaël Lemaire
|
666420bbb2
|
New OpenGLSharedState class to manage shader variables
|
2013-12-22 15:04:33 +01:00 |
|
|
Michaël Lemaire
|
3696adc90b
|
Use opengl shaders for water rendering
|
2013-12-22 00:41:19 +01:00 |
|
|
Michaël Lemaire
|
7b790d2015
|
Switched opengl skybox to shaders
|
2013-12-21 23:48:54 +01:00 |
|
|
Michaël Lemaire
|
c1fd52b0db
|
Ensure camera is above ground and water
|
2013-11-14 21:05:12 +01:00 |
|
|
Michaël Lemaire
|
d9f2f3878f
|
Big WIP refactoring (preview + atmosphere renderer)
|
2013-11-12 21:34:35 +01:00 |
|
|
Michaël Lemaire
|
cf75e86be6
|
Extracted opengl "explorer" in render/opengl library
|
2013-11-05 11:45:26 +01:00 |
|