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
47d6fe3141
Fix merging issues
2015-02-24 21:31:39 +01:00
Alexander Bock
2d1a8932da
Merge branch 'develop' into release-prerelease-boulder
2015-02-24 21:14:37 +01:00
Alexander Bock
657b8eed1b
Added possibility to change coordinate system to jupiter as well
2015-02-24 20:56:56 +01:00
Alexander Bock
888ca3f4a4
Set default linewidth for renderabletrails to 1
2015-02-24 19:33:14 +01:00
Alexander Bock
8e4c977349
Merge branch 'develop' into release-prerelease-boulder
2015-02-24 19:22:46 +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
43a3716afd
Intermediate result to change viewpoint from Jupiter projection to Plutoprojection
2015-02-24 17:52:40 +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
df71f97943
Added configuration switch "DisableRenderingOnMaster" to disable rendering on the master node
2015-02-24 13:41:42 +01:00
Alexander Bock
faf935704f
Fix bug where no value is returned from Lua script
2015-02-24 10:49:24 +01:00
Alexander Bock
d7203688b1
Fix bug where no value is returned from Lua script
2015-02-24 10:49:12 +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
c62a766b2f
Adding Lua function to toggle the SGCT render information overlay
2015-02-24 10:45:26 +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
Alexander Bock
86091b7687
Have correct orientation of the solar system when performing coordinate system change
2015-02-24 10:07:25 +01:00
Alexander Bock
5aa41dd0b5
Update maximum number of performance records from 50 to 256
2015-02-24 09:54:35 +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
Michal Marcinkowski
aae0516acd
small change so that ortho-plane dissappears when not needed
2015-02-23 22:53:40 -05:00
Michal Marcinkowski
0f1d8a6959
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
2015-02-23 17:24:18 -05:00
Michal Marcinkowski
2657d6f254
changes to openspace-data, NH now loaded as separate modules
2015-02-23 17:24:03 -05: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
f63fb32379
Addressing more CppCheck warnings
2015-02-23 19:22:45 +01:00
Alexander Bock
3bf577d04d
Add OpenSpace version information
...
Make info text in WaveFrontGeometry more useful
2015-02-23 17:14:01 +01:00
Alexander Bock
957495d46f
Merge remote-tracking branch 'origin/plutoViz' into develop
2015-02-23 16:13:00 +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
24aadf83a3
Linux compile fix
...
Added Properties.txt to gitignore list
2015-02-23 14:06:08 +01:00
Alexander Bock
37b48e6ff1
Linux compile fix
2015-02-23 13:32:31 +01:00
Alexander Bock
d4ccd88251
Linux compile fix
2015-02-23 11:51:21 +01:00
Alexander Bock
9af91fa7d9
Only request position update in RenderableModel if a spice target is set
...
Added code in Wavefrontgeometry to deal with ill-formed obj files
2015-02-23 11:00:39 +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
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
cf74d346da
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
2015-02-20 16:55:03 +01:00
Joakim Kilby
ea2017e11c
Introduced fadeIn and fadeOut functionality via scripting.
2015-02-20 16:54:30 +01:00
Alexander Bock
2d7ceed902
More work on stars
2015-02-20 16:53:50 +01:00
Alexander Bock
4607c347a1
Merge branch 'feature/stars' into plutoViz
2015-02-20 14:00:19 +01:00
Alexander Bock
ec1344d3b7
One more small step towards working stars
2015-02-20 11:22:38 +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
f4dcfc07ec
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
2015-02-20 10:47:06 +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
3c1695975c
Remove the light time calculation from the renderabletrails
2015-02-20 10:08:59 +01:00
Alexander Bock
ac3ece65ba
Merge branch 'develop' into plutoViz
2015-02-19 23:43:13 +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
Joakim Kilby
23681cba2d
updated files to new SGCT (version 2.5.0)
...
Ask Alex for a distribution of new SGCT
2015-02-19 18:47:16 +01:00
Michal Marcinkowski
423d778480
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
2015-02-19 11:51:30 -05:00