Commit graph

895 commits

Author SHA1 Message Date
8ff83d48e7 OpenGLTerrain does not use Qt containers anymore 2015-12-13 19:06:27 +01:00
5d24edad32 Merge branch 'vegetation' 2015-12-13 17:48:26 +01:00
1d9d24b958 vegetation: Fixed segfault in unit test 2015-12-13 17:47:22 +01:00
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
b54bd65df9 Added DefinitionWatcher.startWatching 2015-12-11 01:39:47 +01:00
9cece93ec1 Refactored opengl parts 2015-12-11 01:12:55 +01:00
7d4989b670 using namespace std 2015-12-11 00:36:50 +01:00
479dcb03ac Added opengl resources deleting at exit (textures, arrays...) 2015-12-10 23:41:42 +01:00
5123d4a150 Merge branch 'master' into vegetation 2015-12-10 20:22:32 +01:00
bc9db69564 New travis configuration 2015-12-10 20:13:53 +01:00
e286b194e5 Updating travis toolchain to g++ 4.9 (for c++-14 standard) 2015-12-10 19:54:52 +01:00
c5950f810f Merge branch 'master' into vegetation
Conflicts:
	src/definition/Scenery.cpp
	src/interface/commandline/tests.cpp
2015-12-10 19:48:42 +01:00
2d6c0f34c3 Using c++ random generators instead of cstdlib one 2015-12-10 19:40:39 +01:00
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