Commit Graph

144 Commits

Author SHA1 Message Date
Alexander Bock
90eac194dc Initial work on performance measuring 2014-12-09 01:41:42 +01:00
Alexander Bock
d8f7bb746a Started cleaning OpenSpaceEngine 2014-12-08 18:30:18 +01:00
Alexander Bock
ad9ba2404d Merge branch 'gui' into develop 2014-12-08 12:58:32 +01:00
Alexander Bock
e72515ab77 Update ghoul version 2014-12-08 12:50:12 +01:00
Alexander Bock
0854aa5bcb Added imgui library 2014-12-06 12:48:56 +01:00
Alexander Bock
d4072a7002 Updating Ghoul version 2014-12-06 01:30:03 +01:00
Alexander Bock
4e4de3f40e Changing the hardcoded bv-color map to a transfer function based map 2014-12-05 22:58:14 +01:00
Alexander Bock
d3e16a0437 Apply changes to texture reading 2014-12-05 21:01:54 +01:00
Jonas Strandstedt
645da3630f Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-05 16:52:53 +01:00
Jonas Strandstedt
5e94004a01 Removed Spice source submodule and added precompiled libraries 2014-12-05 16:52:13 +01:00
Alexander Bock
cf53b5c1b0 Let the LuaConsole use a permanent cached file for the history 2014-12-05 16:43:16 +01:00
jonasstrandstedt
11e867aaf1 Fixed bug that causes crash if Focus node wasn't found 2014-12-04 23:27:18 +01:00
Alexander Bock
0d48766f7d Move the cmake include files from ext to support/cmake 2014-12-04 16:30:16 +01:00
Alexander Bock
b2cb6fb584 Change some more code in preparation of the new SGCT version 2014-12-04 16:28:49 +01:00
Jonas Strandstedt
ba4a55fd88 Removed references to OpenCL 2014-12-04 14:36:55 +01:00
Jonas Strandstedt
4ff9f08473 Changes to conform to new ghoul ProgramObject::Build interface 2014-12-03 16:30:25 +01:00
Alexander Bock
0dc2a9d030 Allow the configuration file to request logging functionality 2014-12-03 00:39:42 +01:00
Alexander Bock
eb6641a87b Updated Spice reference
Updated Ghoul reference
Added possible check-point for dome mismatch in rendering
2014-12-02 23:12:10 +01:00
Jonas Strandstedt
f0722700cf Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/scenegraph/scenegraph.cpp
2014-12-02 11:19:51 +01:00
Alexander Bock
82491bf89b More work on cleaning up / extending RenderableStars 2014-11-27 23:42:32 +01:00
michal
b9868987a2 intermediate commit 2014-11-26 12:12:03 -05:00
Alexander Bock
fc1dcfabc8 Some more changes to the RenderableStars class 2014-11-26 16:36:02 +01:00
Alexander Bock
b4f6070642 Started cleanup of RenderableStars class 2014-11-25 19:15:59 +01:00
jonasstrandstedt
4069680662 Point to Ghoul master 2014-11-18 08:40:44 +01:00
Jonas Strandstedt
31c76f3e3c Added key binding from Lua possible
- Possible to add key bindings from Lua possible. This calls Lua scripts
  from key commands.

 - Temporary fixed a small bug for volume rendering
2014-11-17 17:02:40 +01:00
Jonas Strandstedt
7e1396a8ae Added separete ProgressBar class 2014-11-07 14:48:03 +01:00
jonasstrandstedt
f3225418b6 Linux fixes 2014-11-06 10:08:53 +01:00
Jonas Strandstedt
673e0014be Link with new Ghoul, removed CMake warning for OSX 2014-11-05 15:21:03 +01:00
Jonas Strandstedt
1b6ad0f8d7 Faster more dynamic shader loading 2014-11-04 18:17:15 +01:00
Jonas Strandstedt
a96e32badb Working OS X version 2014-10-31 15:37:03 +01:00
Jonas Strandstedt
83bebbd60f First OS X ABuffer implementation
- Not working.
2014-10-30 17:10:00 +01:00
Jonas Strandstedt
43929810cf Pointing to ghoul master 2014-10-30 11:18:09 +01:00
Jonas Strandstedt
98152b8da9 Removed OpenCL dependencies 2014-10-29 17:54:03 +01:00
Jonas Strandstedt
619d71ae23 Pointing to latest Ghoul 2014-10-29 17:05:49 +01:00
Jonas Strandstedt
7af4e11597 Pointing to latest Ghoul 2014-10-29 16:25:24 +01:00
Jonas Strandstedt
9c171d9ff8 Fix Release build issues 2014-10-29 14:03:41 +01:00
Jonas Strandstedt
a151c24904 Small changes to CMake downloader 2014-10-29 10:54:06 +01:00
michal
37e9dcafa4 git complains i should push data. ill do that. 2014-10-28 10:37:58 -04:00
jonasstrandstedt
963d260ca0 Pointing to ghoul master 2014-10-28 11:04:12 +01:00
Jonas Strandstedt
5225323a2b Cleaning up OpenSpaceEngine and RenderEngine 2014-10-23 18:13:40 +02:00
Jonas Strandstedt
9b1c993e89 Removed SGCT include from openspaceengine.h 2014-10-23 16:08:10 +02:00
jonasstrandstedt
490fbc4869 Linux fix 2014-10-21 21:44:29 +02:00
Jonas Strandstedt
db141e8e86 Merge branch 'develop' into bug/abuffershadersupdater
Conflicts:
	ext/ghoul
	openspace.cfg
	src/abuffer/abuffer.cpp
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp
2014-10-21 14:54:48 +02:00
Jonas Strandstedt
7ef5295bb7 Added ABuffer reinitialization
- Fixed so ABuffer reinitializes properly (could probably be optimized by
  not resizing of smaller than before)
- Now setting size properly from window dimensions
- SGCT side-by-side stereo working
2014-10-17 14:50:40 +02:00
Jonas Strandstedt
572651dba7 Added cotire to speed up compilation 2014-10-16 15:38:59 +02:00
Alexander Bock
befcc59bcd Load common module automatically without the need to declare it in the scenefile
Drastically remove the amount of false-positive errors during runtime
2014-10-11 14:45:34 +02:00
Alexander Bock
c226e9b82f Cleaned up code
Added new COMMON_FOLDER setting in scene file
Error handling when spice kernels are not available
2014-10-11 13:40:52 +02:00
Jonas Strandstedt
9a1b59a73e Intermediate commit 2014-10-10 11:29:16 +02:00
michal
96853d579b added changes to make things work on my end 2014-10-06 18:48:47 -04:00
Alexander Bock
f7af8256dd Finished cleaning the SpiceManager 2014-10-06 01:33:56 +02:00