Commit graph

25 commits

Author SHA1 Message Date
Michaël Lemaire 69543f76b6 Added node watching on "container" nodes 2016-01-16 16:21:02 +01:00
Michaël Lemaire 391f1a7f41 Added FractalNoise value to OpenGLVariable 2015-12-24 01:21:12 +01:00
Michaël Lemaire e0ba87e4e5 Added mandatory logger information 2015-12-13 20:08:38 +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 b54bd65df9 Added DefinitionWatcher.startWatching 2015-12-11 01:39:47 +01:00
Michaël Lemaire 9cece93ec1 Refactored opengl parts 2015-12-11 01:12:55 +01:00
Michaël Lemaire f242f55f81 Switched OpenGL to core profile 2015-12-07 23:32:55 +01:00
Michaël Lemaire 88d2a78b70 Enforced coding style using clang-format 2015-11-09 22:30:46 +01:00
Michaël Lemaire 2b5b35e3b4 Fixed specular lighting on water not being consistent between opengl and software 2015-09-10 23:41:15 +02:00
Michaël Lemaire 982af74c2d Added /water/reflection property 2015-09-08 01:00:34 +02:00
Michaël Lemaire a96699dece Added mouse tracking on 3d view for future operations 2015-09-07 01:15:59 +02:00
Michaël Lemaire 28c9c08d74 Added water rendering toggle in opengl 2015-08-21 00:25:34 +02:00
Michaël Lemaire 0058a0a8e3 Switched to RGB material colors
...to avoid otherwise unused HSL conversion, which causes problems
for some RGB values (like Color(1, 0, 0))
2015-08-19 19:14:59 +02:00
Michaël Lemaire 8fa0d8af29 Added DefinitionWatcher system
Also switched to the new definition system for /terrain/water_height
2015-08-17 22:55:30 +02:00
Michaël Lemaire 261eb5a674 opengl: Replaced temp lighting with sun transmission lighting 2014-11-21 11:40:47 +01:00
Michaël Lemaire e79692bb5d Refactored noise shader 2014-01-21 21:41:15 +01:00
Michaël Lemaire 25d9a95141 Water is now always at y=0.0 2014-01-06 20:22:00 +01:00
Michaël Lemaire 33c5d89783 Added skybox reflection to water shader 2014-01-05 22:20:15 +01:00
Michaël Lemaire 49b7055655 [WIP] Use simple normal map for opengl water 2014-01-05 21:52:09 +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 742b93d3d9 Small fixes to opengl rendering 2013-12-24 15:00:32 +01:00
Michaël Lemaire 74e707a989 Fixed water color in opengl rendering 2013-12-24 11:48:06 +01:00
Michaël Lemaire 39789aea3f Allow shaders source code to be split in several files (and thus included) 2013-12-22 18:47:24 +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