Commit Graph

547 Commits

Author SHA1 Message Date
Alexander Bock b2cb6fb584 Change some more code in preparation of the new SGCT version 2014-12-04 16:28:49 +01:00
Jonas Strandstedt fcf4bd622a Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-04 14:37:27 +01:00
Jonas Strandstedt ba4a55fd88 Removed references to OpenCL 2014-12-04 14:36:55 +01:00
Jonas Strandstedt d7487f601c OS X compile fixes 2014-12-04 11:20:28 +01:00
Alexander Bock cb526c7736 Update ghoul repository 2014-12-03 20:39:16 +01:00
Alexander Bock dedb825fcf Added missing implementation to retrieve non-const renderable 2014-12-03 18:06:54 +01:00
Alexander Bock 8c2dfb13bb Enable querying for Renderables in query.h 2014-12-03 17:19:18 +01:00
Alexander Bock 14051455a5 Fix error that appears when creating directories on first start 2014-12-03 17:19:01 +01:00
Jonas Strandstedt 47c68ade3c Small fix for finding the SGCT configuration path 2014-12-03 16:42:22 +01:00
Jonas Strandstedt 279e9e82ba Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-03 16:31:16 +01:00
Jonas Strandstedt 4ff9f08473 Changes to conform to new ghoul ProgramObject::Build interface 2014-12-03 16:30:25 +01:00
Alexander Bock 36d3b6bf74 Be able to set the SGCT configuration file using the commandline arguments 2014-12-03 16:09:24 +01:00
Alexander Bock aba4d6024d Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-03 15:42:51 +01:00
Alexander Bock f1659e5c8b Minor workover of the logging creating facility 2014-12-03 15:42:35 +01:00
Jonas Strandstedt f7b2bc12e0 Added billboard support for RenderablePlane 2014-12-03 14:48:50 +01:00
Jonas Strandstedt a5e122b822 Improved the Lua documentation
- Lua documentation now needs a string giving the arguments list.
- When generating documentation first prints the command list and then prints
  the documentation for each command.
- Supports fixed max line length (set to 80)
- Uses four blank spaces as padding (easily replacable)
2014-12-03 14:13:53 +01:00
Jonas Strandstedt fc6fbf1587 Fix for multi node rendering in release mode
- Working but maybe temporary fix checking that the SyncBuffer object is
  not nullptr.
- Might need changing from heap to stack allocated object
  instead.
2014-12-03 13:18:04 +01:00
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