Commit Graph

1680 Commits

Author SHA1 Message Date
Alexander Bock 21276f2cd8 Adding methods to add and remove scenegraphnodes from the scenegraph at runtime 2016-04-08 13:11:54 +02:00
Alexander Bock 2acb2cbd92 Updated ghoul repository
Make use of automatic conversion and swizzling of textures
2016-04-07 19:07:18 +02:00
Michael Nilsson 0d0f761d6e downloadmanager return shared_ptr to FileFutures instead of bare pointers 2016-04-05 11:33:58 -04:00
Alexander Bock e23a1f3e3c Fix compilatioon of renderablefieldlines 2016-04-04 20:26:27 +02:00
Alexander Bock 019092e98e Correctly set child nodes for SceneGraphNode%s 2016-04-04 20:26:10 +02:00
Emil Axelsson 90f3193236 Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into develop 2016-04-01 17:48:45 +02:00
Emil Axelsson 568a6a3416 fix bug when numberOfSamples is 0 2016-04-01 17:47:00 +02:00
kalbl 360877d7ff Add new version of ghoul to solve OSX compile errors. 2016-03-30 15:29:08 -04:00
kalbl 86debebdd9 Fix compilation errors for OSX. 2016-03-30 15:20:20 -04:00
Michael Nilsson 2ca5d52fa3 fix for linux 2016-03-28 11:25:04 -04:00
Michael Nilsson d7e4a8b8e9 update gitignor with pluto texture folders 2016-03-24 16:48:04 -04:00
Emil Axelsson 7b6a47973a add toyvolume example to data 2016-03-23 14:21:28 +01:00
Emil Axelsson 80fe89dbc8 change interfaces from pointer to reference 2016-03-23 14:00:40 +01:00
Emil Axelsson c5aba19d52 Merge branch 'master' of github.com:OpenSpace/OpenSpace-Development into develop 2016-03-23 13:33:42 +01:00
Emil Axelsson 0b3cbaa961 fix bug in multimodelgeometry loading, initializing w to 0 for all vertices 2016-03-23 11:52:29 +01:00
Emil Axelsson 479644496d fix warning in blockplaneintersectiongeometry 2016-03-22 11:12:00 +01:00
Emil Axelsson a44eed992f Merge remote-tracking branch 'origin/feature/volumerendering' into develop 2016-03-21 18:55:32 +01:00
Emil Axelsson 55660846f1 Add missing copyright statements 2016-03-21 17:04:10 +01:00
Emil Axelsson ebe10a29b5 Volume rendering compatible with abuffer and framebuffer renderers 2016-03-21 16:40:24 +01:00
Alexander Bock 5181d812cd Update Ghoul repository 2016-03-20 23:30:54 +01:00
Alexander Bock 9406ab8722 Update Ghoul reference 2016-03-20 21:37:24 +01:00
Michael Nilsson 97aa12b77b added boost dependency to kameleon module 2016-03-18 17:09:51 -04:00
Jonathas Costa 69f9e21824 New Ghoul version. 2016-03-16 11:11:50 -04:00
Jonathas Costa b09026ee42 Merge branch 'develop' into MultiModelFormatReader 2016-03-16 10:44:07 -04:00
Jonathas Costa 182e332661 New Ghoul version (with Assimp library support). 2016-03-16 10:40:25 -04:00
Jonathas Costa 7e34f226ba CMake default module conf for NewHorizons. 2016-03-16 09:17:28 -04:00
Jonathas Costa f6b65ab8e0 Added entries for Windows thumbs files and Emacs backup files. 2016-03-16 09:15:31 -04:00
Jonathas Costa ae63941737 Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:13:43 -04:00
Jonathas Costa 6a2460a876 Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:13:31 -04:00
Jonathas Costa 725142334e Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:13:10 -04:00
Jonathas Costa 2fcb75003c Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:12:53 -04:00
Jonathas Costa 2e8b264717 Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:12:30 -04:00
Jonathas Costa 994530265d Added new scene files to the configuration file (These new files are commented by default). 2016-03-16 09:10:52 -04:00
Jonathas Costa be34d7c303 Added multimodelgeometry.* files to the project and removed wavefrontgeometry.* files from the project. 2016-03-16 09:08:47 -04:00
Jonathas Costa 3a9e5e5790 Removed WavefrontGeometry class register and added the MultiModelGeometry class register. 2016-03-16 09:05:16 -04:00
Jonathas Costa 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
Jonathas Costa 69e8a1a163 New multi-geometry model handler. 2016-03-16 08:56:18 -04:00
Alexander Bock c3aa8fecc2 Update ghoul to account for removed boost dependency 2016-03-15 23:59:57 +01:00
Sebastian Piwell fd5f26f757 Linux/Mac Launcher fix 2016-03-08 16:44:43 -05:00
Michael Nilsson ec9261e1da fix function call to logmanager 2016-03-07 09:37:45 -05:00
Alexander Bock df0d0d1258 Update Ghoul version to accommodate public API bool parameter changes 2016-03-06 08:08:06 +01:00
Alexander Bock ff7f4f61db Reverting breaking changes on Windows 2016-03-06 04:34:41 +01:00
piwell 2d6403bdac Ghoul linux fix 2016-03-04 15:51:23 -05:00
piwell 87840bdb7f Linux fix 2016-03-04 15:06:41 -05:00
kalbl 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
Alexander Bock dc46d81cdb Merge branch 'develop' releases/v0.3.1 2016-03-03 00:39:17 +01:00
Alexander Bock 257f90d1ec Moving Kameleon subrepository to Github 2016-03-02 21:48:56 +01:00
Alexander Bock e07397b755 Merge branch 'develop' 2016-02-22 21:45:57 +01:00
Alexander Bock 598409c4d1 Fix for crash from double deinitialization 2016-02-22 21:41:35 +01:00
Alexander Bock 2b7a532f57 Merge branch 'develop' 2016-02-21 14:22:14 +01:00