Commit Graph

1082 Commits

Author SHA1 Message Date
kalbl
a617261bde Solve conflict 2016-11-23 13:34:38 +01:00
Alexander Bock
683fc8ee53 Pr/trails (#170)
* Implement new RenderableTrails as abstract base class
  - Implement RenderableTrailsOrbit and RenderableTrailsTrajectory as concrete instances
Remove old RenderableTrails and RenderableTrailsNew classes
Adapt mod files to the new structure

* Addressed Pull Request comments
2016-11-23 10:35:46 +01:00
Alexander Bock
92676c107f Remove wrong type of whitespace
Remove circular header dependency
Increase the time setting of the GUI
2016-11-12 11:16:15 +01:00
kalbl
d914261bd2 Solve conflict 2016-11-08 00:08:28 +01:00
Alexander Bock
70af0f0073 Add an option to the configuration manager to append the scene name to the cache directory (closing #159) 2016-11-07 13:39:01 +01:00
Alexander Bock
572257d3b0 Move the rendertime into a property and remove the toggleFrametimeType
Make OptionProperty work in Radio mode
Rename DROPDOWN and RADIO to Dropdown and Radio
2016-11-06 22:15:52 +01:00
Alexander Bock
c469be26c3 Make toggling the performance measurements a BoolProperty of RenderEngine 2016-11-06 02:00:42 +01:00
Alexander Bock
85f298a659 Add documentation to openspace.bindKeys script 2016-11-05 16:23:05 +01:00
Alexander Bock
c880ee421a Make OpenSpaceModule able to report their version number 2016-10-29 23:13:37 +02:00
Alexander Bock
4597bde05a Cleaned up RenderableRings
Some minor performance improvements
2016-10-29 22:15:17 +02:00
kalbl
156c6bab41 Merge branch 'develop' into feature/globebrowsing 2016-10-29 14:12:39 +02:00
Alexander Bock
ed4b8c9fa8 Store Translation, Rotation, and Scaling Performance measurements
If no special sorting is requested in Performance GUI, sort by name
2016-10-28 12:52:54 +02:00
Erik Broberg
05687abb65 Add documentation to GPU structs and small refactor 2016-10-28 12:13:25 +02:00
Alexander Bock
4b9bed3b21 Make Translation, Rotation, and Scaling available as Properties in SceneGraphNode 2016-10-28 11:52:44 +02:00
Alexander Bock
4ce3be9e8c Add a Verifier for a list of Strings to replace a more cumbersome expression 2016-10-27 15:50:29 +02:00
Alexander Bock
db4524d2ac - Restructure Rotation classes to make the base class store the rotation to remove an additional virtual function
- Add Matrix verifiers
- Add documentation to StaticRotation and SpiceRotation
2016-10-26 16:47:42 +02:00
Erik Broberg
a050a58981 Solve merge conflicts 2016-10-25 19:05:37 +02:00
Erik Broberg
9eb805a39d Merge 2016-10-25 18:30:15 +02:00
kalbl
dddb85d538 Solve build error when globe browsing module is inactive. 2016-10-24 10:24:42 +02:00
Alexander Bock
317ecad9ac Potential fix for High-DPI and manual framebuffer sizes by using SGCT window scaling 2016-10-23 22:55:26 +02:00
Erik Broberg
1df163a3b9 Intermediate commit: Mapping ChunkTilePiles between CPU and GPU. Height not working 2016-10-21 13:49:44 +02:00
kalbl
6ca7cc997c Merge branch 'feature/retina' into feature/globebrowsing 2016-10-20 21:04:18 +02:00
kalbl
2f32e67b87 Set interaction to properly depend on delta time. 2016-10-20 18:37:18 +02:00
Erik Broberg
2af1731583 Simple mapping of structs on CPU to GPU. See gpuChunkTilePile 2016-10-20 10:17:40 +02:00
Erik Broberg
979bf1f992 Add class GPUTexture 2016-10-19 11:30:31 +02:00
Erik Broberg
0476c32994 Add templated class GPUData 2016-10-18 19:05:40 +02:00
Alexander Bock
542f92e768 Add a fix to the window resolution for Retina displays
Add a new setting to the ConfigurationManager that can specify whether to scale the onscreen text by window size or resolution
2016-10-18 18:52:30 +02:00
kalbl
7f62bd7206 Create namespace globebrowsing. 2016-10-18 15:40:27 +02:00
kalbl
c516dc5b25 Solve conflict in scripts/common.lua 2016-10-11 17:51:57 +02:00
Emil Axelsson
6c5c8d6839 Make gcc happy 2016-10-10 17:36:55 +02:00
Emil Axelsson
5e2ea10bcd Add http proxy support for GDAL 2016-10-07 20:42:32 +02:00
kalbl
6ef366afdd Add smooth transition when resetting camera direction. 2016-10-05 01:47:49 +02:00
Emil Axelsson
b448b0ec5e Move all network namespace members into the openspace namespace 2016-09-30 14:13:36 +02:00
Emil Axelsson
4f61479190 Move network status into parallel connection class 2016-09-30 13:36:35 +02:00
Emil Axelsson
14a42b1bd8 Potentially fix compile errors 2016-09-30 13:06:27 +02:00
Emil Axelsson
0230acb005 Merge branch 'feature/parallelconnection' into develop
Conflicts:
	src/interaction/interactionhandler.cpp
2016-09-30 11:01:37 +02:00
kalbl
831664c032 Update all interaction to be possible without a middle mouse button. 2016-09-29 22:20:35 +02:00
Emil Axelsson
ea1ca95df9 improve look and feel of scenegraph node property documentation 2016-09-29 13:58:18 +02:00
Emil Axelsson
15e83394c3 improve look and feel of the html documentation 2016-09-27 14:45:26 +02:00
Alexander Bock
26f4975b17 Clear up MissionManager
Consolidate core class registrations
2016-09-26 18:46:20 +02:00
Alexander Bock
9892e0c37d Continuing mission cleanup 2016-09-26 15:33:46 +02:00
Alexander Bock
7ddccd8172 Rename Ephemeris files to Translation 2016-09-26 13:49:17 +02:00
Alexander Bock
a688a1eee9 Rename Ephemeris to Translation 2016-09-26 13:34:22 +02:00
Alexander Bock
cc9a72a60b Clean up and add documentation to Mission
Clean up and add documentation to MissionManager
Clean up and add documentation to TimeRange

Prevent a crash in DocumentationEngine when ReferencingVerifier could not be found
2016-09-25 14:25:01 +02:00
Alexander Bock
3d894c38e3 Some work on cleaning up Missions 2016-09-24 20:28:03 +02:00
Alexander Bock
49308c658c Moved Missions from NewHorizons module into core 2016-09-24 19:32:42 +02:00
Alexander Bock
616a115536 Adding a Lua function to manually enable/disable the frame synchronization 2016-09-24 14:55:20 +02:00
Alexander Bock
8cf39cdd29 Only enable syncing after the first frame due to high initialization load 2016-09-24 09:07:15 +02:00
Alexander Bock
e1b2877525 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-09-23 23:25:17 +02:00
Alexander Bock
3dce9f0f21 Add DeprecationVerifier to the list of available verifiers
Add unit tests for DeprecationVerifier
2016-09-23 23:24:03 +02:00