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
Michaël Lemaire
273585dd8a
Fixed tool camera not reverting back to previous camera mode
2015-09-21 23:17:47 +02:00
Michaël Lemaire
8a9c3d4b83
Added /atmosphere/sun_radius property
...
Also added the tool camera mode to focus on the sun while altering its radius
2015-09-21 23:12:43 +02:00
Michaël Lemaire
aacb4addd5
Optimized texture rendering
...
Texture layers fully masked by another are not shaded anymore
2015-09-21 00:42:58 +02:00
Michaël Lemaire
4fb7078815
Added rendered picture saving ui
2015-09-15 01:26:05 +02:00
Michaël Lemaire
20c03f84b7
Added an initial loading screen
2015-09-14 19:25:54 +02:00
Michaël Lemaire
84cb69e127
Added cancel button on render dialog
2015-09-14 01:35:25 +02:00
Michaël Lemaire
005c24fa85
Tweaked window and render sizes to keep full hd ratio
...
Also added medium render size
2015-09-14 00:48:55 +02:00
Michaël Lemaire
0c8a88cddb
Added render time
2015-09-13 22:38:44 +02:00
Michaël Lemaire
cd7eb2f669
Refactored clouds rendering quality factor
2015-09-13 18:58:11 +02:00
Michaël Lemaire
6a8fc7b102
Fixed atmosphere daytime control
...
Minute+1 button did add a wrong amount of time
2015-09-10 23:43:25 +02:00
Michaël Lemaire
8d33a11dc5
Added rasterization quality control
2015-09-10 19:33:52 +02:00
Michaël Lemaire
6a45c5dba7
Refactored quality control of terrain rendering
...
Terrain scaling factor was removed for quality consistency
2015-09-10 18:16:57 +02:00
Michaël Lemaire
4fcf1d071c
Added render tests from command line
2015-09-10 00:40:47 +02:00
Michaël Lemaire
035c957054
Fixed small UI issues
2015-09-09 00:08:01 +02:00
Michaël Lemaire
647e185e52
Added IntNode, IntPropertyBind, PanelPictureChoice and /water/model property
2015-09-08 23:52:34 +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
1361c5c654
ui: Fixed some state issues
2015-08-28 11:40:35 +02:00
Michaël Lemaire
45f10440ec
Fixed top-down camera switching
2015-08-26 00:49:52 +02:00
Michaël Lemaire
623a3606eb
Fixed UI not reverting to previous state when exiting render dialog
2015-08-26 00:28:12 +02:00
Michaël Lemaire
c450774995
Applied atmosphere humidity to opengl renderer
2015-08-25 23:33:47 +02:00
Michaël Lemaire
ffe5b38ad8
Fixed a segfault at application exit
2015-08-25 01:09:11 +02:00
Michaël Lemaire
1077e4dca3
Fixed OpenGL viewport being updated at each frame
...
That could cause ratio flickering on paint() on some devices
2015-08-24 19:38:59 +02:00
Michaël Lemaire
c199bef7f2
Added /atmosphere/humidity control
2015-08-24 01:19:19 +02:00
Michaël Lemaire
625507e11d
Fixed mouse events being processed by both controls and OpenGLView
2015-08-24 00:53:24 +02:00
Michaël Lemaire
b2a458b1f2
Refactoring of QML states
2015-08-24 00:39:31 +02:00
Michaël Lemaire
d6233c70f0
Fixed small memory leaks
2015-08-23 22:44:45 +02:00