|
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 |
|
|
a37fb2b245
|
Update README.md
|
2014-08-25 21:57:30 +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 |
|
|
4087bde594
|
Merge branch 'canvas'
|
2014-08-21 21:25:19 +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 |
|