eb7fefb3c9
fixed Alex' bug!!
...
Added string specialization to template functions for syncbuffer class
2015-02-17 17:51:53 +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
7c7b4f1f97
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome
2015-02-17 14:41:02 +01:00
a6ebddb8eb
Updated copyright header in all files
2015-02-17 14:20:03 +01:00
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
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
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
8f924f7696
added serialize, deserialize, post sync and pre sync functions for script engine
2015-02-17 11:58:03 +01:00
862bfd6947
Making most includes in openspaceengine into forward declarations
2015-02-17 10:36:18 +01:00
d96dc3884c
Added properties to change the appearance of stars
2015-02-17 09:31:58 +01:00
f87fd42075
Merge remote-tracking branch 'origin/feature/milkyway' into develop
2015-02-17 09:22:43 +01:00
1cfabe6a2d
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
2015-02-17 08:25:09 +01:00
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
46b2d18c75
Merge branch 'develop' into feature/milkyway
2015-02-17 00:44:38 +01:00
7286ba3ded
Added Autocompletion for the LuaConsole (TAB/Shift+TAB)
2015-02-17 00:43:11 +01:00
98aeeda24d
Added support for variable transparency in RenderableSphere
...
Created own shaders for RenderableSphere
2015-02-16 23:16:06 +01:00
bb5f6e1bca
Renamed member variable of SimpleSphereGeometry from _planet to _sphere
2015-02-16 22:13:03 +01:00
17f6d376be
Merge branch 'develop' into feature/milkyway
2015-02-16 21:03:36 +01:00
69e0213e79
Added ability to disable shading for RenderablePlanet renderables
2015-02-16 19:23:23 +01:00
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
3c4aec0082
Modularize RenderablePlane shader
2015-02-15 23:55:13 +01:00
86b754f313
Clean up of LuaConsole class
2015-02-15 17:56:07 +01:00
55f7b0fc03
Move 'keys' file from interaction to util
2015-02-15 17:55:44 +01:00
f583eaee2a
Started cleanup work on LuaConsole, moved Clipboard functions into Ghoul
2015-02-14 11:37:29 +01:00
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
0de499b643
Jenkins compile fix
2015-02-13 10:15:58 +01:00
e39f3adc18
Merge remote-tracking branch 'origin/develop' into feature/updateSGCT
2015-02-12 14:58:54 +01:00
2b83c19baa
commit to be able to merge
2015-02-12 14:58:40 +01:00
a837b59add
First addition of RenderableSphere
2015-02-10 20:19:29 +01:00
31ec399faa
More changes on RenderableTrail
2015-02-10 20:18:20 +01:00
fd4d6562ad
First cleanup of RenderableTrails
2015-02-10 16:19:12 +01:00
f43cc08dfb
added presync function for engine
2015-02-10 11:34:33 +01:00
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
bb8f7b91ec
Final changes on RenderableStars
2015-02-10 08:55:26 +01:00
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
32a56085d9
Added a delta time member variable to openspace engine and changed how dt is calculated.
...
it is now averaged over two frames instead of being just dt between two frames. This gives more stability
2015-02-09 13:52:00 +01:00
fe0cd2c130
Added call to update of MouseController in update function.
...
Added distance and orbit functions.
modified setRotation function to actually set rotation of camera (was empty)
2015-02-06 11:22:34 +01:00
f7171e1936
Added update function for all mouse controller objects.
...
Added OrbitalMouseController class
2015-02-06 11:21:02 +01:00
8ebd2e4d71
More code cleanup of RenderableFieldlines
2015-01-21 15:13:16 +01:00
f752221772
Added Vec4Property to imgui
2015-01-21 15:12:54 +01:00
d6a02140ea
More RenderableFieldlines code cleanup
2015-01-21 01:44:56 +01:00
f72d151c6c
Initial changes to RenderableFieldlines
2015-01-21 00:42:33 +01:00
6b164f0b36
Added camera offset support
2015-01-06 12:43:16 +01:00
9f2502c410
More work switching over to Lua script processing of Properties
2014-12-19 14:58:47 +01:00
7007353687
More work on GUI components
2014-12-19 13:17:42 +01:00
cd012548af
Intermediate work on making imgui into components
2014-12-18 19:15:57 +01:00
55a3c43db4
Move imgui file to its own folder
2014-12-18 17:21:20 +01:00
e45813dd91
Add stepping value into Property description
2014-12-18 13:46:18 +01:00
7cd1374cdb
Added description for OptionProperty
2014-12-17 18:52:01 +01:00
Joakim Kilby