Commit Graph

67 Commits

Author SHA1 Message Date
Jonathas Costa 758ee8bd6d Pull request changes. 2017-08-15 18:15:56 -04:00
Jonathas Costa a55110e286 Merged master info NewAtmosphere. 2017-07-27 17:13:42 -04:00
Alexander Bock ce034ccc96 Remove startup warnings 2017-07-26 16:46:20 -04:00
Alexander Bock 51e1541cf1 Fix static initialization fiasco with touch input
Restore backwards compatibility of mod files
Provide better feedback about specification errors
2017-07-26 16:12:13 -04:00
Alexander Bock dc79a94142 Remove warnings
Update SGCT repository
Update Ghoul repository
2017-07-26 11:59:48 -04:00
Alexander Bock 53489b5302 More documentation work 2017-07-25 23:44:09 -04:00
Alexander Bock d95576077b More work on documentation 2017-07-25 18:06:55 -04:00
Jonathas Costa bd43009033 Removed debug message. 2017-07-25 13:45:37 -04:00
Jonathas Costa 7096aeb9dd Atmosphere is now a separated node in OS. Removed ATM code from renderableglobe and renderableplanet. 2017-07-24 17:05:30 -04:00
Alexander Bock 036b271d0d Change capitalization of property names 2017-07-22 18:22:44 -04:00
Alexander Bock 04bac9293b Encapsulate identifier, guiName, and description into a PropertyInfo struct 2017-07-22 17:36:03 -04:00
Alexander Bock b584f0197e Add description to Propertys 2017-07-21 16:31:58 -04:00
Jonathas Costa 20003d5b32 Merged master into NewAtmosphere. 2017-07-21 15:02:24 -04:00
Matthew Territo 40599081d9 Minor spelling, grammar, & comment cleanup 2017-07-19 23:34:48 -06:00
Alexander Bock 77b15724b5 More shader cleanup
Remove dedicated logs folder
Change openspaceengine to create logs folder automatically
2017-07-19 15:44:30 -04:00
Alexander Bock e7b08e1e25 Cleanup copyright information in shaders 2017-07-18 16:24:57 -04:00
Alexander Bock 008ab4e613 Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&) 2017-07-18 15:47:48 -04:00
Alexander Bock 0963184293 Removing more warnings 2017-07-18 01:05:59 -04:00
Jonathas Costa b0c65d416b Merged master into NewAtmosphere. 2017-07-17 16:22:33 -04:00
Alexander Bock 0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock 096e751de2 Some more cleanup with nested namespaces 2017-07-16 11:59:01 -04:00
Klas Eskilson 98534bc1ec Normalize ALL the line endings (#361)
* Normalize ALL the line endings

* Add Ghoul respository and openspace.cfg
2017-07-13 12:08:47 -04:00
Alexander Bock db9db49716 Provide a static member variable Name for all OpenSpaceModules 2017-07-12 13:59:16 -04:00
Alexander Bock 0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00
Jonathas Costa 384b99c736 Merged master into NewAtmosphere. 2017-07-05 16:44:11 -04:00
Alexander Bock 467a6c3542 Start migrating from GLEW to glbindings
Fix compile errors from wrong function parameters in OpenGL calls
2017-07-03 01:37:53 -04:00
Jonathas Costa a37b0388bb Merged master into atmosphere's branch. 2017-06-21 14:46:10 -04:00
Jonathas Costa 6af9162ec2 Added a background exposure control for atm scenes. 2017-06-20 14:29:29 -04:00
Jonathas Costa 5742e09335 Removed unused files and started cleanup of atm module for future merging with master. 2017-06-14 15:45:42 -04:00
Jonathas Costa 59b7cf9648 Fixed position in G-Buffer from renderableplanet_vs. 2017-06-09 18:46:45 -04:00
Jonathas Costa 70f798c2ef Fixed ATM in RenderablePlanet. No jittering anymore. Still needs reflectivity and clouds. 2017-06-09 18:26:19 -04:00
Alexander Bock 90c7eef724 Remove explicit coordinate transformation from RenderableConstellationBounds (closes #300) 2017-06-09 13:59:09 -04:00
Jonathas Costa f487107eaa Added missing semicolon to vertex shader. 2017-06-08 13:21:04 -04:00
Jonathas Costa 3df6dbb036 Merge branch 'master' into feature/NewAtmosphere 2017-06-08 12:13:32 -04:00
Gene Payne be1b211dfb Feature/satellites (#325)
* Initial commit of satellites test branch

* Modified code to work with batch TLE files from online links specified in .mod file. Does not yet auto-download the files.

* Added debug function to mod file for testing static points in orbit

* Fixed time offset bug that was corrupting satellite positions

* Minor changes for debug output and camera position.

* Changed to circle billboard for rendering satellite position

* Added satellite group name to each renderable title, and keyboard shortcuts for toggling visibility

* Added support for using ghoul luasocket lib to download latest satellite TLE files from celestrak.com

* Adding reference to updated Ghoul submodule containing luasocket changes

* Updating reference to latest Ghoul submodule in feature/satellites

* Updated reference to new ghoul version

* Updated reference to new ghoul submodule version for satellites

* Updated reference to new ghoul submodule version for satellits

* Updated versions of TLE files

* Added new Lua-accessible downloader available for scene loading

* Improved error handling for TLE files

* Updated submodule reference for ext/ghoul prior to luasocket addition

* Update SGCT reference
2017-06-06 13:42:38 -04:00
Jonathas Costa 5685b2183d Changed G-Buffer. 2017-06-02 12:29:09 -04:00
Jonathas Costa e3e1155a0e Enabled G-Buffer for space items. 2017-05-31 17:12:44 -04:00
Alexander Bock 9ea188cb2e Fixing star shaders for Mac 2017-05-31 16:55:19 -04:00
Jonathas Costa 4ad0843cc4 Enabled G-Buffer for Stars. 2017-05-29 00:57:47 -04:00
Jonathas Costa 0cd56d776c Merged master into NewAtmosphere. 2017-05-24 16:53:34 -04:00
Emil Axelsson 752081d31b feature/time-refactor (#294)
- Change Time class to become a non-singleton
- Move ownership of the current time to TimeManager(instead of singleton access).
- Store the Time as a Syncable in TimeManager instead of representing all member variables of Time as Syncables.
- Pass a Time object around in the update/render methods, so that renderables don't have to query the OpenSpaceEngine to know if time is paused or if it jumped.
- Introduce Timeline and Keyframe classes
- Make use of Timelineand Keyframeclasses in KeyframeInteractionMode and TimeManager
- Added basic unit tests for Timelineand Keyframe

Future work: Add interpolation schemes for keyframes. Possibly use keyframes+interpolation feature to tween/morph properties, or figure out if this should be a separate mechanism.
2017-05-22 14:01:08 +02:00
Jonathas Costa d632b41710 Merged master into NewAtmosphere. 2017-05-18 12:33:08 -04:00
Alexander Bock f4ad2ce4c2 More include file cleanup 2017-05-15 15:27:59 -04:00
Alexander Bock 66f8043982 Adding more documentation to the space module classes 2017-05-12 13:37:04 -04:00
Jonathas Costa 8d6fcf6635 Merged master into NewAtmopshere branch. 2017-05-01 11:33:54 -04:00
Alexander Bock da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -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 665c9035a5 Make RenderablePlanet not crash if the nighttextures are not present 2017-04-13 11:52:29 -04:00
Alexander Bock 53e2aedd81 Compile fix 2017-04-12 16:00:49 -04:00
Jonathas Costa 9001eb0f96 Merged develop branch into NewAtmosphere branch. 2017-03-30 15:59:20 -04:00