|
|
230fd6644e
|
Merge branch 'master' into vegetation
Conflicts:
src/basics/Color.inline.cpp
|
2015-12-09 00:40:47 +01:00 |
|
|
|
9c774f3817
|
Fixed noise shader function using deprecated "texture2D"
|
2015-12-09 00:34:56 +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 |
|
|
|
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 |
|
|
|
f242f55f81
|
Switched OpenGL to core profile
|
2015-12-07 23:32:55 +01:00 |
|
|
|
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 |
|
|
|
c7e868ef11
|
Better OpenGL error checking + opengl header refactoring
|
2015-12-03 23:04:50 +01:00 |
|
|
|
d2efb599d9
|
Made the vegetation impostors face the camera
|
2015-11-29 19:18:36 +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 |
|
|
|
ae9a54c612
|
Updated gitignore
|
2015-11-24 20:08:49 +01:00 |
|
|
|
9e3c43f510
|
Merge branch 'master' into vegetation
|
2015-11-24 00:59:28 +01:00 |
|
|
|
5e9b37d52c
|
Fixed small memory leaks and uninitialized values
|
2015-11-24 00:58:09 +01:00 |
|
|
|
01992a0019
|
Fixed vegetation definition, due to layers refactoring in master
|
2015-11-20 01:16:48 +01:00 |
|
|
|
8cf2881a73
|
Merge branch 'master' into vegetation
|
2015-11-20 01:10:06 +01:00 |
|
|
|
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 |
|
|
|
5f0b3734cf
|
Switched to C++-14
|
2015-11-20 01:04:21 +01:00 |
|
|
|
236db15fdb
|
Merge branch 'master' into vegetation
|
2015-11-18 22:22:30 +01:00 |
|
|
|
10f8f46ca6
|
Fixed CanvasPortion using the same temp files across processes
|
2015-11-18 22:22:09 +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 |
|
|
|
63a9f780ca
|
Merge branch 'master' into vegetation
|
2015-11-18 18:39:50 +01:00 |
|
|
|
65b4cd150c
|
Fixed render camera size being inconsistent between renderers
|
2015-11-18 18:39:31 +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 |
|
|
|
f990ec4032
|
Added control of perspective correction
This allows for some optimization in render tests and
improves low-quality render times
|
2015-11-10 00:34:19 +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 |
|
|
|
72877c4361
|
Tweaked vegetation rendering, and improved render tests
|
2015-11-09 01:07:33 +01:00 |
|
|
|
bdb2a3edb8
|
Merge branch 'master' into vegetation
|
2015-11-08 23:33:09 +01:00 |
|
|
|
d82fc73531
|
Small optimizations (use reference to avoid object copy)
|
2015-11-08 23:32:52 +01:00 |
|
|
|
1e12b8ac9c
|
vegetation: Now using sphere cap for leaves, to avoid flat effect
|
2015-11-04 01:08:48 +01:00 |
|
|
|
f68bba75bb
|
Merge branch 'master' into vegetation
|
2015-11-02 23:40:00 +01:00 |
|
|
|
dc27590496
|
Improved estimated rendering time
|
2015-11-02 23:39:34 +01:00 |
|
|
|
2560fe2c53
|
Fixed holes in vegetation rendering
|
2015-11-02 23:00:02 +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 |
|
|
|
cd006e1093
|
Fixed vegetation renderer being randomly enabled
|
2015-10-19 19:14:45 +02:00 |
|
|
|
030be52f6f
|
Merge branch 'master' into vegetation
Conflicts:
src/definition/definition.pro
src/render/software/software.pro
|
2015-10-19 17:40:17 +02:00 |
|
|
|
ca7bd84308
|
Simplified project files + lazy init of data files
|
2015-10-19 01:39:22 +02:00 |
|
|
|
d937bd08f6
|
vegetation: Added basic distribution algorithm
|
2015-10-19 00:30:20 +02:00 |
|
|
|
0ddec2393d
|
Merge branch 'master' into vegetation
|
2015-10-19 00:29:47 +02:00 |
|
|
|
75e32beea7
|
Added NoiseNode
|
2015-10-19 00:26:25 +02:00 |
|
|
|
48dc1a8f25
|
Refactored vegetation presence
|
2015-10-18 22:15:19 +02:00 |
|
|
|
cd7f30ecae
|
Add ability to disable vegetation rendering
It is disabled in opengl rendering for now
|
2015-10-18 17:35:42 +02:00 |
|
|
|
b430f6037e
|
First draft of vegetation layers (WIP)
|
2015-10-18 17:26:19 +02:00 |
|
|
|
52bad18d26
|
Added "backface culling" and "previous fragment" in rasterizers
Backface culling speeds up rasterization
Previous fragment will be used later by vegetation rasterizer
|
2015-10-16 00:51:46 +02:00 |
|
|
|
ac1b6a909b
|
Extracted RayCastingResult header to speed-up compiling
|
2015-10-16 00:28:07 +02:00 |
|
|
|
e81487ae08
|
Added safety offset on lighting
This avoids shadow algorithm to hit the surface it is currently checking
|
2015-10-16 00:14:54 +02:00 |
|
|
|
cafa9b4c74
|
Added missing SurfaceMaterial::copy
|
2015-10-15 20:28:05 +02:00 |
|
