Commit graph

174 commits

Author SHA1 Message Date
Michaël Lemaire eeeaa70e8b Fixed emphasis in docstrings 2016-01-06 19:55:49 +01:00
Michaël Lemaire 897f20b1ea Changed textures displacement to use FractalNoise 2016-01-06 01:46:25 +01:00
Michaël Lemaire 252d7e7b87 Added test for noise compositing 2016-01-06 00:47:45 +01:00
Michaël Lemaire 02a026116d Fixed noise scaling in opengl 2016-01-04 20:26:40 +01:00
Michaël Lemaire 4347d7f454 Removed unused definition members 2015-12-31 01:29:59 +01:00
Michaël Lemaire 92ec8bf9b3 Fixed camera mode setting 2015-12-30 20:32:26 +01:00
Michaël Lemaire b574483d34 Renamed some "main" variables
they may cause compile errors on mingw
2015-12-30 20:23:24 +01:00
Michaël Lemaire e5372c61e4 Renamed Time to Timing
because Time.h would clash with standard lib time.h
on case insensitive file systems
2015-12-30 20:20:27 +01:00
Michaël Lemaire 958fd0121b Added camera focus on sun while moving it 2015-12-30 20:14:16 +01:00
Michaël Lemaire c99973a42b Added mouse control over sun and moon positions 2015-12-30 01:46:47 +01:00
Michaël Lemaire c1d6a3261c Removed global string include in system_global.h 2015-12-30 00:43:35 +01:00
Michaël Lemaire 61a43410db Refactored CelestialBodyDefinition, with new sun/moon widget 2015-12-30 00:20:20 +01:00
Michaël Lemaire 77ba82408d Coding style 2015-12-24 00:16:50 +01:00
Michaël Lemaire d88cb29f4c Refactored OpenGLVariable with pimpl and smart pointers 2015-12-23 23:40:19 +01:00
Michaël Lemaire 351a58f69b Fixed render tests for near frustum tessellation 2015-12-18 00:41:22 +01:00
Michaël Lemaire f2d38f7165 Fixed atmosphere model producing artifacts below ground surface 2015-12-17 19:51:40 +01:00
Michaël Lemaire 0ab1719d25 Added better render tests for atmosphere artifacts 2015-12-17 19:29:04 +01:00
Michaël Lemaire e9fcd6b2a5 Fixed int/double old-style casts 2015-12-17 01:13:20 +01:00
Michaël Lemaire 26cba26847 Do not rasterize vegetation when there is no layer 2015-12-14 22:20:28 +01:00
Michaël Lemaire a36570f5a6 Removed obsolete QML extension for QtCreator 2015-12-14 19:39:00 +01:00
Michaël Lemaire eda562f92e Fixed redo binding to Ctrl+Y 2015-12-13 22:25:46 +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 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 c5950f810f Merge branch 'master' into vegetation
Conflicts:
	src/definition/Scenery.cpp
	src/interface/commandline/tests.cpp
2015-12-10 19:48:42 +01:00
Michaël Lemaire 2d6c0f34c3 Using c++ random generators instead of cstdlib one 2015-12-10 19:40:39 +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 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 8cf2881a73 Merge branch 'master' into vegetation 2015-11-20 01:10:06 +01:00
Michaël Lemaire 2b65f1d26a Refactored layers system to work better as DefinitionNode
It now features undo/redo of layer creation and removal
2015-11-20 01:07:31 +01:00
Michaël Lemaire 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
Michaël Lemaire 88d2a78b70 Enforced coding style using clang-format 2015-11-09 22:30:46 +01:00
Michaël Lemaire 72877c4361 Tweaked vegetation rendering, and improved render tests 2015-11-09 01:07:33 +01:00
Michaël Lemaire f68bba75bb Merge branch 'master' into vegetation 2015-11-02 23:40:00 +01:00
Michaël Lemaire dc27590496 Improved estimated rendering time 2015-11-02 23:39:34 +01:00
Michaël Lemaire 2560fe2c53 Fixed holes in vegetation rendering 2015-11-02 23:00:02 +01:00
Michaël Lemaire 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
Michaël Lemaire ca7bd84308 Simplified project files + lazy init of data files 2015-10-19 01:39:22 +02:00
Michaël Lemaire cd144b886c Added TimeManager with basic wind control for videos 2015-10-15 17:52:03 +02:00
Michaël Lemaire c62cf3a0a4 Improved "near_frustum" render test 2015-10-09 00:55:36 +02:00
Michaël Lemaire 2be80bf8e2 Fixed aerial perspective being applied at wrong location in clouds
It was applied at the enter point of the walking algorithm, which
was the camera when it was inside a cloud layer.

Now it is applied at the first found segment, which is still not
optimal but better.

The bruneton model was also fixed to not produce black results for
aerial perspective exactly at the camera location.
2015-10-09 00:43:32 +02:00
Michaël Lemaire a5c36f90f0 Fixed CLI overriding daytime even when not specified 2015-10-08 23:48:19 +02:00
Michaël Lemaire 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
Michaël Lemaire 98e3128c31 Added /atmosphere/godrays/ definition node 2015-09-30 01:08:15 +02:00
Michaël Lemaire b045b731ad Added god rays manager (initial implementation) 2015-09-29 22:31:25 +02:00