Commit Graph

455 Commits

Author SHA1 Message Date
Alexander Bock 87db591b41 Fixing on-screen gui for multiple nodes 2015-02-27 09:44:14 +01:00
Alexander Bock 1a29ad6208 Merge branch 'develop' into plutoViz 2015-02-27 09:01:55 +01:00
Michal Marcinkowski 39e5f2aa28 Improvements to the ImageSequencer class.
- Now _properly_ switches instruments at the moment set instrument is activated
2015-02-26 15:50:37 -05:00
Alexander Bock e6c1f34d48 Fixed a crash with RenderablePlane
Fixed a crash with changing coordinate systems
2015-02-26 13:25:13 +01:00
Alexander Bock 836f7a825b Making texture in RenderablePlane modular
Disable rendering of the Sun by default in favor of the glare texture
2015-02-26 13:10:43 +01:00
Alexander Bock a4e4df3d28 More cleanup of WaveFrontGeometry and RenderableModel 2015-02-25 23:58:30 +01:00
Alexander Bock bd382f9e8e Cleanup of WaveFrontGeometry 2015-02-25 23:39:20 +01:00
Alexander Bock d249e9422e Fixed bug where ScriptEngine would complain about double-added libraries
Correct application of default keybinding
2015-02-25 17:57:25 +01:00
Alexander Bock e155e7ec9f Adding functionality to pause the simulation time
Removed retreatTime function and replaced by a call to -advanceTime
2015-02-25 17:50:34 +01:00
Alexander Bock b3c4cc7a34 Make the line width of renderablefov changeable 2015-02-25 11:53:20 +01:00
Alexander Bock 5c72966346 Implemented caching for OBJ model files 2015-02-25 11:48:17 +01:00
Alexander Bock 862c8ffd96 Renamed globalOpacity to globalblackout
Start application in blackout and fade in after scenegraph has been loaded
2015-02-25 09:37:55 +01:00
Alexander Bock 3155073f05 More changes to allow JupiterProjection and PlutoProjection in the same scene
Add a switch that allows Renderables to react to big changes in time (via openspace.time.setTime)
Allow the setting of the minimum pixel size of stars
2015-02-24 19:16:15 +01:00
Alexander Bock bac0a9ad31 Disable the swap barrier before the scene load (and reactivating it afterwards) 2015-02-24 19:13:50 +01:00
Alexander Bock 43a3716afd Intermediate result to change viewpoint from Jupiter projection to Plutoprojection 2015-02-24 17:52:40 +01:00
Alexander Bock 7ba7622023 Updated module loading to use a common lua state that has openspace lua functions (closing #100) 2015-02-24 13:55:43 +01:00
Alexander Bock 84f8ce961b Added configuration switch "DisableRenderingOnMaster" to disable rendering on the master node 2015-02-24 13:42:47 +01:00
Alexander Bock d1a215e5c3 Use correct versioning scheme 2015-02-24 11:09:40 +01:00
Alexander Bock 35d664365e Adding Lua function to toggle the SGCT render information overlay 2015-02-24 10:45:50 +01:00
Alexander Bock 45e4dad29d Implement reference counting for SPICE kernels to shield SPICE from loading kernels multiple times
Passing result of surface intercept method by parameter and returning success status
2015-02-24 10:29:29 +01:00
Michal Marcinkowski 85e13f7738 Added:
New obj mod file with separate obj-loads
Imagesequencer - active instrument slightly improved
Printout of active instrument
Ortho-square dissapears when not needed
2015-02-24 00:03:00 -05:00
Alexander Bock 14144bbad3 Add Gui component for manipulating time 2015-02-23 23:01:57 +01:00
Alexander Bock 45c148b2c8 Added error checking codes to SpiceManager
Changed method to return instrument visibility by reference and used return value for errors
2015-02-23 21:36:37 +01:00
Alexander Bock 7f6d894866 Fixed more gcc and Cppcheck warnings 2015-02-23 20:07:57 +01:00
Alexander Bock f59c9819c4 Fixing gcc warnings 2015-02-23 19:35:47 +01:00
Alexander Bock fb2c99b5ed Removed cppcheck warnings
Removed unused Interface file
2015-02-23 19:08:15 +01:00
Alexander Bock 78ab23602f Moved tinyobjloader from util into submodule of Ghoul 2015-02-23 18:08:28 +01:00
Alexander Bock 3086cedcd2 Added missing version file 2015-02-23 17:20:36 +01:00
Alexander Bock a79f65a288 Added new GuiComponent to change origin 2015-02-23 16:43:13 +01:00
Alexander Bock 957495d46f Merge remote-tracking branch 'origin/plutoViz' into develop 2015-02-23 16:13:00 +01:00
Alexander Bock b6e0bd1043 Added interaction speed modifiers/inverters
Disable cotire
Enable Xcursor and Xinerama libraries on Linux builds
2015-02-23 15:58:05 +01:00
Michal Marcinkowski 175874adc7 Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
Conflicts:
	src/rendering/model/wavefrontgeometry.cpp
2015-02-23 09:57:26 -05:00
Michal Marcinkowski 770ee9212f adding changes for rudimental target switching, needs work. 2015-02-23 09:56:29 -05:00
Alexander Bock 3ba9cbdb96 Linux compile fix 2015-02-23 14:18:21 +01:00
Alexander Bock cc331a7496 Linux compile fix 2015-02-23 13:08:14 +01:00
Alexander Bock 34ff3c6018 More changes to RenderableStars using the AMNH test target
Removed superfluous properties of RenderableStars
Removed specialized settings file
2015-02-22 23:51:26 +01:00
Alexander Bock a7bd6319db Adding 'property' prefix to subowner methods in PropertyOwner
Added function for writing documentation of properties
2015-02-22 22:05:25 +01:00
Michal Marcinkowski 73baceadaa Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz 2015-02-22 13:11:03 -05:00
Michal Marcinkowski cc65ce1167 changing obj loader to tinyobj 2015-02-22 13:10:47 -05:00
Alexander Bock 1fda1d38db Merge branch 'plutoViz' into feature/stars 2015-02-20 16:56:15 +01:00
Joakim Kilby ea2017e11c Introduced fadeIn and fadeOut functionality via scripting. 2015-02-20 16:54:30 +01:00
Alexander Bock 08061a74e9 Enable ImGui to handle StringProperty type 2015-02-20 16:54:24 +01:00
Joakim Kilby 468bb98e46 created postFX functions in main and added a postFX pass to sgct engine to allow for a global fade after executing certain scripts.
added global opacity member variable with set/get methods in render engine.
added two VERY simple shaders used in the post FX pass. Note these are not handled in openspace so updating files does not update shader
2015-02-20 11:19:50 +01:00
Joakim Kilby a26214a38d Added boolean to OpenSpaceEngine declaring if this node is the master or not.
made sure it's set in the right place in main file.
removed all references to sgct::engine::instance()->isMaster() and replaced with calls to openspaceengine isMaster() function.
2015-02-20 10:45:33 +01:00
Alexander Bock 5eb5a9a479 Enable the possibility to switch between coordinate systems (with the Sun in the center vs Pluto in the center) 2015-02-19 19:13:55 +01:00
Michal Marcinkowski d875e01e25 attempting to fix jenkins error 2015-02-19 11:51:14 -05:00
Alexander Bock 9bad48ae2e Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz 2015-02-19 16:24:01 +01:00
Alexander Bock f00158969c Cleanup of ImageSequencer
Added caching to playbook loading
Increased performance of playbook loading
Added default placeholder image
2015-02-19 16:21:28 +01:00
Joakim Kilby 4487bc3500 Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz 2015-02-19 15:41:21 +01:00
Joakim Kilby dce4835bab changing render function of openspaceengine and renderengine to take glm::mat4 matrices for Projection / ViewMatrix. 2015-02-19 15:19:20 +01:00