Commit Graph

1193 Commits

Author SHA1 Message Date
Matthew Territo 3a5635d2a8 Merge pull request #312 from OpenSpace/feature/launcherconfigs
Merge feature/launcherconfigs
2017-05-22 00:03:59 -06:00
Alexander Bock f22be1273a Fix property visibility to correctly ignore hidden properties 2017-05-19 16:57:12 -04:00
Matthew Territo 5086d1e5ea Merge branch 'master' into feature/launcherconfigs 2017-05-19 11:41:22 -06:00
Emil Axelsson 05a541aacb Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/luaconsole 2017-05-18 10:17:37 +02:00
Matthew Territo 0a1101d0e4 Missing Destructors: Issue #307 (#308)
* Adding empty destructor for Scene.

* RenderEngine Destructor empty/no longer default

* Create empty ~ScreenLog
2017-05-18 10:13:20 +02:00
Emil Axelsson 4fcb92385c Fix inconsistent order of members in header file and initialization 2017-05-17 21:28:20 +02:00
Emil Axelsson 1eee40887d Tweak animation and appearance of lua console + Remove some duplicate code 2017-05-17 21:21:51 +02:00
Alexander Bock 11c3e29ca0 Rendering a cursor to show the current text entry state 2017-05-17 11:27:43 -04:00
Alexander Bock cefedabd84 More work on LuaConsole 2017-05-17 10:49:28 -04:00
Alexander Bock 65d284efc7 More work on LuaConsole
Don't have the console consume function keys
2017-05-16 16:13:52 -04:00
Alexander Bock 38e2521743 Some more work on new LuaConsole
Add Inconsolata font
2017-05-16 14:47:44 -04:00
Alexander Bock 2e38f29eb0 Enable color picking for vec3 and vec4 properties marked as color properties 2017-05-16 14:47:17 -04:00
Alexander Bock 4568654531 Merge branch 'master' into feature/luaconsole 2017-05-15 15:29:51 -04:00
Alexander Bock f4ad2ce4c2 More include file cleanup 2017-05-15 15:27:59 -04:00
Alexander Bock 302fa06067 More code cleanup 2017-05-15 14:39:48 -04:00
Alexander Bock 2c54e3675d Some more work on the LuaConsole 2017-05-15 14:34:35 -04:00
Alexander Bock 3d9375277b Adding LuaConsole to global property namespace
Initial reworking of LuaConsole look and feel
2017-05-14 12:47:10 -04:00
Matthew Territo 92f55f24d6 Merge remote-tracking branch 'origin/master' into feature/launcherconfigs
# Conflicts:
#	ext/sgct
#	openspace.cfg
2017-05-12 15:40:06 -06:00
Alexander Bock b660a84464 Code cleanup 2017-05-11 18:51:42 -04:00
Alexander Bock 5ebf2a4913 Rename Documented to DocumentationGenerator 2017-05-11 18:16:30 -04:00
Alexander Bock 17fe85afba Add documentation 2017-05-11 18:01:36 -04:00
Alexander Bock d597750398 Some more refactoring of the documentation feature 2017-05-11 13:56:06 -04:00
Alexander Bock ddc9ef1bc5 Add abstract class to handle Handlebar-based documentation file generation
Apply Documented class to the InteractionHandler
Update Ghoul
2017-05-09 18:06:14 +01:00
Alexander Bock 701b3afb2c Clean up interdace of Mission class 2017-05-09 11:17:14 +01:00
Alexander Bock 63d607281a Update SGCT repository
Add property to toggle date rendering independent from rendering statistics
2017-05-09 10:30:35 +01:00
Alexander Bock da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -04:00
Alexander Bock 0ff91e896b Fix style guide check
Fix style guide in files
2017-04-24 15:31:32 -04:00
Alexander Bock bf16c76add Feature/opengldebug (#290)
* Add InLIstVerifier

* Initial implementation of OpenGL debug messages

* Moving functionality into Ghoul

* Compile fix

* Update Ghoul repository
Make use of the moved OpenGL debug functions

* Update Ghoul to fix GCC and Clang compiler errors

* Add unit test for IntListVerifier
2017-04-18 14:29:23 -04:00
Emil Axelsson 4b38b33e18 Clean up code for planet radius and bounding sphere calculation (#289)
- Remove some power scaled coordaintes.
- Remove spice dependency from sphere geometry.
- Remove dead code.
2017-04-18 09:58:27 +02:00
Alexander Bock dd32a812e1 Change tabs to spaces 2017-04-17 15:00:15 -04:00
Alexander Bock c53bbf14be Add property and configuration option to disable the scene tag on a master node (closing #247) 2017-04-17 10:55:37 -04:00
Emil Axelsson 5589de995b Feature/domecasting (#288)
* Improve dome casting feature. Add basic GUI for domecasting.

* Reenable remote scripting from Lua console. Add more settings and debug information for domecasting.

* Do not try to reconnect to parallel connection forever

* Fix interpolation bug for dome casting with globe browsing interaction mode

* Show parallel connection properties in correct GUI

* Fix bug for dome casting with globe browsing interaction mode. Add property for time tolerance.

* Update header file

* Clean up dome casting code

* Remove obsolete lua functions from ParallelConnection.
2017-04-13 23:16:00 +02:00
Gene Payne 0a50043753 Merge pull request #285 from OpenSpace/feature/grouping
Feature/grouping
2017-04-13 13:31:07 -06:00
Alexander Bock 76aed0578c Feature/virtualproperty (#286)
* Add virtual property owner to OpenSpaceEngine

* Ability to add and remove virtual properties

* Do not try to render empty PropertyOwner name
Compile fix for iswaComponent
Add example in default.scene

* Delete virtual properties also in the OpenSpaceEngine dtor

* Make RenderablePlanet not crash if the nighttextures are not present

* - Add VirtualPropertyManager to manage ownership of virtual properties
- Only execute regex when it was necessary
-
2017-04-13 14:38:28 -04:00
Gene Payne 4a312c70b8 Merge branch 'master' into feature/grouping 2017-04-13 11:23:15 -06:00
GPayne 7a7fef239c Made changes according to pull request feedback 2017-04-13 11:12:26 -06:00
Alexander Bock cba54170a4 Updating version number in preparation for Earth Day event 2017-04-12 14:21:13 -04:00
Alexander Bock bef337c0eb Minor various fixes 2017-04-12 14:21:02 -04:00
Emil Axelsson a108ee1f8a Fix requests from code review 2017-04-04 14:25:39 +02:00
GPayne bcdd906ad7 Some minor changes and added tag support to screenspacerenderable 2017-03-31 15:14:00 -06:00
GPayne ae2cb222b0 Switched to using propertyowners in grouping, and group/tag name in group syntax 2017-03-21 11:35:09 -06:00
Emil Axelsson c361e1aa03 Replace forward declarations with include statements to fix compilation on linux and osx 2017-03-17 09:57:24 +01:00
GPayne 9b7e2c6b38 Initial commit of tags added to properties to enable grouping. 2017-03-16 22:29:43 -06:00
Emil Axelsson f3931551bd Clean up scene loading 2017-03-16 17:06:33 +01:00
Emil Axelsson b06864eefe Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-03-16 16:35:29 +01:00
Emil Axelsson ca6348194e Clean up scene loading 2017-03-14 13:40:18 +01:00
Alexander Bock ea4d9c8e44 Cleanup of RenderableCrawlingLine
Cleanup of RenderableFOV
Add function to SpiceManager that does not return the light travel time
2017-03-12 16:05:14 -04:00
Alexander Bock dc40812df9 Fix warnings in code
Make OpenSpaceTest not flood the console on Jenkins
Fix Vec3 property to signal change correctly
Let RenderablePlanetProject correctly reload base map and height map
Update Ghoul
2017-03-11 11:26:25 -05:00
Alexander Bock bcf92804b6 Updating Ghoul repository
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -05:00
Emil Axelsson 92df9caf5a Clean up scene loading 2017-03-07 16:33:56 +01:00