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
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
e80730e9bf
Fix a variety of warnings
2017-10-21 10:10:40 -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
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
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
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
Alexander Bock
3520e42097
Correctly position Screenspace renderable if a scene tag is specified
2017-07-08 16:30:19 -04:00
Alexander Bock
9e4e681d1e
More cleanup
2017-06-09 19:29:20 -04:00
Alexander Bock
f4ad2ce4c2
More include file cleanup
2017-05-15 15:27:59 -04:00
Alexander Bock
dd32a812e1
Change tabs to spaces
2017-04-17 15:00:15 -04:00
Gene Payne
4a312c70b8
Merge branch 'master' into feature/grouping
2017-04-13 11:23:15 -06:00
GPayne
7a7fef239c
Made changes according to pull request feedback
2017-04-13 11:12:26 -06:00
GPayne
d66561a1d3
Added option for single or multiple tags in a scenegraph node
2017-04-10 15:05:06 -06:00
Alexander Bock
9f3bbe324d
Remove warnings
2017-04-06 23:19:23 -04:00
GPayne
bcdd906ad7
Some minor changes and added tag support to screenspacerenderable
2017-03-31 15:14:00 -06:00
Alexander Bock
1689dc4047
Move the PropertyOwner name specification into the constructor and adjust accordingly
2017-03-02 18:25:13 -05: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
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
94e3e11188
Update copyright header to 2017
...
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Emil Axelsson
cd325686ad
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
...
Conflicts:
include/openspace/engine/openspaceengine.h
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/network/parallelconnection.cpp
src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
Alexander Bock
8867b3439f
Add central location for the core to register documentations
...
Add documentation to ScreenSpaceRenderable
Add documentation to Ephemeris
Add documentation to Rotation
2016-09-19 14:03:42 +02:00
Emil Axelsson
13610b390d
distinguish between local and remote scripting
2016-09-16 14:53:20 +02:00
Alexander Bock
0c3b2c55d9
Removing more CppCheck warnings
2016-07-28 20:31:53 +02:00
Alexander Bock
9fb7814145
Add visibility toggle to Property base class
...
Restructure GuiPropertyComponent to take a source function that returns a list of PropertyOwner%s instead of registering individual properties
Apply restructuring
2016-06-28 14:50:53 +02:00
Alexander Bock
77c8ecf6df
Rename screnspace* to screenspace shaders
2016-06-16 01:02:13 +02:00
Alexander Bock
ad1893fd6f
Cleanup of ScreenSpaceRenderable
...
Add missing includes to other files
2016-06-16 01:00:10 +02:00
Michael Nilsson
b3f1f12a40
add scene orientation to screenspacerenderables
2016-06-14 13:54:21 -04:00
Sebastian Piwell
1e4e8919c3
Set attributes of screenspacerenderable through dictionary
2016-05-03 15:35:33 -04:00
Michael Nilsson
c34fa48c73
add script to remove screenspacerenderables from renderengine
2016-05-03 13:30:22 -04:00
Michael Nilsson
4d61694f75
ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory
2016-05-03 10:39:32 -04:00
Michael Nilsson
aa40e3a8b3
fix bug where screenspace cygnets crash program if moved to fast
2016-05-02 10:03:07 -04:00
Sebastian Piwell
434f8bfabb
Some clean up and small fixes
2016-04-27 14:48:22 -04:00
Michael Nilsson
c72536fbbc
untabify to make merge easier
2016-04-20 15:21:30 -04:00
Sebastian Piwell
b1a009e1b0
Create ISWACygnets with metadata struct
2016-04-05 11:44:49 -04:00
Sebastian Piwell
453fbe300e
Remove screenspacerenderables in any order
2016-04-04 15:40:45 -04:00
Sebastian Piwell
3fbfb9bb33
Remove screenspacerenderables
2016-04-04 13:49:21 -04:00
Sebastian Piwell
79979fe8dd
Clean up
2016-03-31 14:53:42 -04:00
Sebastian Piwell
a2fb30b432
Depth working again
2016-03-31 09:39:05 -04:00
Michael Nilsson
d390a70fb6
solve merge conflict
2016-03-30 09:51:34 -04:00
Michael Nilsson
85225946b9
solved merge conflict
2016-03-18 13:57:28 -04:00
Michael Nilsson
af8880274c
discard fragment if alpha is 0 in screenspacerenderables
2016-03-18 13:52:11 -04:00
Sebastian Piwell
48021a46e2
Sort screenspacerenderables in correct render order
2016-03-18 12:02:46 -04:00
