Commit Graph

787 Commits

Author SHA1 Message Date
Kalle Bladin
0ac1f96ae8 Add ability to define a color for SolidColor layers at initialization. 2017-08-15 12:09:06 +02:00
Kalle Bladin
59694c8213 Merge branch 'feature/globe-generalization' of github.com:OpenSpace/OpenSpace into feature/globe-generalization 2017-08-15 11:03:38 +02: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
Kalle Bladin
1fb5273b85 Add function getGeoPosition and fix bug in getGeo 2017-08-11 15:27:23 +02:00
Kalle Bladin
3adf037073 Clean up 2017-08-08 17:23:19 +02:00
Kalle Bladin
71f811fcd8 Tiles now have the same size even if padding is enabled. 2017-08-08 16:11:16 +02:00
Kalle Bladin
559a8063bc Do not use padding for temporal VIIRS for faster loading 2017-08-08 15:49:27 +02:00
Kalle Bladin
1265de0d50 Only use padding for height layers 2017-08-08 14:02:56 +02:00
Kalle Bladin
2ecfd4d05a Remove debug code 2017-08-07 10:45:36 +02:00
Kalle Bladin
fa47fd19fa Woops, accidentally removed chunkedlodglobe.cpp. Now it is back 2017-08-07 10:26:46 +02:00
Kalle Bladin
902af5b321 Solve conflict 2017-08-07 10:24:30 +02:00
Alexander Bock
cedd8adf0d Remove const qualifier from shaders as it causes shaders to not compile on Mac 2017-08-03 12:05:58 -04:00
Alexander Bock
8a62e6e791 Add description to PropertyOwner 2017-08-01 17:05:52 -04:00
Alexander Bock
eaf0d70a79 Fix JSON error in documentation 2017-07-31 16:57:07 -04:00
Alexander Bock
e4ef40ad72 Add functions to recursively parse and add color layers described in .info files 2017-07-31 16:50:21 -04:00
Alexander Bock
31377466ba Remove return values from initialize and deinitialize functions 2017-07-28 17:51:25 -04:00
Alexander Bock
b9f0d60d85 Hide layergroups in RenderableGlobe that do not contain any layers
Update Ghoul repository
2017-07-28 14:49:08 -04:00
Alexander Bock
5ca44d4aa1 Allow RenderableGlobe to have a single radius
Make GlobeBrowsing scene the new default scene
2017-07-27 17:24:22 -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
dc79a94142 Remove warnings
Update SGCT repository
Update Ghoul repository
2017-07-26 11:59:48 -04:00
Alexander Bock
d95576077b More work on documentation 2017-07-25 18:06:55 -04:00
Alexander Bock
e93070504b Some more property documentation 2017-07-25 01:08:20 -04:00
Alexander Bock
46c1fbb902 More work on Property documentation 2017-07-25 00:21:17 -04:00
Alexander Bock
1a475ef570 Started documenting properties
Cleanup of Nagivationhandler properties
2017-07-24 00:15:45 -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
e661324002 Remove style guide errors
Add missing newline errors
2017-07-21 11:52:25 -04: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
Kalle Bladin
3aa8f2a056 Recompile shaders at initialization of globes 2017-07-19 10:01:53 +02:00
Alexander Bock
88265a469d Cleanup of shader code 2017-07-19 01:27:01 -04:00
Alexander Bock
0647bde8bd Jenkins compile fix 2017-07-18 18:27:30 -04:00
Alexander Bock
cb53e7f3df Jenkins compile error 2017-07-18 18:17:11 -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
Kalle Bladin
a14eae32e4 Merge branch 'master' into feature/globe-generalization 2017-07-18 15:12:20 +02:00
Alexander Bock
7737b082d9 Removing more warnings 2017-07-17 18:03:37 -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
Alexander Bock
26682669ff More work on making use of nested namespaces 2017-07-16 01:55:35 -04:00
Alexander Bock
4dba552fd1 Started switching OpenSpace projects to nested namespaces
Various cleanups
2017-07-15 20:01:55 -04:00
Alexander Bock
00e684f7dc Merge remote-tracking branch 'origin/master' into misc/cleanup
# Conflicts:
#	data/scene/default.scene
#	modules/globebrowsing/globes/pointglobe.cpp
#	modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
2017-07-15 13:22:46 -04:00
Kalle Bladin
a232a1a0a7 Fix compilation warnings. 2017-07-14 22:48:32 +02:00
Alexander Bock
6a198c5d93 Started some warning cleanup 2017-07-14 14:21:01 -04:00
Kalle Bladin
1457301e1d Merge branch 'master' into feature/globe-generalization 2017-07-14 17:19:37 +02:00
Kalle Bladin
2e4f31ded8 Interaction Updates (#353)
* Interaction speed is not dependent on framerate

* Split up interaction code in files and perform smooth interpolation when changing focus

* Abstract interaction code in to functions.

* Interpolation time is dependent on angle to focus node.

* Use correct delta time when interpolating

* Fix bug regarding decomposition of camera rotation.

* Make orbital interaction mode behave as globe browsing and no longer use interactiondepth below ellipsoid.

* Do not always rotate with object. Depending on distance

* Remove interaction depth below ellipsoid. Now able to interact without renderable

* Remove specification of interactionDepthBelowEllipsoid and cameraMinHeight

* Remove GlobeBrowsingInteractionMode

* Rename OrbitalInteractionMode to OrbitalNavigator and no longer extend interactionmode.

* Move properties from interaction handler to orbital navigator

* Use smooth step for follow rotation interpolator

* Rename KeyframeInteractionMode to KeyframeNavigator

* Rename files

* Clean up.

* Separate mousestate from orbitalnavigator

* Clean up

* Split keybindingmanager from interactionhandler interactionhandler

* Rename interactionhandler to navigationhandler

* Rename files

* Clean up

* Take back usage of gotochunk and gotogeo

* Rename lua library navigation

* Move functionality from navigationhandler to keyframenavigator

* Update scripts for navigation

* Comment code

* Clean up

* Solve but that caused NaN values for camera position when being in center of globe and setting focus to the globe.

* Update jenkins file to remove build folder before building.

* Fix error in jenkins script

* Update jenkins file

* Update jenkins file

* Revert jenkins file

* I hope this makes Jenkins happy.

* Line endings God damnit

* Line endings

* Clean up

* Fix compilation issue

* Take back default scene.

* Fix indentation

* Move functions goToGeo and goToChunk to GlobeBrowsingModule.

* Include algorithm for std::find

* Remove auto and other clean up
2017-07-14 17:17:17 +02:00
Kalle Bladin
4ecb98f06f Feature/globe shading (#363)
* Perform Oren Nayar diffuse shading on globes.

* Remove unused propertyowner

* Enable accurate normals for globes

* Use property for accurate normals.

* Correctly calculate height when scale is changed.

* Auto update line endings to LF in main.cpp and openspaceengine.cpp

* Clean up and comment

* Convert shader indentation to spaces (Wooooops..).

* Line endings

* Line endings and small fixes

* Line endings

* Clean up
2017-07-14 16:33:03 +02:00
Kalle Bladin
0a0942307c Fix y axis flip issue. 2017-07-14 10:58:50 +02:00
Kalle Bladin
f2d7c9c754 Update maxChunkLevel function 2017-07-14 00:46:39 +02:00
Kalle Bladin
e825d3b736 Correct type reinterpretation 2017-07-14 00:09:44 +02:00