Commit Graph

918 Commits

Author SHA1 Message Date
Alexander Bock
c62a766b2f Adding Lua function to toggle the SGCT render information overlay 2015-02-24 10:45:26 +01:00
Alexander Bock
02be52e8c7 OpenGL 4.3 -> OpenGL 4.2 2015-02-24 10:03:32 +01:00
Alexander Bock
14144bbad3 Add Gui component for manipulating time 2015-02-23 23:01:57 +01:00
Alexander Bock
45c148b2c8 Added error checking codes to SpiceManager
Changed method to return instrument visibility by reference and used return value for errors
2015-02-23 21:36:37 +01:00
Alexander Bock
7f6d894866 Fixed more gcc and Cppcheck warnings 2015-02-23 20:07:57 +01:00
Alexander Bock
f59c9819c4 Fixing gcc warnings 2015-02-23 19:35:47 +01:00
Alexander Bock
f63fb32379 Addressing more CppCheck warnings 2015-02-23 19:22:45 +01:00
Alexander Bock
66aea3df35 Added suppressions support file for cppcheck 2015-02-23 19:15:27 +01:00
Alexander Bock
fb2c99b5ed Removed cppcheck warnings
Removed unused Interface file
2015-02-23 19:08:15 +01:00
Alexander Bock
ec9010a6e9 Using new openspace-data 2015-02-23 18:49:01 +01:00
Alexander Bock
70eb48ba50 Remove warning that would be thrown if cache directory did not exist 2015-02-23 18:19:11 +01:00
Alexander Bock
78ab23602f Moved tinyobjloader from util into submodule of Ghoul 2015-02-23 18:08:28 +01:00
Alexander Bock
3086cedcd2 Added missing version file 2015-02-23 17:20:36 +01:00
Alexander Bock
3bf577d04d Add OpenSpace version information
Make info text in WaveFrontGeometry more useful
2015-02-23 17:14:01 +01:00
Alexander Bock
561e18d748 Fix spelling mistake 2015-02-23 16:49:58 +01:00
Alexander Bock
74a7a3acc4 Added temporary GUI to switch between coordinate systems 2015-02-23 16:49:39 +01:00
Alexander Bock
a79f65a288 Added new GuiComponent to change origin 2015-02-23 16:43:13 +01:00
Alexander Bock
957495d46f Merge remote-tracking branch 'origin/plutoViz' into develop 2015-02-23 16:13:00 +01:00
Michal Marcinkowski
ee81579f96 Adding changes for rudimental target switching + correct hong kang playbook 2015-02-23 10:02:19 -05:00
Alexander Bock
b6e0bd1043 Added interaction speed modifiers/inverters
Disable cotire
Enable Xcursor and Xinerama libraries on Linux builds
2015-02-23 15:58:05 +01:00
Michal Marcinkowski
175874adc7 Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
Conflicts:
	src/rendering/model/wavefrontgeometry.cpp
2015-02-23 09:57:26 -05:00
Michal Marcinkowski
770ee9212f adding changes for rudimental target switching, needs work. 2015-02-23 09:56:29 -05:00
Alexander Bock
3ba9cbdb96 Linux compile fix 2015-02-23 14:18:21 +01:00
Alexander Bock
24aadf83a3 Linux compile fix
Added Properties.txt to gitignore list
2015-02-23 14:06:08 +01:00
Alexander Bock
37b48e6ff1 Linux compile fix 2015-02-23 13:32:31 +01:00
Alexander Bock
cc331a7496 Linux compile fix 2015-02-23 13:08:14 +01:00
Alexander Bock
d4ccd88251 Linux compile fix 2015-02-23 11:51:21 +01:00
Alexander Bock
9af91fa7d9 Only request position update in RenderableModel if a spice target is set
Added code in Wavefrontgeometry to deal with ill-formed obj files
2015-02-23 11:00:39 +01:00
Alexander Bock
34ff3c6018 More changes to RenderableStars using the AMNH test target
Removed superfluous properties of RenderableStars
Removed specialized settings file
2015-02-22 23:51:26 +01:00
Alexander Bock
a7bd6319db Adding 'property' prefix to subowner methods in PropertyOwner
Added function for writing documentation of properties
2015-02-22 22:05:25 +01:00
Alexander Bock
5be1c4163f Merge branch 'develop' into plutoViz 2015-02-22 21:15:22 +01:00
Michal Marcinkowski
73baceadaa Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz 2015-02-22 13:11:03 -05:00
Michal Marcinkowski
cc65ce1167 changing obj loader to tinyobj 2015-02-22 13:10:47 -05:00
Alexander Bock
9eedd7d895 Fix error with missing variable initialization 2015-02-21 00:20:45 +01:00
Alexander Bock
bdd93b22bd Merge branch 'plutoViz' into develop 2015-02-20 22:35:04 +01:00
Alexander Bock
c29555b530 Set new default values for star rendering 2015-02-20 22:16:44 +01:00
Alexander Bock
5046b7447e Removed logging if a script is executed
More tweaking for RenderableStars
2015-02-20 21:37:48 +01:00
Alexander Bock
3c72ef8c1c Updated star rendering once more
Added keys to fade rendering to black and restore
2015-02-20 21:02:12 +01:00
Alexander Bock
9a34ffdfa9 Merge branch 'feature/stars' into plutoViz 2015-02-20 20:47:10 +01:00
Joakim Kilby
d520bdd8a1 scriptsync hotfix. all received scripts are now executed once received instead of one per frame. 2015-02-20 18:09:05 +01:00
Alexander Bock
1fda1d38db Merge branch 'plutoViz' into feature/stars 2015-02-20 16:56:15 +01:00
Joakim Kilby
cf74d346da Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz 2015-02-20 16:55:03 +01:00
Alexander Bock
552f10b52e Merge branch 'develop' into feature/stars 2015-02-20 16:54:40 +01:00
Joakim Kilby
ea2017e11c Introduced fadeIn and fadeOut functionality via scripting. 2015-02-20 16:54:30 +01:00
Alexander Bock
08061a74e9 Enable ImGui to handle StringProperty type 2015-02-20 16:54:24 +01:00
Alexander Bock
2d7ceed902 More work on stars 2015-02-20 16:53:50 +01:00
Alexander Bock
4607c347a1 Merge branch 'feature/stars' into plutoViz 2015-02-20 14:00:19 +01:00
Alexander Bock
3c67788300 Disable HTML log on default
Restore default.scene
2015-02-20 13:57:56 +01:00
Alexander Bock
bd69db9e6d More work on fixing of RenderableStars 2015-02-20 13:56:46 +01:00
Alexander Bock
ec1344d3b7 One more small step towards working stars 2015-02-20 11:22:38 +01:00