Commit Graph

308 Commits

Author SHA1 Message Date
Jonathas Costa 9001eb0f96 Merged develop branch into NewAtmosphere branch. 2017-03-30 15:59:20 -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 d7cd3a01a5 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume
Conflicts:
	src/engine/openspaceengine.cpp
2017-03-03 18:08:29 +01:00
Alexander Bock 1689dc4047 Move the PropertyOwner name specification into the constructor and adjust accordingly 2017-03-02 18:25:13 -05:00
Emil Axelsson 442969f2b1 Jenkins compilation fix 2017-03-02 18:50:11 +01:00
Alexander Bock 2f2fa3b031 Update Ghoul repository to have the factory return unique_ptrs
Adjust accordingly
2017-03-01 22:03:48 -05:00
Alexander Bock 4e52f27f9e Remove Dictionary include with forward declarations 2017-03-01 19:20:00 -05:00
Alexander Bock 8fd60ce8e6 - Remove documentation.h include and replace with forward declaration
- Move Documentation struct into documentation namespace
2017-03-01 18:13:15 -05:00
Alexander Bock 6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Jonathas Costa 3c4bf23317 Merged develop into NewAtmosphere branch. 2017-02-27 15:02:02 -05:00
Alexander Bock 283c83e37c Removing code analysis warnings
Start cleaning RenderEngine
2017-02-26 23:45:39 -05:00
Alexander Bock 23ea86949f Updated check_style_guide to test for include guards and copyright
notices
 - Fix include guards
 - Fix copyright header indentation
 - Update copyright years
2017-02-09 23:55:39 -05:00
Alexander Bock 6d9dc2bfeb Fixed include guards
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Alexander Bock 94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Jonathas Costa b179c707e7 Merged develop into NewAtmosphere temporary code. 2017-01-31 14:28:51 -05:00
Jonathas Costa 1bbced144e Mutiple updates to Atmosphere debugging and rendering. 2016-12-15 15:30:25 -05:00
Emil Axelsson 4b688fd149 Move Rotation and Scale factories from base module to OpenSpace core 2016-12-14 14:27:12 +01:00
Alexander Bock dbb599a5fa Separate base module into base and space 2016-12-13 14:43:44 +01:00
Alexander Bock df543f0ec3 Cleanup of license headers
Cleanup of include guards in modules
2016-12-09 12:02:16 +01:00
Alexander Bock 04c6398d6a Fix case dependent kernels in OsirisRex
Fix stitched trail rendering for RenderableTrailTrajectory
Adapt Lua scheduler helper scripts to new Dictionary layout
Make Spice throw exceptions on default again
Enable caching on default for CTX and MOLA data
Add NOAA rt data (commented out in LodEarth)
2016-12-06 18:47:46 +01:00
Alexander Bock 341bc8b105 Merge branch 'develop' into feature/globebrowsing
# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h
2016-12-03 01:32:23 +01:00
Alexander Bock 777e6c628f Change tabs to spaces 2016-12-03 01:21:54 +01:00
Alexander Bock fe436748bf Implementing Translation classes for Keplerian elements as well as two-line element formats (#172) 2016-12-02 15:05:49 +01:00
Alexander Bock af21e40074 Split up scalar, vector, and matrix properties into their own files for improved compile times 2016-11-27 01:17:38 +01:00
Alexander Bock c199d38aac Add setting to SpiceManager that disables exceptions (closing #142)
Disable exceptions on default
2016-11-24 10:57:53 +01:00
Alexander Bock b00595af40 Replacing const std::string with const char* to reduce binary size and initialization costs 2016-11-23 23:52:16 +01:00
Alexander Bock 7ffcf81235 Add visibility setting to the property classes (closing #166) 2016-11-23 23:24:07 +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
Jonathas Costa 6bc5b97728 Merge branch 'develop' into feature/NewAtmosphere 2016-11-17 09:41:03 -05: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
Jonathas Costa 0bd4e0d160 Fixed rederable_fs.glsl changed after broken merging. 2016-11-11 14:49:23 -05:00
Jonathas Costa cf66bc873b Merged develop in NewAtmosphere. 2016-11-11 14:46:14 -05:00
Jonathas Costa 3932826a1a Removed unused atmosphere shaders from base module. 2016-11-11 11:10:44 -05:00
Alexander Bock c469be26c3 Make toggling the performance measurements a BoolProperty of RenderEngine 2016-11-06 02:00:42 +01:00
Jonathas Costa c7417446e8 Fixed bug in shaders. Improved code, and comments. 2016-11-01 09:00:43 -04: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
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 4b9bed3b21 Make Translation, Rotation, and Scaling available as Properties in SceneGraphNode 2016-10-28 11:52:44 +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