c5aba19d52
Merge branch 'master' of github.com:OpenSpace/OpenSpace-Development into develop
2016-03-23 13:33:42 +01:00
0b3cbaa961
fix bug in multimodelgeometry loading, initializing w to 0 for all vertices
2016-03-23 11:52:29 +01:00
479644496d
fix warning in blockplaneintersectiongeometry
2016-03-22 11:12:00 +01:00
a44eed992f
Merge remote-tracking branch 'origin/feature/volumerendering' into develop
2016-03-21 18:55:32 +01:00
55660846f1
Add missing copyright statements
2016-03-21 17:04:10 +01:00
ebe10a29b5
Volume rendering compatible with abuffer and framebuffer renderers
2016-03-21 16:40:24 +01:00
5181d812cd
Update Ghoul repository
2016-03-20 23:30:54 +01:00
9406ab8722
Update Ghoul reference
2016-03-20 21:37:24 +01:00
97aa12b77b
added boost dependency to kameleon module
2016-03-18 17:09:51 -04:00
69f9e21824
New Ghoul version.
2016-03-16 11:11:50 -04:00
b09026ee42
Merge branch 'develop' into MultiModelFormatReader
2016-03-16 10:44:07 -04:00
182e332661
New Ghoul version (with Assimp library support).
2016-03-16 10:40:25 -04:00
7e34f226ba
CMake default module conf for NewHorizons.
2016-03-16 09:17:28 -04:00
f6b65ab8e0
Added entries for Windows thumbs files and Emacs backup files.
2016-03-16 09:15:31 -04:00
ae63941737
Changes in scene configuration for the new multi-geometry loader.
2016-03-16 09:13:43 -04:00
6a2460a876
Changes in scene configuration for the new multi-geometry loader.
2016-03-16 09:13:31 -04:00
725142334e
Changes in scene configuration for the new multi-geometry loader.
2016-03-16 09:13:10 -04:00
2fcb75003c
Changes in scene configuration for the new multi-geometry loader.
2016-03-16 09:12:53 -04:00
2e8b264717
Changes in scene configuration for the new multi-geometry loader.
2016-03-16 09:12:30 -04:00
994530265d
Added new scene files to the configuration file (These new files are commented by default).
2016-03-16 09:10:52 -04:00
be34d7c303
Added multimodelgeometry.* files to the project and removed wavefrontgeometry.* files from the project.
2016-03-16 09:08:47 -04:00
3a9e5e5790
Removed WavefrontGeometry class register and added the MultiModelGeometry class register.
2016-03-16 09:05:16 -04:00
7c57b870f0
Changes to accept the new multi-geometry handler, removed wavefrontgeometry header file include and identation fixes.
2016-03-16 09:03:55 -04:00
69e8a1a163
New multi-geometry model handler.
2016-03-16 08:56:18 -04:00
c3aa8fecc2
Update ghoul to account for removed boost dependency
2016-03-15 23:59:57 +01:00
fd5f26f757
Linux/Mac Launcher fix
2016-03-08 16:44:43 -05:00
ec9261e1da
fix function call to logmanager
2016-03-07 09:37:45 -05:00
df0d0d1258
Update Ghoul version to accommodate public API bool parameter changes
2016-03-06 08:08:06 +01:00
ff7f4f61db
Reverting breaking changes on Windows
2016-03-06 04:34:41 +01:00
2d6403bdac
Ghoul linux fix
2016-03-04 15:51:23 -05:00
87840bdb7f
Linux fix
2016-03-04 15:06:41 -05:00
1b8eae5157
Added texture reader and writer for SOIL in renderengine. This solves a problem when using SOIL for image reading which made the program unable to load textures.
2016-03-04 10:47:25 +01:00
dc46d81cdb
Merge branch 'develop'
2016-03-03 00:39:17 +01:00
257f90d1ec
Moving Kameleon subrepository to Github
2016-03-02 21:48:56 +01:00
e07397b755
Merge branch 'develop'
2016-02-22 21:45:57 +01:00
598409c4d1
Fix for crash from double deinitialization
2016-02-22 21:41:35 +01:00
2b7a532f57
Merge branch 'develop'
2016-02-21 14:22:14 +01:00
6653d67a3f
Update Gitignore to include data files
2016-02-21 14:12:24 +01:00
92f3707368
Use previously released kernels for New Horizons
2016-02-21 14:09:56 +01:00
1905db19ba
Add files from the previous data submodule
2016-02-21 01:52:48 +01:00
58ee7647e8
Remove data submodule in preparation for direct integration
2016-02-21 01:51:13 +01:00
7b1670ea0b
Remove startup warnings
2016-02-21 01:50:51 +01:00
60cfa1c080
Updated Ghoul version
2016-02-20 17:53:16 +01:00
c87eb5dd26
- increase fisheye resolution
...
- set correct aspect ratio of planar projection
2016-02-09 11:48:32 +01:00
73cf15beb6
- Add currentDrawBufferResolution method in WindowWrapper
...
- Base renderer resolution on draw buffer resolution instead of window res
- Obtain number of aa samples from config file, instead of hard coding to
eight samples
2016-02-09 10:46:51 +01:00
ebbbbb2dfd
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
src/rendering/renderengine.cpp
2016-02-08 15:07:38 +01:00
781ca62742
fix bugs in fisheye rendering
2016-02-08 14:33:19 +01:00
dd98cef974
Enable the RenderableShadowCylinder's color to be set via properties
2016-02-07 20:37:11 +01:00
66fdf4b6a4
Increasing required Visual Studio version to 2015
...
Moving external library handling from OpenSpace to Ghoul
2016-02-07 20:35:25 +01:00
50f1743067
Make onscreen gui not break if resolution is changed
2016-02-07 15:09:25 +01:00
Emil Axelsson