Alexander Bock
3086cedcd2
Added missing version file
2015-02-23 17:20:36 +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
561e18d748
Fix spelling mistake
2015-02-23 16:49:58 +01:00
Alexander Bock
74a7a3acc4
Added temporary GUI to switch between coordinate systems
2015-02-23 16:49:39 +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
Michal Marcinkowski
ee81579f96
Adding changes for rudimental target switching + correct hong kang playbook
2015-02-23 10:02:19 -05: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
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
cc331a7496
Linux compile fix
2015-02-23 13:08:14 +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
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
Alexander Bock
5be1c4163f
Merge branch 'develop' into plutoViz
2015-02-22 21:15:22 +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
9eedd7d895
Fix error with missing variable initialization
2015-02-21 00:20:45 +01:00
Alexander Bock
bdd93b22bd
Merge branch 'plutoViz' into develop
2015-02-20 22:35:04 +01:00
Alexander Bock
c29555b530
Set new default values for star rendering
2015-02-20 22:16:44 +01:00
Alexander Bock
5046b7447e
Removed logging if a script is executed
...
More tweaking for RenderableStars
2015-02-20 21:37:48 +01:00
Alexander Bock
3c72ef8c1c
Updated star rendering once more
...
Added keys to fade rendering to black and restore
2015-02-20 21:02:12 +01:00
Alexander Bock
9a34ffdfa9
Merge branch 'feature/stars' into plutoViz
2015-02-20 20:47:10 +01:00
Joakim Kilby
d520bdd8a1
scriptsync hotfix. all received scripts are now executed once received instead of one per frame.
2015-02-20 18:09:05 +01: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
Alexander Bock
552f10b52e
Merge branch 'develop' into feature/stars
2015-02-20 16:54:40 +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
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
3c67788300
Disable HTML log on default
...
Restore default.scene
2015-02-20 13:57:56 +01:00
Alexander Bock
bd69db9e6d
More work on fixing of RenderableStars
2015-02-20 13:56:46 +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
c849adb96f
Merge branch 'updateSGCT' into develop
2015-02-19 23:42:12 +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
bfb0531090
minor adjustement to mainLogCallback function. just ensuring that the argument to substr is never negative
2015-02-19 18:51:07 +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
Michal Marcinkowski
d875e01e25
attempting to fix jenkins error
2015-02-19 11:51:14 -05:00
Joakim Kilby
9b23822d7d
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
2015-02-19 17:34:41 +01:00
