 Michaël Lemaire
|
a7b3068e9f
|
WIP on impostor instancing
|
2015-12-16 09:13:22 +01:00 |
|
|
Michaël Lemaire
|
d2b4a1ea5e
|
vegetation: Removed index variable in impostor shader
It was used for texture coordinates, but is now
precomputed in the vertex array
|
2015-12-15 00:14:06 +01:00 |
|
|
Michaël Lemaire
|
1d9d24b958
|
vegetation: Fixed segfault in unit test
|
2015-12-13 17:47:22 +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
|
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
|
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 |
|