mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,012 Commits 99 Branches 46 Tags
90dbb6a01f01711a27c2a32563fa7ceaaa2fc41b
Commit Graph

614 Commits

Author SHA1 Message Date
Alexander Bock
76b9c7587b Adapt to explicit specifcation of texture size (#1794) 
* Adapt to explicit specifcation of texture size
 2021-12-26 19:19:04 +01:00
Alexander Bock
d32af9117a Code style cleanup 2021-12-10 17:31:01 +01:00
Alexander Bock
55ee3d2785 Remove the user data from the Lua function definition 2021-11-04 16:27:54 +01:00
ElonOlsson
d7f9c1a124 merge with master 2021-10-14 11:07:01 -04:00
Alexander Bock
4a860fb01d Some code facelifting 2021-10-14 10:31:46 +02:00
Alexander Bock
76dd45e5ce Event System (#1741) 
* Add implementation of the EventEngine to handle global event chains
* Add properties to SceneGraphNodes to determine two distance radii for camera-based events
 2021-10-11 21:53:00 +02:00
ElonOlsson
03371c6cdb Merge branch 'master' into thesis/2020/radiation 2021-10-05 14:52:38 -04:00
Emma Broman
821e746c1a Fix RenderablePlaneImageOnline not updating size on property change 2021-10-04 10:23:11 +02:00
ElonOlsson
0737ae1834 last polishing questionmark 2021-09-24 13:08:10 -04:00
ElonOlsson
f46d37e67b small fixes and polishing 2021-09-22 16:14:07 -04:00
ElonOlsson
9d503ff86e Merge branch 'master' into thesis/2020/radiation 2021-09-17 11:06:15 -04:00
Gene Payne
1c0b7c347a String-to-path fix for linux build 2021-09-14 15:45:39 -06:00
ElonOlsson
423d854615 Merge branch 'master' into thesis/2020/radiation 2021-09-13 18:23:33 -04:00
ElonOlsson
505215964a more pr comments fixed 2021-09-10 17:11:44 -04:00
ElonOlsson
cd4ebd7532 more pr comment edits 2021-09-08 10:40:56 -04:00
ElonOlsson
70424290b7 some edits from PR comments 2021-09-08 09:50:58 -04:00
ElonOlsson
f4b2c08d55 back side cull face bug fixed 2021-09-02 11:54:21 -04:00
ElonOlsson
4e6323cd8f just a few changes. Bug of cutplanes backside not showing up detected when sun is activated 2021-08-27 10:01:57 -04:00
ElonOlsson
8a63c15383 nothing 2021-08-24 15:08:14 -04:00
ElonOlsson
4411e0150b now shows first img of sequence before sequence if enabled instead of random img 2021-08-24 15:07:07 -04:00
Alexander Bock
b649509bf0 Feature/model shader (#1723) 
* Add support for RenderableModel to take custom shader code
 * Added example to highlight usage
 2021-08-24 10:45:19 +02:00
ElonOlsson
21633a20c2 PR fixes, rotation corrected 2021-08-23 10:26:28 -04:00
Alexander Bock
db472030de GCC warnings (#1725) 2021-08-21 11:42:44 +02:00
Alexander Bock
b2d12476dd Correctly specify the model size of the Apollo capsules (closes #1718) 2021-08-20 12:43:47 +02:00
Alexander Bock
af617d1d10 Feature/lua function cleanup (#1719) 
General cleanup of Lua functions and handling of variable extract from a Lua state
 2021-08-19 16:02:14 +02:00
ElonOlsson
743e2452f8 merge master to thesis branch 2021-08-16 15:23:49 -04:00
elonolsson
5686f2b7ed test for PAT credential 2021-08-13 16:19:51 -04:00
elon
9c2086170b easily fixed comments on PR 2021-08-13 15:39:13 -04:00
Emma Broman
bfe25c311b Merge branch 'master' into thesis/2019/camera-paths 
# Conflicts:
#	src/rendering/abufferrenderer.cpp
 2021-08-09 15:21:08 +02:00
Alexander Bock
c96764aa1c Remove Clang warnings 2021-07-30 14:56:55 +02:00
Alexander Bock
c4bddacfeb Remove nonfunctioning ABufferRenderer from RenderEngine 2021-07-30 12:01:07 +02:00
Alexander Bock
309bce2e30 Fix DebugAxis helper; Increase the sensitivity to prevent loss of color in debug axis (closes #1560) 2021-07-28 14:49:29 +02:00
Emma Broman
16173d7afe Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts 
# Conflicts:
#	modules/globebrowsing/globebrowsingmodule.cpp
#	modules/globebrowsing/globebrowsingmodule_lua.inl
 2021-07-09 15:43:17 +02:00
Emma Broman
85e7c6a146 A few exponential slider updates 
* Add exponent to RenderableTrail period and resolution
* Lower exponent of stereoscopic depth slider, to give better control
 2021-07-07 14:29:38 +02:00
Alexander Bock
87da9a27ab Feature/path normalization (#1674) 
* Path normalization (making sure there are fewer cases of '"..."'
* Using more std::filesystem::path instead of std::string
* Update Ghoul
 2021-07-01 23:46:22 +02:00
Emma Broman
8063b54fb8 Merge branch 'master' into thesis/2019/camera-paths 
# Conflicts:
#	src/navigation/navigationhandler.cpp
 2021-06-23 16:31:14 +02:00
Emma Broman
77bdfaefd6 Move camera path code into core and refactor navigation code a bit 2021-06-23 09:12:36 +02:00
ElonOlsson
7689cf1f65 master merge 2021-06-16 18:22:57 -04:00
Alexander Bock
a69b636dea Global sweep to cleanup the handling of floating point numbers and glm default initialization 2021-06-16 23:09:49 +02:00
Alexander Bock
3272bc4ebc Fix issue with compiling on Debug 2021-06-14 15:34:29 +02:00
Malin Ejdbo
573ebe5ed5 Add boundingSphere for RenderablePrism 2021-06-11 09:39:32 +02:00
Malin Ejdbo
257d3f8538 Update model bounding sphere to account for parent scale, closes #1630 2021-06-04 10:16:48 +02:00
Malin Ejdbo
59b3048c87 Remove posincrement 2021-05-31 16:26:51 +02:00
Malin Ejdbo
23abfa5ee3 Adjust labels 2021-05-31 16:19:25 +02:00
Malin Ejdbo
9f7b8aa32b Merge branch 'master' into feature/jwst 
* Resolve conflict
 2021-05-31 15:45:10 +02:00
Malin Ejdbo
31b834dbb2 Address PR comments 2021-05-31 15:34:54 +02:00
Emma Broman
a40e110fe9 Reduce risk of font rendering errors from user interaction (#1206 hotfix) (#1616) 
* Allways load all glyphs immediately for GlobeLabelsComponent, to avoid errors on font loading
* Unify used font sizes, to avoid filling font atlas (especially for globes, as we now load all glyphs immediately)
* Make font size properties read-only, to prevent users from triggering these errors during runtime
 2021-05-31 10:46:21 +02:00
Alexander Bock
744ba0dc9b Feature/side by side (#1613) 
* Make atmosphere, raycasting, and trails work with side_by_side stereo
 2021-05-28 23:31:10 +02:00
Emma Broman
1695937749 Feature/numeric slider updates (#1609) 
* Remove Logarithmic ViewOption and instead always use exponent of NumericalProperty + set exponent of some renderables' properties

* Add MinMaxRange ViewOption for Vec2 properties

* Add MinMaxRange viewoption to some existing vec2 properties and combine some other related properties to be able to utilize it. For example Min and Max label sizes, fade in/out distances, inner and outer radius. OBS! Includes renaming several properties (**breaking change**)

* Refactor and document labels code. OBS! Includes renaming several properties (**breaking change**)

* Add comments for some assets that have labels that are not working correctly


Renderables with rename properties: RenderableLabels , GlobeLabelsComponent, RenderableBillboardsCloud, RenderableDUMeshes, RenderableRadialGrid )
 2021-05-28 17:00:55 +02:00
Malin Ejdbo
0a1c842345 Some clean up 2021-05-28 13:26:47 +02:00