Commit Graph

530 Commits

Author SHA1 Message Date
Alexander Bock 0dc2a9d030 Allow the configuration file to request logging functionality 2014-12-03 00:39:42 +01:00
Alexander Bock 56e9892c56 Remove warnings from RenderEngine 2014-12-03 00:18:15 +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 69ce7c9e00 Fix LuaConsole history issues
- Fix bug when adding command when history is empty
- Fixed loading of history from file
2014-12-02 11:48:15 +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
Jonas Strandstedt 8196645284 Added support for placing camera att arbitrary position
- Pointing to openspace-data commit that reflects postition changes
- Fix camera to have correct rotation on startup
2014-12-02 11:06:15 +01:00
Hans-Christian Helltegen fd614efb71 Merge fix 2014-12-02 09:19:34 +01:00
Hans-Christian Helltegen 5b1b8694dc Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/geometryfieldlines 2014-12-01 16:40:01 +01:00
Hans-Christian Helltegen 834612469c Finalized the billboard rendering. Code cleanup 2014-12-01 16:27:30 +01:00
Alexander Bock 1cf408b523 Merge local branch 2014-11-29 14:05:42 +01:00
Alexander Bock b05c4cf30f Add capabilities to write out documentation of all Lua functions on startup 2014-11-29 14:03:49 +01:00
Alexander Bock 20c96f00e8 More cleanup of RenderableStars, enable rendering of Speed variable 2014-11-28 15:57:14 +01:00
Alexander Bock 4de8071efe Force all Renderables to declare an 'isReady' function to circumvent assertion triggers when a crucial element of initialization fails
Fix velocity in RenderableStars
2014-11-28 01:41:26 +01:00
Alexander Bock 2c3723a778 Fix a situation where a failed shader would trigger an assert in RenderablePlane 2014-11-27 23:43:06 +01:00
Alexander Bock 82491bf89b More work on cleaning up / extending RenderableStars 2014-11-27 23:42:32 +01:00
Alexander Bock 9a8cc52f2f Add a versioning system to the cache in RenderableStars 2014-11-27 11:44:37 +01:00
Alexander Bock 43d542293a More work in progress on RenderableStars
- Made the shader a private object not instantiated by scenegraph
- Started enabling coloring by velocity
- Code cleanup
2014-11-27 03:08:40 +01:00
Alexander Bock e8de5edb45 Have RenderableStars cache the full Speck file
Enable basic slicing of the data
2014-11-27 02:26:43 +01:00
Alexander Bock e9d3993ad6 Fix virtual-ness in TemplateProperty
Add OptionProperty
2014-11-27 02:26:13 +01:00
michal 0fc0ba929b updating some spicemanger stuff 2014-11-26 13:02:20 -05: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
Alexander Bock fdca1c0b3b Deinitialize scenegraph nodes when scenegraph is deinitialized 2014-11-25 19:15:33 +01:00
Hans-Christian Helltegen 337ce2dd92 Added support for rendering fieldlines as textured view-aligned billboards 2014-11-24 17:18:55 +01:00
Hans-Christian Helltegen 815fc3b348 Fixed depth, position, scale and shader issues with fieldlines. Added passthrough geometry shader 2014-11-21 10:37:01 +01:00
jonasstrandstedt 561aa221d3 Linux fixes
- Commented out the tinythread hack from src/CMakeLists.txt
2014-11-20 09:33:07 +01:00
Jonas Strandstedt 531bf86ddd Added binary output directories 2014-11-19 10:53:11 +01:00
Alexander Bock 1e5c181cee Fix adding of multiple lua libraries with the same name by allowing them to be merged internally 2014-11-18 19:41:02 +01:00
Alexander Bock 73143b8b47 Reenable methods for limiting closeness to focus object
Renable key binding feature that was broken by merging
2014-11-18 19:40:24 +01:00
Alexander Bock 432266ee6a Allow access to the console through OpenSpaceEngine
Enable scripting for showing/hiding the console
2014-11-18 19:39:25 +01:00
Alexander Bock e630f6efbb Fixed bug that did not set cache directory correctly
Moved visibility of console into LuaConsole class
2014-11-18 17:47:09 +01:00
Alexander Bock f02234099f Added code that checks for completeness (as defined in configurationmanager.cpp) of the configuration file 2014-11-18 17:17:56 +01:00
Alexander Bock a0503ba957 Modularizing font specification 2014-11-18 16:21:52 +01:00
Alexander Bock 66ef5d9e3b Update openspace-data and gitignore list 2014-11-18 16:08:51 +01:00
Alexander Bock 2485b12738 Fix a crash with double deinitialization 2014-11-18 16:07:59 +01:00
Alexander Bock 6b40cb18fb Merge branch 'feature/interactionhandler' into develop
Conflicts:
	include/openspace/engine/openspaceengine.h
	include/openspace/interaction/interactionhandler.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
2014-11-18 15:46:26 +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 8d2503b68e Added support for pixelData for ABuffer
- ABufferFixed should work but it doesn't. But the interface works at
  least.
- ABufferFixed works for normal rendering
- Removed position for ABuffer, it should make rendering much faster.

Todo:
- Figure out why the fetching of pixelData for ABufferFixed gives wrong
  result.
2014-11-13 15:41:10 +01:00
Jonas Strandstedt ba7a4a4a47 Added ABuffer visualizer
- First draft of the ABuffer visualizer renders a cube with all fragments
  from the single linked abuffer. Lua command to turn on is
  openspace.visualizeABuffer(true)
- Fixed LuaConsole to stop receiving input command after inputing command
- Fixed LuaConsole not to add command to history if it is identical to the
  most recent command.

 TODO:
 - Add support for dynamic and fixed abuffer
 - Scale the cube to match the window ratio
2014-11-12 16:54:40 +01:00
Jonas Strandstedt 890fd9c05d Fixed fisheye rendering 2014-11-11 13:56:33 +01:00
Jonas Strandstedt 46959b4801 Cleanup for KameleonWrapper
- Fixed so size and scale for RenderableVolumeGL can be deduced from model.
2014-11-11 13:43:38 +01:00
Jonas Strandstedt 7e1396a8ae Added separete ProgressBar class 2014-11-07 14:48:03 +01:00
Jonas Strandstedt 3a2754fac7 Added support for more volume types
TODO:
- Test new type of volumes
2014-11-06 16:03:08 +01:00
jonasstrandstedt f3225418b6 Linux fixes 2014-11-06 10:08:53 +01:00
Jonas Strandstedt f85e18dc18 OS X now doesn't crash for volumes
- Fixed a few warnings
2014-11-05 17:11:27 +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