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
ac3ece65ba
Merge branch 'develop' into plutoViz
2015-02-19 23:43:13 +01:00
c849adb96f
Merge branch 'updateSGCT' into develop
2015-02-19 23:42:12 +01:00
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
bfb0531090
minor adjustement to mainLogCallback function. just ensuring that the argument to substr is never negative
2015-02-19 18:51:07 +01:00
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
423d778480
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
2015-02-19 11:51:30 -05:00
d875e01e25
attempting to fix jenkins error
2015-02-19 11:51:14 -05:00
9b23822d7d
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
2015-02-19 17:34:41 +01:00
e35736bd4d
ensured master does not care about scene orientation (to make navigation on master easier )
2015-02-19 17:34:13 +01:00
abb114c334
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
...
Conflicts:
src/util/imagesequencer.cpp
2015-02-19 11:16:22 -05:00
6353cd9710
updating data, minor adjustments
2015-02-19 10:50:22 -05:00
9bad48ae2e
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
2015-02-19 16:24:01 +01:00
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
7b65be6839
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
...
Conflicts:
ext/ghoul
2015-02-19 10:15:04 -05:00
6274070cd2
updating data
2015-02-19 10:13:29 -05:00
4487bc3500
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
2015-02-19 15:41:21 +01:00
26595edc90
updates to matrix calculations
2015-02-19 15:40:08 +01:00
f87696f762
changed to relative path for placeholder image and removed directory searching for playbook file. function now accepts an actual playbook file
2015-02-19 15:21:09 +01:00
c94a287cd2
changed to relative path for playbook
2015-02-19 15:20:14 +01:00
dce4835bab
changing render function of openspaceengine and renderengine to take glm::mat4 matrices for Projection / ViewMatrix.
2015-02-19 15:19:20 +01:00
11c4757073
Merge branch 'develop' into plutoViz
2015-02-19 14:45:11 +01:00
27c5bcaa93
Fix bug where a script execution would stop completely if a property was not found
...
Added helper file to ease Lua script callback testing
Made errors in setPropertyValue and getPropertyValue functions not fatal
2015-02-19 14:43:29 +01:00
d96b7146e3
Restore openspace.cfg
2015-02-19 11:16:02 +01:00
b85c47a3f9
Fixed a bug where program crashed during on-screen prints due to argument missmatch
2015-02-19 10:30:34 +01:00
f14f288f19
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
...
Conflicts:
src/rendering/planets/renderableplanet.cpp
src/rendering/planets/renderableplanetprojection.cpp
src/rendering/renderablefov.cpp
2015-02-19 10:07:38 +01:00
24d8f8c41e
Bug fixes
2015-02-19 10:04:02 +01:00
d913132852
Changes to pointer usage in these files.
2015-02-19 10:02:55 +01:00
417f5c8f6c
Fixed synchronization bug when master runs at a different FPS than slaves.
...
Scripts are now queued when received and then executed,
2015-02-19 10:02:07 +01:00
88c976e16e
progress indicator back.
2015-02-18 19:51:57 -05:00
971381b150
fov lines, check.
2015-02-18 19:41:56 -05:00
3d04af03a3
Merge branch 'develop' into plutoViz
...
Conflicts:
include/openspace/rendering/planets/simplespheregeometry.h
include/openspace/util/powerscaledsphere.h
openspace.cfg
shaders/pscstandard_fs.glsl
src/engine/openspaceengine.cpp
src/rendering/planets/renderableplanet.cpp
src/rendering/renderablefov.cpp
src/rendering/renderabletrail.cpp
src/rendering/renderengine.cpp
src/scenegraph/scenegraph.cpp
2015-02-18 15:52:35 +01:00
383fb1045e
changed michals absolute path into a path my system can use
2015-02-18 11:17:31 +01:00
ba53cf0e1f
added <stdint> include to fix compilation issue with int32_t datatype
2015-02-18 10:49:54 +01:00
86ab940b56
uncommented the advance time line
2015-02-18 09:27:18 +01:00
91195db6a0
Added reasonable size to the default single.xml
...
Added path tokens for spice kernels
2015-02-17 22:14:52 +01:00
f39575a051
Updated Openspace-Data
2015-02-17 21:38:44 +01:00
8a57db4d55
Changed behavior in LuaConsole autocomplete to only autocomplete until the next separator
2015-02-17 21:24:57 +01:00
e99148937d
Bugfixing a crash due to wrong decoding
2015-02-17 21:01:55 +01:00
d439157d4f
Linux compile fix with template specialization
2015-02-17 20:51:25 +01:00
08d4ca9f6b
Correct alignment for the milkyway texture in the RenderableSphere
...
Visual tweaks for RenderableStars
2015-02-17 20:11:17 +01:00
a0fc77a893
Enable the ability to run setting scripts that are executed after the scene has been loaded
2015-02-17 20:10:50 +01:00
3651c64af4
Merge branch 'features/imgui' into develop
2015-02-17 19:04:43 +01:00
f829f72a4c
Added Lua-based GUI for the rest of the implemented properties
2015-02-17 19:04:26 +01:00
49e327e985
Correctly read Lua script for VectorProperties
2015-02-17 19:01:57 +01:00
eb7fefb3c9
fixed Alex' bug!!
...
Added string specialization to template functions for syncbuffer class
2015-02-17 17:51:53 +01:00
9f16d6f2ac
Changing GUI property setting from direct calls to scripting
2015-02-17 15:54:24 +01:00
8e4cb00e5e
Merge remote-tracking branch 'origin/develop' into features/imgui
2015-02-17 15:11:49 +01:00
97d97a8a16
Merge branch 'develop' into features/imgui
2015-02-17 15:11:25 +01:00
5550b0391d
Merge branch 'feature/dome' into develop
2015-02-17 14:42:53 +01:00
Joakim Kilby