Commit Graph

770 Commits

Author SHA1 Message Date
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
ba53cf0e1f added <stdint> include to fix compilation issue with int32_t datatype 2015-02-18 10:49:54 +01:00
Alexander Bock
f39575a051 Updated Openspace-Data 2015-02-17 21:38:44 +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
08d4ca9f6b Correct alignment for the milkyway texture in the RenderableSphere
Visual tweaks for RenderableStars
2015-02-17 20:11:17 +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
Alexander Bock
3651c64af4 Merge branch 'features/imgui' into develop 2015-02-17 19:04:43 +01:00
Alexander Bock
f829f72a4c Added Lua-based GUI for the rest of the implemented properties 2015-02-17 19:04:26 +01:00
Alexander Bock
49e327e985 Correctly read Lua script for VectorProperties 2015-02-17 19:01:57 +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
9f16d6f2ac Changing GUI property setting from direct calls to scripting 2015-02-17 15:54:24 +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
5550b0391d Merge branch 'feature/dome' into develop 2015-02-17 14:42:53 +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
7764553a35 fixing bugs caused by merge 2015-02-17 13:30:45 +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
eafa4e2fe6 changed camera update (for object following) is now done in orbit function of interactionhandler 2015-02-17 12:00:58 +01:00
Joakim Kilby
525b8a4de3 LUA consola now queues scripts instead of runnings them 2015-02-17 12:00:19 +01:00
Joakim Kilby
0f9476519c changed into average delta time instaed of delta time,
added calls to pre/pro sync and serialize/deserialize of scriptengine and time
2015-02-17 11:59:52 +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
234b46dbdc Apply newer Ghoul version 2015-02-17 11:19:51 +01:00
Alexander Bock
e30ca93f69 Enabled multicore compilation on default
Added newest Ghoul version
2015-02-17 11:13:06 +01:00
Alexander Bock
e712a1e781 Added missing include for Linux compile 2015-02-17 10:57:10 +01:00
Alexander Bock
a2e58f8f7c Added missing include for Linux compile 2015-02-17 10:45:27 +01:00
Alexander Bock
64db01420c Added missing include for Linux compile 2015-02-17 10:40:10 +01:00
Alexander Bock
862bfd6947 Making most includes in openspaceengine into forward declarations 2015-02-17 10:36:18 +01:00
Alexander Bock
26e69b2b2c Updated openspace-data version 2015-02-17 09:32:57 +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
b2a94b2241 Merge branch 'develop' into feature/dome 2015-02-17 08:48:22 +01:00
Joakim Kilby
d1a4a3c2da Merge branch 'feature/updateSGCT' into develop 2015-02-17 08:28:09 +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
79d8bb40c5 added preSynchronization call to renderEngine in openspace engine.
added call to updateCamera for current focus node. (Note that this causes master to be 1 frame ahead of slaves and should be changed)
2015-02-17 08:21:49 +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
1a2c882eb0 Another parameter fix for RenderableStars 2015-02-16 21:02:50 +01:00
Alexander Bock
69e0213e79 Added ability to disable shading for RenderablePlanet renderables 2015-02-16 19:23:23 +01:00
Alexander Bock
92d5d2ee3c Parameter tuning for RenderableStars 2015-02-16 19:12:05 +01:00
Alexander Bock
6791fe52f7 Another fix for RenderableStars; to be replaced when the ScaleGraph is in place 2015-02-16 19:04:42 +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