mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 09:20:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

unified renderbin to renderable; adapted orbitalkepler to codegen; fi… (#1843)

Browse Source 
* unified renderbin to renderable; adapted orbitalkepler to codegen; fixes 1842

* update for pr comments

* update for pr comments2
This commit is contained in:
Micah Acinapura
2022-02-17 10:58:32 -05:00
committed by GitHub
parent e8072495ec
commit 9e69300642
22 changed files with 68 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/assets/scene/digitaluniverse/backgroundradiation.asset
+4 -4
View File
@@ -29,7 +29,7 @@ local wmap = {
Texture = textures .. "wmap_ilc_7yr_v4_200uK_RGB_sos.png",
Orientation = "Both",
MirrorTexture = true,
UseAdditiveBlending = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -55,7 +55,7 @@ local cbe = {
Texture = textures .. "COBErect.png",
Orientation = "Both",
MirrorTexture = true,
UseAdditiveBlending = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -81,7 +81,7 @@ local planck = {
Texture = textures .. "cmb4k.jpg",
Orientation = "Both",
MirrorTexture = true,
UseAdditiveBlending = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -107,7 +107,7 @@ local Halpha = {
Opacity = 0.4,
Texture = textures .. "mwHalpha-f.png",
Orientation = "Inside",
UseAdditiveBlending = true,
RenderBinMode = "PreDeferredTransparent",
MirrorTexture = true,
FadeOutThreshold = 0.025,
Background = true
data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
+4 -4
View File
@@ -26,7 +26,7 @@ local multiverse_planck_1 = {
Texture = textures .. "cmb4k.jpg",
Orientation = "Both",
MirrorTexture = true,
UseAdditiveBlending = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -56,7 +56,7 @@ local multiverse_planck_2 = {
Texture = textures .. "cmb4k.jpg",
Orientation = "Both",
MirrorTexture = true,
UseAdditiveBlending = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -86,7 +86,7 @@ local multiverse_planck_3 = {
Texture = textures .. "cmb4k.jpg",
Orientation = "Both",
MirrorTexture = true,
UseAdditiveBlending = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -116,7 +116,7 @@ local multiverse_planck_4 = {
Texture = textures .. "cmb4k.jpg",
Orientation = "Both",
MirrorTexture = true,
UseAdditiveBlending = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
data/assets/scene/digitaluniverse/milkyway_sphere.asset
+1 -1
View File
@@ -21,7 +21,7 @@ local sphere = {
Opacity = 0.35,
Texture = sphereTextures .. "DarkUniverse_mellinger_4k.jpg",
Orientation = "Inside",
UseAdditiveBlending = true,
RenderBinMode = "PreDeferredTransparent",
MirrorTexture = true,
FadeOutThreshold = 0.0015,
Background = true
data/assets/scene/milkyway/milkyway/eso.asset
+1 -1
View File
@@ -19,7 +19,7 @@ local object = {
Segments = 40,
Opacity = 0.4,
Texture = textures .. "eso0932a_blend.png",
UseAdditiveBlending = true,
RenderBinMode = "PreDeferredTransparent",
Orientation = "Inside",
MirrorTexture = true,
FadeOutThreshold = 0.01,
data/assets/scene/solarsystem/missions/jwst/jwst.asset
+1 -1
View File
@@ -42,7 +42,7 @@ local JWSTBand = {
DisableFadeInOut = true,
Orientation = "Inside",
Opacity = 0.05,
UseAdditiveBlending = true,
RenderBinMode = "PreDeferredTransparent",
},
Tag = { "mission_jwst_fov" },
GUI = {
data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset
+1 -1
View File
@@ -20,7 +20,7 @@ local L1 = {
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Type = "RenderablePlaneImageLocal",
RenderableType = "Opaque",
RenderBinMode = "Opaque",
Billboard = true,
Size = 700E5,
Texture = circle .. "circle.png",
data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset
+2 -2
View File
@@ -20,7 +20,7 @@ local L2Small = {
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Type = "RenderablePlaneImageLocal",
RenderableType = "Opaque",
RenderBinMode = "Opaque",
Billboard = true,
Size = 400E4,
Texture = circle .. "circle.png",
@@ -46,7 +46,7 @@ local L2 = {
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Type = "RenderablePlaneImageLocal",
RenderableType = "Opaque",
RenderBinMode = "Opaque",
Billboard = true,
Size = 700E5,
Texture = circle .. "circle.png",
data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset
+1 -1
View File
@@ -20,7 +20,7 @@ local L4 = {
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Type = "RenderablePlaneImageLocal",
RenderableType = "Opaque",
RenderBinMode = "Opaque",
Billboard = true,
Size = 800E6,
Texture = circle .. "circle.png",
data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset
+1 -1
View File
@@ -20,7 +20,7 @@ local L5 = {
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Type = "RenderablePlaneImageLocal",
RenderableType = "Opaque",
RenderBinMode = "Opaque",
Billboard = true,
Size = 800E6,
Texture = circle .. "circle.png",
data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+1 -1
View File
@@ -88,8 +88,8 @@ local initializeAndAddNodes = function()
Observer = transforms.EarthInertial.Identifier,
File = path,
LineNumber = 1,
RenderBinMode = "PostDeferredTransparent"
},
RenderBinMode = "PostDeferredTransparent",
Color = { 0.9, 0.6715, 0.0 },
Fade = 1.5,
Period = period,
data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+1 -1
View File
@@ -49,8 +49,8 @@ asset.onInitialize(function ()
Observer = transforms.EarthInertial.Identifier,
File = path,
LineNumber = 1,
RenderBinMode = "PostDeferredTransparent"
},
RenderBinMode = "PostDeferredTransparent"
Color = { 0.9, 0.6715, 0.0 },
Fade = 1.5,
Period = period,
data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+1 -1
View File
@@ -51,8 +51,8 @@ asset.onInitialize(function ()
Observer = transforms.EarthInertial.Identifier,
File = path,
LineNumber = 1,
RenderBinMode = "PostDeferredTransparent"
},
RenderBinMode = "PostDeferredTransparent"
Color = { 0.9, 0.6715, 0.0 },
Fade = 1.5,
Period = period,
data/assets/scene/solarsystem/sun/glare.asset
+1 -1
View File
@@ -20,7 +20,7 @@ local SunGlare = {
Texture = textures .. "halo.png",
BlendMode = "Additive",
Opacity = 0.65,
RenderableType = "PreDeferredTransparency"
RenderBinMode = "PreDeferredTransparent"
},
GUI = {
Name = "Sun Glare",