Jonathas Costa
a797c2b6db
Merged master into NewAtmosphere
2017-12-01 17:13:04 -05:00
Alexander Bock
38338725b9
Strict coding style adherence
2017-11-26 14:57:26 -05:00
Alexander Bock
8e0fde947d
Cleanup ScreenSpaceFramebuffer (fix orientation issue)
...
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -05:00
Jonathas Costa
6363fc0bb2
Added missing include and merged master into NewAtmosphere.
2017-11-25 22:39:18 -05:00
Alexander Bock
026f51735b
Show distance from current focus object
...
Add conversions for time and space to show distance and delta time in manageable units
Remove warnings
Add deinitializeGL call to Renderengine
2017-11-25 18:30:13 -05:00
Alexander Bock
719130b6b7
Jenkinswarnings ( #419 )
...
* Remove more warnings
* Removing more warnings
* More warning fixes
* More warnings
* More warnings
* Update ghoul
2017-11-16 21:19:28 -05:00
Jonathas Costa
0264a3026c
Merged master into NewAtmosphere.
2017-11-15 18:12:58 -05:00
Alexander Bock
3a7f221793
Remove GCC warnings
2017-11-13 16:22:07 -05:00
Alexander Bock
f227767492
Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/volume/rendering/renderabletimevaryingvolume.cpp
2017-11-12 10:50:11 -05:00
Alexander Bock
758e26789c
More coding style conformance
2017-11-11 11:25:49 -05:00
Alexander Bock
7e4bb0b2c6
Merge branch 'master' into feature/loadingscreen-refactor
2017-11-09 22:49:07 -06:00
Alexander Bock
afa1d6d33e
Add strict test for whitespace at end of line
...
More work on coding style
2017-11-09 23:47:51 -05:00
Jonathas Costa
929bd9ae05
Merged.
2017-11-09 15:46:46 -05:00
Jonathas Costa
081f178eb1
Added fade-in for background radiation. Changed from sigmoid to linear fading.
2017-11-09 13:03:38 -05:00
Alexander Bock
88cf7926ae
Merge branch 'master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/galaxy/rendering/renderablegalaxy.cpp
2017-11-09 10:51:56 -05:00
Alexander Bock
8866a13ff6
More coding style fixes
2017-11-08 21:36:06 -06:00
Alexander Bock
acdfefe46d
Merge branch 'master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/base/rendering/renderabletrailorbit.h
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
# modules/digitaluniverse/rendering/renderableplanescloud.cpp
# modules/digitaluniverse/rendering/renderablepoints.cpp
# modules/galaxy/rendering/renderablegalaxy.cpp
# modules/galaxy/rendering/renderablegalaxy.h
# modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
# modules/kameleonvolume/rendering/renderablekameleonvolume.h
# modules/spacecraftinstruments/rendering/renderablefov.h
# modules/spacecraftinstruments/rendering/renderableplaneprojection.h
# modules/toyvolume/rendering/renderabletoyvolume.cpp
# modules/toyvolume/rendering/renderabletoyvolume.h
# modules/volume/rendering/renderabletimevaryingvolume.cpp
# modules/volume/rendering/renderabletimevaryingvolume.h
2017-11-08 19:10:59 -06:00
Alexander Bock
b50b52d351
Cleanup for coding style
...
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Alexander Bock
78e3320cde
Separate Renderable::initialize into initialize and initializeGL functions
...
Handle initialize in a separate thread and display rudimentary loading screen
2017-11-02 14:27:35 -04:00
Alexander Bock
50fd9309ba
Merge branch 'master' into feature/NewAtmosphere
...
# Conflicts:
# src/rendering/renderengine.cpp
2017-10-24 15:30:22 -04:00
Alexander Bock
e80730e9bf
Fix a variety of warnings
2017-10-21 10:10:40 -04:00
Jonathas Costa
637e74a9dc
Merged master into NewAtmosphere.
2017-10-19 14:23:06 -04:00
Jonathas Costa
d36e32e560
Merged master into NewAtmosphere.
2017-10-17 20:14:41 -04:00
Alexander Bock
d628c1a667
Merge branch 'master' into feature/DU
...
# Conflicts:
# data/scene/grids/grids.mod
# ext/sgct
2017-10-17 17:09:37 -04:00
Jonathas Costa
d545042b9c
Updated fade-out of Milkyway.
2017-10-12 22:05:48 -04:00
Alexander Bock
5ccc200258
Fix loading of RGB screenspace images
2017-10-11 09:13:20 -04:00
Jonathas Costa
07cdbb6d59
Added Milkyway transition.
2017-10-10 17:42:31 -04:00
Alexander Bock
aa969795cc
Factor ScreenSpaceImage into separate classes for local loading and online download ( closes #296 )
2017-10-10 14:16:55 -04:00
Alexander Bock
0ceab49df7
Update gitignore to include Mars texture
...
Update SGCT reference
Update Ghoul reference
Prevent spherical grid to recreate grid each frame
Add version and commit information (closes #395 )
2017-08-30 14:56:02 -04:00
Jonathas Costa
2d0da72a50
Merged master into atm.
2017-08-16 12:00:28 -04:00
Alexander Bock
c275b2f833
Feature/cmake cleanup ( #381 )
...
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31 )
* Cleaning up CMake files
* Restructure application specification
* Add parameter for library mode to all modules
* Add functions to handle global variable state
* Misc/remove warnings (#383 )
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Alexander Bock
8a62e6e791
Add description to PropertyOwner
2017-08-01 17:05:52 -04:00
Alexander Bock
ad5ca816a9
Move friction properties into common subowner
2017-07-29 01:33:22 -04:00
Alexander Bock
31377466ba
Remove return values from initialize and deinitialize functions
2017-07-28 17:51:25 -04:00
Alexander Bock
be6d34d5df
Fix SphericalGrid
2017-07-28 13:41:03 -04:00
Alexander Bock
dfce5a0aad
Fix the missing wms files for Earth, Mars, Moon, and Mercury
...
Fix the spherical grid
2017-07-28 01:38:32 -04:00
Jonathas Costa
a55110e286
Merged master info NewAtmosphere.
2017-07-27 17:13:42 -04:00
Alexander Bock
35a41d3283
Remove Exhaustive parameter for documentation
2017-07-27 14:46:46 -04:00
Alexander Bock
e794f6ae01
Remove rotation and shift meridian from RenderablePlanetProjection
...
Unify the property names in RenderablePlanet
Remove MainFrame from RenderableShadowCylinder
Clean up dictionary keys for RenderableModel, RenderableModelProjection, RenderablePlanetProjection
2017-07-27 02:09:50 -04:00
Alexander Bock
19f8e30813
Change RenderableModel "Rotation.ModelTransform" to "ModelTransform"
...
Add Property descriptions to the documentation file
Remove update method from StaticTranslation
Remove spelling error in RenderableGlobe
Remove rotation from renderablemodel projection
Fix setting the Origin through the GUI
Reorder Optional and documentation arguments for DocumentationEntry, and making Optional a non-optional argument
2017-07-27 00:22:17 -04:00
Alexander Bock
59bccd040d
Cleanup changes
2017-07-26 17:29:57 -04:00
Alexander Bock
dc79a94142
Remove warnings
...
Update SGCT repository
Update Ghoul repository
2017-07-26 11:59:48 -04:00
Alexander Bock
46c1fbb902
More work on Property documentation
2017-07-25 00:21:17 -04:00
Alexander Bock
20e944f86f
Added documentation to more classes
2017-07-24 17:22:19 -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
Alexander Bock
e661324002
Remove style guide errors
...
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock
36e97f1f62
Cleanup of gitignore file
...
Started work on fixing Rosetta
2017-07-19 22:05:12 -04:00
