Commit Graph

5272 Commits

Author SHA1 Message Date
Malin E
3cd2cfac93 Fix issue with side by side stereo rendering 2023-03-09 11:59:44 +01:00
Malin E
184a8b59ac Fix hole cutting or side by side stereo
* And disable face culling for Orion model that is a one sided plane
2023-03-08 11:49:55 +01:00
Malin E
a3b5300684 Update model shader example shaders 2023-03-08 10:24:26 +01:00
Malin E
0d4c47f3be Move boundingsphere size in asset into the node from model projection 2023-03-03 14:55:06 +01:00
Malin E
98836e5393 Fix manual depth test hole cutting 2023-03-03 08:44:13 +01:00
Malin E
fedbf9a31e Remove unused textures 2023-03-02 15:31:10 +01:00
Malin E
896ca0f108 Make debug texture prettier 2023-03-01 17:33:26 +01:00
Malin E
5a6ac848f9 Make possible to disable manual depth test in opacity mode 2023-03-01 17:31:48 +01:00
Malin E
06db9b3ce9 Add model scale and debug invisible feature to model projection 2023-02-23 11:05:44 +01:00
Malin E
74aa8a9416 Fix model projection to work with new opacity setup 2023-02-23 10:58:12 +01:00
Malin E
bae8bbef3a Clean up some shader code 2023-02-22 14:50:55 +01:00
Malin E
f6eac4f0c7 Take back manual depth test for the two pass model rendering 2023-02-21 18:08:38 +01:00
Malin E
a877324c95 Make sure model rendering works with an odd number of atmospheres 2023-02-21 11:46:16 +01:00
Malin E
7484502db9 Fix model "shadow" bug 2023-02-21 11:29:51 +01:00
Malin E
05252b8258 Merge branch 'master' into feature/model-opacity
* Solve conflict in iss.asset
2023-02-16 12:07:12 +01:00
Emma Broman
352c9dd5ec Touch module code cleanup (#2465)
* Remove unused feature that allowed us to "pick" nodes using touch (it didn't really work and had some nasty hardcoded and costly implementation). Fixes Touch interaction picking refactor #1041

* General refactoring of code and removing redundant code

* Make touch markers prettier (change default color and smoothen edges)

* Add module property to control which renderable types are "directly touchable"

* Add SGN property to control which individual nodes are "directly touchable" ("SupportsDirectInteraction")

* Fix stuttering when zooming in closer than the orbitalnavigator allows
2023-02-14 13:55:24 +01:00
Emma Broman
9d53b1f62d Add option to specify an offset distance for RenderableNodeLine (#2483) 2023-02-14 13:07:05 +01:00
Alexander Bock
c242104baf Improve the reporting of specification errors 2023-02-13 22:16:23 +01:00
Ylva Selling
e924b41bf0 Merge pull request #2359 from OpenSpace/issue/2313
Issue/2313: Ensure all nodes in a cluster loads the image collection in the sky browser
2023-02-13 12:55:08 -05:00
Ylva Selling
488dfe2603 Address comment on PR 2023-02-13 12:52:51 -05:00
Ylva Selling
c03a9ae360 Address comments on PR: use Spacecraft instead of Spacecraft etc 2023-02-13 12:46:08 -05:00
Ylva Selling
f9692f8f22 Change delimiter to correct character 2023-02-10 13:06:52 -05:00
Ylva Selling
0ee565027e Merge remote-tracking branch 'origin/master' into issue/2313
# Conflicts:
#	modules/skybrowser/skybrowsermodule_lua.inl
2023-02-10 13:06:38 -05:00
Ylva Selling
fb3628b684 Merge remote-tracking branch 'origin/master' into issue/2409 2023-02-10 10:20:05 -05:00
Alexander Bock
e37a9ed213 Linux compile fix 2023-02-10 08:59:40 +01:00
Ylva Selling
2f96e54c8e Merge remote-tracking branch 'origin/master' into issue/2403
# Conflicts:
#	modules/skybrowser/include/wwtcommunicator.h
#	modules/skybrowser/src/wwtcommunicator.cpp
2023-02-09 16:20:42 -05:00
Adam Rohdin
90250d7099 Fixed bug where default value for 'element' was seen as invalid. 2023-02-08 17:35:38 +01:00
Malin E
7d2f781603 Only render with a two pass solution if the model is not opague 2023-02-08 14:14:59 +01:00
Alexander Bock
be122a5a73 No longer trigger an assert when binding a key to an action that does not exist (closes #2485) 2023-02-06 23:17:16 +01:00
Alexander Bock
f7ff2e33da Properly report an error when an .info file is missing the identifier, preventing the addition of a layer without one (closes #2490) 2023-02-06 23:07:21 +01:00
Alexander Bock
79ad5776cc CMake cleanup (#2489)
* CMake Cleanup
* Warning suppression with CEF
* Use SGCT tinyxml in skybrowser for now
* Disable warnings about missing field initializers
2023-02-05 23:24:12 +01:00
Ylva Selling
938ae6ffe1 Merge remote-tracking branch 'origin/master' into issue/2403
# Conflicts:
#	ext/ghoul
2023-02-02 16:39:29 -05:00
Ylva Selling
d7eec159fc Merge pull request #2426 from OpenSpace/issue/2425
Fix bug that channels in cluster don't set the field of view to the same value after animating
2023-02-02 16:17:06 -05:00
Emma Broman
7e94c4c284 Remove unintentional default value for skybrowser/exoplanet module enabled property (closes #2464) 2023-02-01 18:53:06 +01:00
Malin E
14edda9e61 Remove problematic manual depth test code 2023-02-01 16:25:19 +01:00
Malin E
00e80139a2 Solve one more conflict 2023-02-01 16:07:42 +01:00
Malin E
4d9983a867 Solve 1 more conflict 2023-02-01 14:57:31 +01:00
Malin E
f490fccee6 Merge branch 'master' into feature/model-opacity
* Solve conflicts in ghoul, renderablemodel.cpp and iss.asset
2023-02-01 14:52:33 +01:00
Emma Broman
a0f9e88432 Feature/touch fixes (#2463)
* Add Ceres to touch interaction list (Forgotten in previous commit. OBS! This list will be removed)

* Small code updates (Logical ordering of functions, code standard)

* Fix compilation issue when using debug define

* Make touch navigation abort idle behavior

* Make reset a trigger property

* Fix some broken property sliders (the default step size was too big)

* Update interaction monitor state on touch interaction with WebGui

* Add some documentation of what "LM" means, and make unit test a developer property
2023-02-01 12:44:34 +01:00
Alexander Bock
8445a48f71 Also apply the RenderableTravelSpeed changes to the fadeLength parameter 2023-01-31 23:42:32 +01:00
Alexander Bock
5a6d26f45a Make the travel indicator take floating point length values smaller than 1 (closes #2459) 2023-01-30 23:46:54 +01:00
Alexander Bock
3d95554222 Sort actions based on their name or their identifier if the names don't exist 2023-01-29 20:37:43 +01:00
Alexander Bock
a73edcc0af Merge branch 'master' into issue/2425 2023-01-28 19:50:47 +01:00
Ylva Selling
b7ca19dff7 Address comments on PR 2023-01-27 17:06:22 -05:00
Ylva Selling
a46fe2e514 Merge pull request #2455 from OpenSpace/issue/2280
Fix bug for screenspace sky browser scale crash
2023-01-27 16:08:57 -05:00
Alexander Bock
2fcf4617c9 Correctly swizzle the textures for ScreenSpaceImage types to allow for 8 bit grayscale images (closes #2330) 2023-01-27 21:29:12 +01:00
Alexander Bock
eba9d000e6 Don't render RenderableTrailTrajectory if the time is _exactly_ the start time (closes #2314) 2023-01-27 21:02:27 +01:00
Alexander Bock
3ce6443cff Add missing include 2023-01-27 20:55:25 +01:00
Ylva Selling
471317aef8 Make point space craft a bool property that when enabled points the space crafts when an image is selected 2023-01-27 14:24:46 -05:00
Ylva Selling
7ac8faea39 Set default texture quality to 1 as it seems that OS can handle it 2023-01-27 13:49:28 -05:00