Commit graph

439 commits

Author SHA1 Message Date
0579cc2c3c Added shortcut information in tooltips 2015-08-21 00:46:42 +02:00
edc60113d9 Added render buttons 2015-08-21 00:41:14 +02:00
28c9c08d74 Added water rendering toggle in opengl 2015-08-21 00:25:34 +02:00
13c8816f9e Fixed water height not resetting when creating new scene 2015-08-20 23:11:07 +02:00
f19433457e More detailed terrain tessellation in opengl renderer 2015-08-20 23:07:09 +02:00
7dd70e7bca Tweaked camera speed 2015-08-20 19:02:11 +02:00
05d0680210 Top-down camera is now set relative to render camera 2015-08-20 01:30:46 +02:00
5c90e1ef07 Improved "time of day" UI 2015-08-20 01:15:08 +02:00
bbec14d904 Fixed atmosphere saving to file 2015-08-19 22:07:44 +02:00
87acc42041 Experimental scenery generate/save/load from UI 2015-08-19 20:06:47 +02:00
3599c3aecf Fixed clouds layers being deleted in scenery by opengl renderer 2015-08-19 19:28:36 +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
fde385a51a Fixed initial textures definition 2015-08-19 18:14:15 +02:00
100ee0eec1 Fixed underwater terrain detection in opengl renderer 2015-08-19 17:22:14 +02:00
95d2f55ebf Fixed atmosphere daytime control binding 2015-08-19 01:18:16 +02:00
9d077d78f5 Added FloatPropertyBind class
This allows to easily bind a Qml property to a FloatNode,
synchronizing values both ways.
2015-08-19 01:17:49 +02:00
9a177352ba Fixed OpenGL camera management 2015-08-18 22:47:18 +02:00
56dae1e38e Don't copy scenery in the renderer 2015-08-18 22:29:18 +02:00
db0be5204f Switched /atmosphere/daytime to new definition system 2015-08-18 20:31:11 +02:00
e96fdd9721 Added pause of opengl renderer while rendering picture 2015-08-18 19:12:54 +02:00
0cf2add322 Fixed UI elements visibility and input issues 2015-08-18 18:22:16 +02:00
8fa0d8af29 Added DefinitionWatcher system
Also switched to the new definition system for /terrain/water_height
2015-08-17 22:55:30 +02:00
67bd80fba5 Fixed undo/redo system 2015-08-17 18:18:31 +02:00
5afd5ec24a Added DiffManager system, with simple undo/redo 2015-08-17 00:29:54 +02:00
1eef1ef429 Start of undo/redo system (added DefinitionDiff) 2015-08-16 23:01:56 +02:00
d78bd2553c Added unit tests for FloatNode 2015-08-14 00:22:20 +02:00
d65bc18342 Fixed compiler warnings 2015-08-13 23:59:27 +02:00
0fc10fd28b Added FloatNode and smart save/load of definition tree
Node children are now saved with their name, and if a child is not found,
it is skipped. This will allow for backward/forward compatibility of saves.
2015-08-13 23:46:50 +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
46e9e73793 Refactored logging system using iostream 2015-08-13 00:33:16 +02:00
a8ae50df94 Removed unused preview renderers 2015-08-12 22:53:54 +02:00
42d3ae4ceb Renamed BaseDefinition to DefinitionNode 2015-08-12 22:21:10 +02:00
a4edc9568b Restored progress display in CLI render 2015-08-12 22:11:26 +02:00
6f8e0c3cfd Fixed some memory issues 2015-08-12 19:29:28 +02:00
44c03e46a9 Tweaked opengl terrain tessellation to speed up rendering 2015-08-12 17:26:17 +02:00
26fb112da1 Added name to all BaseDefinition and toString representation
Also fixed deletion of children in the definition tree,
to handle dynamic and static destructor calls.
2015-08-12 17:02:27 +02:00
7d79b6f772 Added scenery save/load testing 2015-08-04 00:00:56 +02:00
0585bc4b6f Removed old QtWidget UI 2015-07-28 19:03:10 +02:00
fc15f7d9b8 Added ground texture resetting while changing time of day 2015-07-26 18:30:30 +02:00
e84698dbb3 Added shortcut to show previous render again 2015-07-23 00:28:27 +02:00
efcbeecf3e Added speed factor in camera control 2015-07-22 21:30:56 +02:00
8c2091de03 Added render progress bar 2015-07-22 19:23:22 +02:00
2de920e091 Fixed quick ui camera to stay above ground and water 2015-07-22 18:39:46 +02:00
2c877953e7 Improved basic quick ui usability 2015-07-22 18:05:24 +02:00
261eb5a674 opengl: Replaced temp lighting with sun transmission lighting 2014-11-21 11:40:47 +01:00
f7715b612e Changed some old int-bools to true booleans 2014-11-21 09:45:19 +01:00
1cc3a4d625 quick ui : Added basic camera controls 2014-09-26 17:46:39 +02:00
57b90af132 Added progressive camera change to opengl view 2014-09-18 17:38:37 +02:00
872e191fea Merge branch 'master' into quick_ui 2014-09-18 11:39:56 +02:00
553b6b2896 Improved data files locator 2014-09-18 11:39:36 +02:00
f869c2a01d Fix compile in debug mode 2014-09-18 10:09:25 +02:00
0c3a498cae Merge branch 'master' into quick_ui 2014-09-18 09:25:16 +02:00
4a01a4314a Refactored TerrainHeightMap to PaintedGrid for future reuse 2014-09-15 12:32:27 +02:00
5eed701803 Removed unused Circle system from Zone 2014-09-15 09:36:48 +02:00
06a8227de3 Added quick render to QtQuick UI 2014-09-09 17:56:52 +02:00
d0a5f19cc5 Added daytime control to QtQuick UI 2014-08-28 19:46:06 +02:00
2251db361c WIP on QtQuick toolbars 2014-08-28 10:29:12 +02:00
d909ff380f Fixed opengl drawing in qtquick window 2014-08-27 18:19:48 +02:00
3814f63ac0 Experiments on toolbars 2014-08-27 17:23:59 +02:00
0e2e0a05eb Refactored QtQuick UI to work in QtCreator 2014-08-27 15:18:08 +02:00
078bab62fc Merge branch 'master' into quick_ui
Conflicts:
	src/paysages.pro
2014-08-27 13:55:51 +02:00
6d834030f0 Use version 1.7.0 of google test 2014-08-25 21:09:42 +02:00
e1aceaaf14 Externalized googletest as a git submodule 2014-08-25 21:05:33 +02:00
818d82607e Optimized lighting of underwater terrain
The water light filter is now applied first to avoid computing
terrain shadows when no light passes through the water layer.
2014-08-22 17:34:07 +02:00
99aff57d6c Optimized output picture saving 2014-08-21 22:23:04 +02:00
0abfa97295 Merge branch 'cloud_types'
Conflicts:
	src/render/software/software.pro
2014-08-21 21:31:29 +02:00
1afcb907c4 Optimized and fixed canvas portion merging in final picture 2014-08-21 15:30:09 +02:00
04f6ab732d Normalize colors before writing to final picture 2014-08-21 14:53:49 +02:00
c39ef6adce Restored final picture saving (in constant memory usage) 2014-08-21 12:36:28 +02:00
6c4a16966c Larger maximal canvas portion size 2014-08-21 10:11:44 +02:00
0bb1cf5bed Added canvas portion writing to disk 2014-08-21 09:58:11 +02:00
13904be001 Optimization: replaced some divisions by inverse multiplications 2014-08-20 16:45:45 +02:00
14e0320848 Restored (partially) render progress 2014-08-20 15:58:37 +02:00
18a669675f Restored tone mapping control of canvas preview 2014-08-20 14:31:28 +02:00
8ef8b0386c Canvas preview widget is immediately sized (so that render dialog don't resize later) 2014-08-20 14:23:35 +02:00
0d659d2e44 WIP on quick ui prototype 2014-08-19 17:37:24 +02:00
f7d84afb79 Added primary toolbar to qt quick prototype 2014-08-19 17:01:42 +02:00
9f438a3f84 Prototype of experimental UI using Qt Quick 2014-08-19 15:49:08 +02:00
2b135eedac Removed old render_progress in SoftwareRenderer 2014-08-19 14:20:37 +02:00
1bf6d9382b Removed size information from SoftwareRenderer + removed full render tests 2014-08-19 12:22:27 +02:00
0c48fb075f Rasterizers now use their own interrupt system 2014-08-19 11:44:54 +02:00
915f43503e Removed unused ParallelQueue 2014-08-19 11:32:23 +02:00
dc3584cefc Check canvas preview coordinates to avoid segfault 2014-08-19 11:25:27 +02:00
8f24d54568 Restored render interruption 2014-08-19 09:18:55 +02:00
31b74c660e Iterate over portions to render the whole canvas 2014-08-18 17:33:15 +02:00
3a2ec1c75f Only allocate canvas portion pixels when needed
This will allow for larger renders in constant memory footprint
2014-08-18 17:16:17 +02:00
c9fa33984b Restored color profile in canvas preview 2014-08-18 16:33:09 +02:00
9c2d545e6a Fixed parallel canvas shading 2014-08-18 16:25:44 +02:00
b5ee4c432f Added parallel pixel shader for second-pass rendering 2014-08-18 16:04:46 +02:00
0566f2bdd8 Refactored ParallelWork for better performance 2014-08-18 15:20:04 +02:00
2aeecdec62 WIP on canvas pixel shading 2014-08-18 12:17:16 +02:00
fb3d32baf4 Removed old render area code in dialogrender 2014-08-16 13:41:02 +02:00
b86669c5a0 Added color to rasterized polygons 2014-08-16 13:34:55 +02:00
bc34a2b823 Removed RenderArea and added terrain rasterization to canvas 2014-06-18 22:10:46 +02:00
f94d93ae60 Fixed canvas Z-index 2014-06-18 20:10:05 +02:00
cf58bea1b7 WIP on new canvas system 2014-06-12 17:45:59 +02:00
8099361cc9 WIP on new canvas system 2014-06-10 15:13:16 +02:00
43431aae87 New Canvas software rendering structure (WIP) 2014-06-05 17:12:49 +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