Alexander Bock
08061a74e9
Enable ImGui to handle StringProperty type
2015-02-20 16:54:24 +01: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
Alexander Bock
11c4757073
Merge branch 'develop' into plutoViz
2015-02-19 14:45:11 +01:00
Alexander Bock
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
Joakim Kilby
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
Joakim Kilby
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
Joakim Kilby
ba53cf0e1f
added <stdint> include to fix compilation issue with int32_t datatype
2015-02-18 10:49:54 +01:00
Alexander Bock
8a57db4d55
Changed behavior in LuaConsole autocomplete to only autocomplete until the next separator
2015-02-17 21:24:57 +01:00
Alexander Bock
e99148937d
Bugfixing a crash due to wrong decoding
2015-02-17 21:01:55 +01:00
Alexander Bock
d439157d4f
Linux compile fix with template specialization
2015-02-17 20:51:25 +01:00
Alexander Bock
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
Joakim Kilby
eb7fefb3c9
fixed Alex' bug!!
...
Added string specialization to template functions for syncbuffer class
2015-02-17 17:51:53 +01:00
Alexander Bock
8e4cb00e5e
Merge remote-tracking branch 'origin/develop' into features/imgui
2015-02-17 15:11:49 +01:00
Alexander Bock
97d97a8a16
Merge branch 'develop' into features/imgui
2015-02-17 15:11:25 +01:00
Joakim Kilby
7c7b4f1f97
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome
2015-02-17 14:41:02 +01:00
Alexander Bock
a6ebddb8eb
Updated copyright header in all files
2015-02-17 14:20:03 +01:00
Joakim Kilby
5b3742961e
added function for getting un-synchronized position of the camera (only meant to be used on master for calculation of camera matrix and position)
2015-02-17 13:29:45 +01:00
Joakim Kilby
f096d9d9e3
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome
...
Conflicts:
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/interaction/luaconsole.cpp
src/rendering/renderengine.cpp
2015-02-17 12:18:14 +01:00
Joakim Kilby
aa66bdeaa4
added synced versions of shared variables and modified set/get methods to adress the right versions of variables
2015-02-17 11:58:57 +01:00
Joakim Kilby
8f924f7696
added serialize, deserialize, post sync and pre sync functions for script engine
2015-02-17 11:58:03 +01:00
Alexander Bock
862bfd6947
Making most includes in openspaceengine into forward declarations
2015-02-17 10:36:18 +01:00
Alexander Bock
d96dc3884c
Added properties to change the appearance of stars
2015-02-17 09:31:58 +01:00
Alexander Bock
f87fd42075
Merge remote-tracking branch 'origin/feature/milkyway' into develop
2015-02-17 09:22:43 +01:00
Joakim Kilby
1cfabe6a2d
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
2015-02-17 08:25:09 +01:00
Joakim Kilby
52e51b76bf
added initializedata struct
...
It is so far empty but will be used later on for initialization
2015-02-17 08:19:07 +01:00
Alexander Bock
46b2d18c75
Merge branch 'develop' into feature/milkyway
2015-02-17 00:44:38 +01:00
Alexander Bock
7286ba3ded
Added Autocompletion for the LuaConsole (TAB/Shift+TAB)
2015-02-17 00:43:11 +01:00
Alexander Bock
98aeeda24d
Added support for variable transparency in RenderableSphere
...
Created own shaders for RenderableSphere
2015-02-16 23:16:06 +01:00
Alexander Bock
bb5f6e1bca
Renamed member variable of SimpleSphereGeometry from _planet to _sphere
2015-02-16 22:13:03 +01:00
Alexander Bock
17f6d376be
Merge branch 'develop' into feature/milkyway
2015-02-16 21:03:36 +01:00
Alexander Bock
69e0213e79
Added ability to disable shading for RenderablePlanet renderables
2015-02-16 19:23:23 +01:00
Joakim Kilby
a3ff828e91
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
...
Conflicts:
src/engine/openspaceengine.cpp
2015-02-16 08:33:01 +01:00
Alexander Bock
3c4aec0082
Modularize RenderablePlane shader
2015-02-15 23:55:13 +01:00
Alexander Bock
86b754f313
Clean up of LuaConsole class
2015-02-15 17:56:07 +01:00
Alexander Bock
55f7b0fc03
Move 'keys' file from interaction to util
2015-02-15 17:55:44 +01:00
Alexander Bock
f583eaee2a
Started cleanup work on LuaConsole, moved Clipboard functions into Ghoul
2015-02-14 11:37:29 +01:00
Joakim Kilby
c6b358488b
changed sync variables for camera and time classes.
...
added a boolean _timeJumped which is synced and set to true whenever setTime is called.
(Note this is never set to false afterwards unless a call is made to setTimeJumped( bool ) with value false)
2015-02-13 11:02:35 +01:00
Alexander Bock
0de499b643
Jenkins compile fix
2015-02-13 10:15:58 +01:00
Joakim Kilby
e39f3adc18
Merge remote-tracking branch 'origin/develop' into feature/updateSGCT
2015-02-12 14:58:54 +01:00
Joakim Kilby
2b83c19baa
commit to be able to merge
2015-02-12 14:58:40 +01:00
Alexander Bock
a837b59add
First addition of RenderableSphere
2015-02-10 20:19:29 +01:00
Alexander Bock
31ec399faa
More changes on RenderableTrail
2015-02-10 20:18:20 +01:00
Alexander Bock
fd4d6562ad
First cleanup of RenderableTrails
2015-02-10 16:19:12 +01:00
Joakim Kilby
f43cc08dfb
added presync function for engine
2015-02-10 11:34:33 +01:00
Joakim Kilby
a8abfa74bd
Added proper synchronization for mouse controller and camera.
...
Camera class now contains three instances of synched variables. a local copy changed on master. a shared copy only used for sharing in serialize/deserialize. and finally a synched copy never written to except in post sync
2015-02-10 11:34:12 +01:00
Alexander Bock
bb8f7b91ec
Final changes on RenderableStars
2015-02-10 08:55:26 +01:00
Joakim Kilby
47ed14b8d6
Added serialize / deserialize functions for camera.
...
Added proper mutex protected shared versions of synced variables for camera class.
Added a post sync function for camera class (and a call to it in render engine post sync function)
2015-02-09 14:50:56 +01:00
