mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
851 Commits 82 Branches 46 Tags
7b65be683954d3cd454b0ae7c05270fe85668933
Commit Graph

646 Commits

Author SHA1 Message Date
Joakim Kilby
4487bc3500 Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz 2015-02-19 15:41:21 +01:00
Joakim Kilby
26595edc90 updates to matrix calculations 2015-02-19 15:40:08 +01:00
Joakim Kilby
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
Joakim Kilby
c94a287cd2 changed to relative path for playbook 2015-02-19 15:20:14 +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
b85c47a3f9 Fixed a bug where program crashed during on-screen prints due to argument missmatch 2015-02-19 10:30:34 +01:00
Joakim Kilby
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
Joakim Kilby
24d8f8c41e Bug fixes 2015-02-19 10:04:02 +01:00
Joakim Kilby
d913132852 Changes to pointer usage in these files. 2015-02-19 10:02:55 +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
Michal Marcinkowski
88c976e16e progress indicator back. 2015-02-18 19:51:57 -05:00
Michal Marcinkowski
971381b150 fov lines, check. 2015-02-18 19:41:56 -05: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
383fb1045e changed michals absolute path into a path my system can use 2015-02-18 11:17:31 +01:00
Joakim Kilby
86ab940b56 uncommented the advance time line 2015-02-18 09:27:18 +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
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
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
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
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
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
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
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
Alexander Bock
92d5d2ee3c Parameter tuning for RenderableStars 2015-02-16 19:12:05 +01:00