Commit graph

73 commits

Author SHA1 Message Date
c1d6a3261c Removed global string include in system_global.h 2015-12-30 00:43:35 +01:00
391f1a7f41 Added FractalNoise value to OpenGLVariable 2015-12-24 01:21:12 +01:00
77ba82408d Coding style 2015-12-24 00:16:50 +01:00
d88cb29f4c Refactored OpenGLVariable with pimpl and smart pointers 2015-12-23 23:40:19 +01:00
e9fcd6b2a5 Fixed int/double old-style casts 2015-12-17 01:13:20 +01:00
b376d7f8e9 Added ColorNode 2015-12-16 01:32:25 +01:00
62a7f746ea Fixed NoiseGenerator.forceValue 2015-12-16 00:36:30 +01:00
c5d73f96a2 Small source code improvements 2015-12-16 00:31:07 +01:00
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
7d4989b670 using namespace std 2015-12-11 00:36:50 +01:00
479dcb03ac Added opengl resources deleting at exit (textures, arrays...) 2015-12-10 23:41:42 +01:00
c5950f810f Merge branch 'master' into vegetation
Conflicts:
	src/definition/Scenery.cpp
	src/interface/commandline/tests.cpp
2015-12-10 19:48:42 +01:00
2d6c0f34c3 Using c++ random generators instead of cstdlib one 2015-12-10 19:40:39 +01:00
230fd6644e Merge branch 'master' into vegetation
Conflicts:
	src/basics/Color.inline.cpp
2015-12-09 00:40:47 +01:00
1f656a6f86 Added missing export flag on classes 2015-12-09 00:34:08 +01:00
c12cd91f9b Removed header inlining of Vector3 and Color methods
This made cross-platform compiling and profiling more complicated
2015-12-09 00:32:29 +01:00
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
dd7baf6db5 Merge branch 'master' into vegetation 2015-11-18 19:41:54 +01:00
6166031c8b Speeded up compile time
Reworked *_global.h heavy inclusions
2015-11-18 19:37:00 +01:00
394ff3b0ae Format 2015-11-18 17:22:33 +01:00
e2d03642f4 Added some vegetation rendering optimizations 2015-11-10 01:12:14 +01:00
159e0f7e81 Optimized vegetation branches rendering 2015-11-10 00:15:30 +01:00
9a096ec329 Merge branch 'master' into vegetation
Conflicts:
	src/basics/Disk.cpp
	src/basics/Disk.h
	src/basics/SpaceSegment.cpp
	src/definition/DefinitionNode.cpp
	src/definition/DefinitionNode.h
	src/definition/Scenery.cpp
	src/definition/Scenery.h
	src/definition/SurfaceMaterial.cpp
	src/definition/SurfaceMaterial.h
	src/definition/TextureLayerDefinition.cpp
	src/definition/definition_global.h
	src/interface/commandline/tests.cpp
	src/render/opengl/OpenGLRenderer.cpp
	src/render/software/SoftwareCanvasRenderer.cpp
	src/render/software/SoftwareCanvasRenderer.h
	src/render/software/SoftwareRenderer.h
	src/render/software/TerrainRasterizer.cpp
	src/render/software/TerrainRasterizer.h
	src/render/software/TerrainRenderer.h
	src/render/software/software_global.h
2015-11-09 22:38:00 +01:00
88d2a78b70 Enforced coding style using clang-format 2015-11-09 22:30:46 +01:00
68945111d1 Improved vegetation rendering
- Added early check on terrain height range during iteration
- Added test render of vegetation model
- Tweaked basic tree model
2015-11-02 20:14:35 +01:00
ca7bd84308 Simplified project files + lazy init of data files 2015-10-19 01:39:22 +02:00
75e32beea7 Added NoiseNode 2015-10-19 00:26:25 +02:00
2b3ecc7e35 Added geometry primitives 2015-10-15 20:21:32 +02:00
91cd564c59 Added SpaceGridIterator for SpaceSegment 2015-10-15 20:01:08 +02:00
a91fa41f8f Added Vector3::randomInSphere
For future use in vegetation
2015-10-15 19:51:24 +02:00
3fc8b1c98f Added automatic tessellation near camera frustum culling
This allows the camera nearer the ground
and fixes holes in lower quality renders
2015-10-08 19:20:44 +02:00
b045b731ad Added god rays manager (initial implementation) 2015-09-29 22:31:25 +02:00
3c351bbe5c Color, Vector3 and CanvasFragment are now PODs
This can speed up CanvasPortion initialization
2015-09-10 22:06:50 +02:00
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
6062c755b5 Fixed layers saving/loading
Global scenery save/load testing was also improved to detect these cases better
2015-08-13 19:49:16 +02:00
13904be001 Optimization: replaced some divisions by inverse multiplications 2014-08-20 16:45:45 +02:00
69fba0fc69 Fixed some unit tests issues 2014-05-20 10:39:02 +02:00
c57c5f45d4 Merge branch 'master' into water_shader 2014-05-20 09:55:44 +02:00
49564acc3c Fixed build for windows systems 2014-03-01 01:34:34 +01:00
3e72fc7bf8 Replaced NoiseGenerator by NoiseState in WaterDefinition 2014-01-21 21:51:11 +01:00
49b7055655 [WIP] Use simple normal map for opengl water 2014-01-05 21:52:09 +01:00
c52eeac71d [WIP] Added the simplex sampler to opengl water shader 2014-01-05 20:37:51 +01:00
67ae34ddbd Added NoiseState offsets to FractalNoise 2014-01-01 18:21:34 +01:00
22cf9fde51 Started the new FractalNoise implementation 2014-01-01 17:45:50 +01:00
79458da771 Fixed broken unit tests 2013-12-31 15:56:30 +01:00
e61dae6f0a Added NoiseState to maintain the noise offsets in clouds 2013-12-31 15:50:28 +01:00
742b93d3d9 Small fixes to opengl rendering 2013-12-24 15:00:32 +01:00
992089f0ef Added textures to OpenGLSharedState 2013-12-22 18:05:11 +01:00
645bada91b Added camera to OpenGLSharedState 2013-12-22 17:30:48 +01:00
7b790d2015 Switched opengl skybox to shaders 2013-12-21 23:48:54 +01:00