Commit Graph

1581 Commits

Author SHA1 Message Date
kalbl
a617261bde Solve conflict 2016-11-23 13:34:38 +01:00
kalbl
5a6b076507 Solve compilation error 2016-11-23 13:01:44 +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
db923209c3 Show PerformanceMeasurements independently of the Gui visibility
Replace settings in performance measurements with properties
2016-11-22 10:16:17 +01:00
Alexander Bock
f711e192fb Replace explicit Lua commands to toggle onscreen gui with a global property 2016-11-22 09:49:22 +01:00
Alexander Bock
8ed9d762dd Cleanup RenderableStars 2016-11-16 22:06:20 +01:00
Alexander Bock
cd9f8b30e0 Removing Spice dependency from RenderableModel (closing #33) 2016-11-16 22:05:56 +01:00
Alexander Bock
789f931979 Change 'addImage' to add the image when enter is pressed
Automatically show performance window when performance is measured
Cleanup of GUI module
2016-11-15 21:56:38 +01:00
Alexander Bock
3831e406cf Convert native path tokens to Lua supported tokens for adding a screenspace image (closing #168) 2016-11-14 18:52:57 +01:00
Alexander Bock
e543163612 Updating Ghoul reference
Adapt to the API changes
2016-11-14 14:45:26 +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
Jonathas Costa
3932826a1a Removed unused atmosphere shaders from base module. 2016-11-11 11:10:44 -05:00
kalbl
d914261bd2 Solve conflict 2016-11-08 00:08:28 +01:00
kalbl
a411ba4347 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-11-07 22:38:24 +01:00
Erik Broberg
ae6d27e474 TileIOResult -> RawTile, PreprocessData -> TileMetaData 2016-11-07 17:03:06 +01:00
Alexander Bock
f99513a976 Remove the km to m conversion in RenderableFoV (closing #156) 2016-11-07 16:15:28 +01:00
Alexander Bock
4caa3d25ba Add documentation to the rosetta scene keyboard bindings 2016-11-07 10:34:19 +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
kalbl
96ccb550d5 Update Documentation for culling. 2016-11-01 17:50:31 +01:00
Alexander Bock
fd98f311d3 Some cleanup of scene files
Exceptions in preInitialization scripts no long crash the application
2016-10-31 11:43:36 +01:00
kalbl
f009272f6b Comment away error printing in debug renderer. 2016-10-30 22:48:54 +01:00
Alexander Bock
4597bde05a Cleaned up RenderableRings
Some minor performance improvements
2016-10-29 22:15:17 +02:00
Alexander Bock
4b25b486cf Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-10-29 22:14:28 +02:00
Jonathas Costa
420f56355a Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-10-29 13:43:21 -04:00
Jonathas Costa
2ca0bfd798 Removed Atmosphere stuff from RenderablePlanet. 2016-10-29 13:43:13 -04:00
Alexander Bock
64cb9bce0d RenderableRings's VBO only needs to contain two values for size 2016-10-29 17:45:18 +02:00
Alexander Bock
c7809cb6cf Some initial work to make OpenGL 3.3 work
Make OpenSpace not crash if the FontRenderer shader cannot be compiled
2016-10-29 16:55:02 +02:00
Alexander Bock
96e27913ca Add documentation to RenderableRings
Change Size to be specified in meters instead of powerscaled scalars
2016-10-29 15:24:39 +02:00
kalbl
156c6bab41 Merge branch 'develop' into feature/globebrowsing 2016-10-29 14:12:39 +02:00
Alexander Bock
8b684905e9 Make shadows on Saturn rings work again 2016-10-29 13:40:47 +02:00
Alexander Bock
d6edfba60c Fixing the orientation of the Saturn moons 2016-10-29 11:40:35 +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
cfd71d6c8d Sort properties by name in the GUI 2016-10-28 11:46:14 +02:00
Emil Axelsson
f8bab90d64 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into develop 2016-10-28 10:27:35 +02:00
Emil Axelsson
cb3ff96e1a Pass window size as uniform instead of shader program constant. Fixes #143 2016-10-28 10:26:23 +02:00
Alexander Bock
708856dbf4 Fix double precision rendering for RenderablePlanet 2016-10-28 00:21:04 +02:00
kalbl
33618cc5c9 Add documentation to culling 2016-10-27 21:53:54 +02:00
kalbl
708ddd8400 Clean up and document Chunk code 2016-10-27 21:51:03 +02:00
Alexander Bock
18b8aab898 Changes in ProjectionComponent initialization
- Remove parsing function
  - Make ProjectionComponent accept sub-dictionary
Remove "Rotation" key-value from RenderableModelProjection
  - Information moved into RenderableFOV to do conversion between object and frame
Changes in mod files to reflect ProjectionComponent and RenderableModelProjection changes
Added Documentation to
  - RenderablePlanetProjection
  - RenderableModelProjection
  - ProjectionComponent
  - PlanetGeometry
  - ModelGeometry
2016-10-27 21:45:49 +02:00
kalbl
4548394f1c Clean up and document functions in globes. 2016-10-27 15:29:41 +02:00
kalbl
c3a63cedfb Clean up and fix comments. 2016-10-27 12:13:43 +02:00
kalbl
6e68472c66 Remove unused data struct TileProviderInitData and clean up. 2016-10-27 11:31:43 +02:00
kalbl
b1a3814c37 Make distance switch distance dependent on globe radius. 2016-10-26 23:08:47 +02:00
kalbl
9117599043 Add check for key Layers 2016-10-26 22:15:07 +02:00
Erik Broberg
9f7e1e05b2 Merge in feature/globebrowsing 2016-10-26 19:16:37 +02:00
Erik Broberg
c4bdd12e0a Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-10-26 19:09:19 +02:00
Erik Broberg
6104b1fb58 Change ColorTextures to ColorLayers etc 2016-10-26 18:49:51 +02:00