Commit Graph

167 Commits

Author SHA1 Message Date
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
Jonas Strandstedt 3cad506b5b PowerScaling modifications
- Started working on PowerScaling with some initial changes
- Faking the stars by blending with the abuffer
- Changed texture filtering for planets, looks better in my opinion
2014-10-03 17:02:31 +02:00
Jonas Strandstedt e4a8e87098 Using new ghoul ProgramObject functionality
- Fixed risk of memory leak in SceneGraph (deleting shaders)
2014-10-01 15:30:39 +02:00
Alexander Bock e6ab0f51fc Started cleanup of SpiceManager 2014-09-28 02:28:14 +02:00
Alexander Bock b667a4910c Reworked how SPICE kernels are loaded
- SpiceEphemeris can provide a list of kernels that are loaded when created
- Time and Leapsecond kernels are provided in the openspace.cfg file
2014-09-28 00:06:53 +02:00
Alexander Bock 3a2c4e92fc Remove the paths from the configuration dictionary to make it unnecessary to keep them synchronized with the filesystem 2014-09-27 19:42:25 +02:00
Alexander Bock f3fb8cd95e Apply getValueSafe/getValue change of Dictionary to the codebase 2014-09-27 19:23:24 +02:00
Alexander Bock 41895d5a63 Updated to new ghoul version 2014-09-26 18:05:26 +02:00
Alexander Bock bedc894064 Removing Jenkins warnings 2014-09-26 17:53:18 +02:00
Jonas Strandstedt 82ff7fa984 Merge branch 'develop' into stars
Conflicts:
	include/openspace/util/constants.h
	shaders/pscstandard_fs.glsl
	shaders/pscstandard_vs.glsl
	src/interaction/interactionhandler.cpp
	src/main.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp
	src/util/factorymanager.cpp
2014-09-24 15:39:22 +02:00
Alexander Bock 51be4b1788 Make use of new Dictionary::getValueSafe method
Clean up code in various places
2014-09-19 00:29:36 +02:00
Alexander Bock d1bc655323 Updated used Ghoul version 2014-09-17 20:17:00 +02:00
Alexander Bock 0eeeb8efd6 More work on fixing script access to time 2014-09-13 19:25:33 +02:00
Alexander Bock 4b8a17386f Updated ghoul version 2014-09-13 10:52:04 +02:00
Alexander Bock fb24f06e5a Added doxygen files and fixed documentation errors 2014-09-07 16:59:51 +02:00
Alexander Bock 667dc6a3fc Started work on alternate property definition to take Lua scripting into account 2014-09-01 18:02:59 +02:00
Alexander Bock e7697a4ce0 Enable setting and getting property values from Lua scripts 2014-08-31 17:52:02 +02:00
Alexander Bock 79174d5b6c Cleaned up scripts directory
Made scripts runnable at startup
Added printing functions and remapped default Lua printing
2014-08-29 13:04:20 +02:00
Alexander Bock 5793498ddf Added first version of ScriptEngine, allowing Lua script to set propety values 2014-08-21 18:44:42 +02:00
Alexander Bock 26a7fbe47e Code cleanup of Ephemeris classes and SceneGraph 2014-08-20 16:55:07 +02:00
Alexander Bock 61f2f51cb0 Compile fixes of SpiceManager for Mac 2014-08-19 12:14:34 +02:00
Michal Marcinkowski 9cba01c633 no message 2014-08-04 20:43:55 +02:00
Alexander Bock 6abdb37003 Update Kameleon submodule 2014-05-15 00:42:49 +02:00
Hans-Christian Helltegen 71b624b858 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-05-14 14:30:19 -04:00
Hans-Christian Helltegen 7b48621cb3 Updated ghoul version; Linux and OpenCL 1.1 fixes 2014-05-14 14:29:09 -04:00
Alexander Bock 98582a4131 Added kameleon as a subrepository 2014-05-14 00:45:48 +02:00
Alexander Bock 37e5e63b70 Updated ghoul version; some code cleanup 2014-05-11 18:22:20 +02:00
Alexander Bock 9bcb848e60 Updated ghoul version; more code cleanup 2014-05-10 15:17:10 +02:00