Alexander Bock
dcfef3557f
Update copyright header
2017-12-29 20:11:22 +01:00
Alexander Bock
c9a3c68f19
Fix style guide issues
...
Update Ghoul repository
2017-12-29 19:18:06 +01:00
Jonathas Costa
0264a3026c
Merged master into NewAtmosphere.
2017-11-15 18:12:58 -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
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
Jonathas Costa
2d0da72a50
Merged master into atm.
2017-08-16 12:00:28 -04:00
Jonathas Costa
758ee8bd6d
Pull request changes.
2017-08-15 18:15:56 -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
31377466ba
Remove return values from initialize and deinitialize functions
2017-07-28 17:51:25 -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
Jonathas Costa
20003d5b32
Merged master into NewAtmosphere.
2017-07-21 15:02:24 -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
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
Jonathas Costa
6af9162ec2
Added a background exposure control for atm scenes.
2017-06-20 14:29:29 -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
Jonathas Costa
d632b41710
Merged master into NewAtmosphere.
2017-05-18 12:33:08 -04:00
Alexander Bock
66f8043982
Adding more documentation to the space module classes
2017-05-12 13:37:04 -04:00
Jonathas Costa
9001eb0f96
Merged develop branch into NewAtmosphere branch.
2017-03-30 15:59:20 -04:00
Alexander Bock
2f2fa3b031
Update Ghoul repository to have the factory return unique_ptrs
...
Adjust accordingly
2017-03-01 22:03:48 -05:00
Jonathas Costa
3c4bf23317
Merged develop into NewAtmosphere branch.
2017-02-27 15:02:02 -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
Alexander Bock
dbb599a5fa
Separate base module into base and space
2016-12-13 14:43:44 +01:00
