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
Alexander Bock
f14daa0999
Update ghoul version; Enable triggering of APCs
2014-05-09 20:06:46 +02:00
Jonas Strandstedt
541f080bfe
Fixes to remove warnings and camera distance fix
2014-05-06 12:45:18 -04:00
Jonas Strandstedt
d7eb868dde
Static assert fix and minor changes
2014-05-05 11:12:11 -04:00
Jonas Strandstedt
c6a2ebc671
Pointed to updated ghoul
2014-05-05 09:42:07 -04:00
Alexander Bock
5769919ea6
Work on FactoryManager
...
Renamed factoryByType to factory
Store generic factories inside of FactoryManager
2014-05-05 12:37:18 +02:00
Alexander Bock
2bf71ad9b6
More cleanup
2014-05-04 14:16:53 +02:00
Alexander Bock
cb6298b615
Cleanup of OpenSpaceEngine code
...
Renamed openspace.cfg variables to conform with format in scene description
2014-05-03 20:46:53 +02:00
Alexander Bock
b40760af81
Merge branch 'kameleon' into properties
2014-05-03 12:06:54 +02:00
Alexander Bock
b9f034215f
Fix typo in OpenCL kernel
2014-05-03 12:06:40 +02:00
Alexander Bock
2442a041a8
Updated the Spice library
2014-05-02 17:00:11 +02:00
Alexander Bock
6c15bebfff
Merge remote-tracking branch 'origin/kameleon' into properties
2014-05-02 16:59:50 +02:00
Alexander Bock
10dcbb9dd8
Remove ConfigurationManager
2014-05-02 11:16:27 +02:00
Alexander Bock
43e510fded
Fixed for Win32 compatability
...
Renamed OpenCL qualifiers due to conflict with "ERROR" macros
Removed boost::timer and boost::system dependencies
Added fixed for Windows path handling
2014-05-02 10:48:16 +02:00
Alexander Bock
47d93a3042
Merge branch 'develop' into properties
2014-04-29 16:47:25 +02:00
Jonas Strandstedt
e4c0b88742
More work on RenderableVolumeExpert
...
- Added include directory support
- Added definitions support
- Added a volume helpers
- Fixed errors in kameleon wrapper
- Added ENLIL support in kameleonwrapper
2014-04-28 15:38:40 -04:00
Hans-Christian Helltegen
950de28780
Forgot to add new ghoul version
2014-04-22 16:49:31 -04:00
Hans-Christian Helltegen
ea8f7748ac
Fixed some cl stuff in ghoul used in renderablevolumeexpert
2014-04-22 14:24:34 -04:00
Jonas Strandstedt
a6a5207a5d
Moved from VolumeRaycaster to RenderableVolume
...
- Removed old classes and moved code to the Renderables
- RenderableVolume is now abstract with some helpful functions
- Added swapinterval=0 to sgct config for performance analysis
2014-04-18 09:58:44 -04:00
Jonas Strandstedt
30bda3fc97
Flare and Volumes in scenegraph
...
- Added new volumeraycaster classes
- Fixed many small warnings in OpenSpace
- Linked to updated Ghoul and Openspace-data
- TODO cleanup in volumeraycaster classes
- TODO Add an advanced volumeraycaster class to use during development
2014-04-14 16:41:57 -04:00
Jonas Strandstedt
b63978438d
Tracking latest ghoul changes
2014-04-08 10:47:07 -04:00
Jonas Strandstedt
148ff3ea50
Linked to latest Ghoul
2014-04-07 16:31:14 -04:00
Jonas Strandstedt
2599268fd3
Merge branch 'develop' into OpenCLWrapper
...
Conflicts:
ext/ghoul
src/engine/openspaceengine.cpp
2014-04-07 14:38:21 -04:00
Jonas Strandstedt
b47ae90919
Updated OpenSpace to be self contained
...
- Added openspace.cfg that sets runtime variables
- Added relatively small tsp file to openspace-data
- Removed unused TextureAtlas
2014-04-07 09:58:14 -04:00
Alexander Bock
0f2585abdf
Update used Ghoul version
2014-04-03 11:18:37 -04:00
Jonas Strandstedt
6d00b52240
A lot of intermediate changes
...
- Compiles and runs on Linux and OS X
- Produces weird results on OS X
2014-03-27 13:38:58 -04:00
Jonas Strandstedt
88b0246506
Intermediate step when porting Flare
2014-03-25 13:21:03 -04:00
Jonas Strandstedt
956a44ffcd
First OpenCL wrapper implementation
2014-03-24 10:22:35 -04:00
Hans-Christian Helltegen
658ae13d96
Added flare to OpenSpace
2014-03-19 16:41:12 -04:00
Hans-Christian Helltegen
14351ee3a9
linux fix
2014-03-14 16:58:32 -04:00
