From 5be7313ae71ecb05c8f1d40702cb8ea64a057417 Mon Sep 17 00:00:00 2001 From: xLinka Date: Wed, 12 Apr 2023 21:44:24 +0100 Subject: [PATCH] Update --- NEOSPlus/Materials/Effects/Crystal.cs | 2 +- NEOSPlus/Materials/Effects/UnlitDisplacement.cs | 2 +- NEOSPlus/World Presets/NeosPlusAssets.cs | 6 +++--- NEOSPlus/World Presets/NeosplusGridSpace.cs | 6 ++++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/NEOSPlus/Materials/Effects/Crystal.cs b/NEOSPlus/Materials/Effects/Crystal.cs index f50bb7b..498147c 100644 --- a/NEOSPlus/Materials/Effects/Crystal.cs +++ b/NEOSPlus/Materials/Effects/Crystal.cs @@ -2,7 +2,7 @@ using BaseX; using FrooxEngine; using NEOSPlus.Shaders; - +//from https://booth.pm/ja/items/1148311 MIT License [Category(new string[] { "Assets/Materials/NeosPlus/Effects" })] public class CrystalMaterial : SingleShaderMaterialProvider { diff --git a/NEOSPlus/Materials/Effects/UnlitDisplacement.cs b/NEOSPlus/Materials/Effects/UnlitDisplacement.cs index 9c53b4b..83fec04 100644 --- a/NEOSPlus/Materials/Effects/UnlitDisplacement.cs +++ b/NEOSPlus/Materials/Effects/UnlitDisplacement.cs @@ -4,7 +4,7 @@ using NEOSPlus.Shaders; [Category(new string[] { "Assets/Materials/NeosPlus/Effects" })] -public class DisplacementMaterial : SingleShaderMaterialProvider +public class UnlitDisplacementMaterial : SingleShaderMaterialProvider { protected override Uri ShaderURL => ShaderInjection.UnlitDisplacement; diff --git a/NEOSPlus/World Presets/NeosPlusAssets.cs b/NEOSPlus/World Presets/NeosPlusAssets.cs index 2da2070..954ae02 100644 --- a/NEOSPlus/World Presets/NeosPlusAssets.cs +++ b/NEOSPlus/World Presets/NeosPlusAssets.cs @@ -8,11 +8,11 @@ namespace NEOSPlus { internal class NeosPlusAssets { - public static Uri NeosplusGridSkybox { get; } = new Uri("neosdb:///3db0299a0f5f1d948ad94142ceecc0e5d64b2da9e0e85575d1676271f67a64ec.png"); //placeholder //NeosPlusGridspace - public static Uri NeosplusGridFloor { get; } = new Uri("neosdb:///3db0299a0f5f1d948ad94142ceecc0e5d64b2da9e0e85575d1676271f67a64ec.png"); - public static Uri NeosplusGridParralax { get; } = new Uri("neosdb:///3db0299a0f5f1d948ad94142ceecc0e5d64b2da9e0e85575d1676271f67a64ec.png"); + public static Uri NeosplusGridSkybox { get; } = new Uri("neosdb:///ab95b1ca7b6be2c0d295fd7a5226f4896378b4d37edcf3469c4dd5aff09b8d0e.png"); //neos essntials vaporwave + public static Uri NeosplusGridFloor { get; } = new Uri("neosdb:///7bb4ddacb0a6ac924eb01899b4cfc0cd144c11a7ebfa700aea399597e6392889.png"); + public static Uri NeosplusGridParralax { get; } = new Uri("neosdb:///7dc13ec82b990e20c8cecc8aec2760430a57550aedd5422fa89305ff2d349da3.png"); } } diff --git a/NEOSPlus/World Presets/NeosplusGridSpace.cs b/NEOSPlus/World Presets/NeosplusGridSpace.cs index f276ba5..a8b2d6a 100644 --- a/NEOSPlus/World Presets/NeosplusGridSpace.cs +++ b/NEOSPlus/World Presets/NeosplusGridSpace.cs @@ -50,11 +50,17 @@ public static void GridSpace(World w) StaticTexture2D gridTexture = groundSlot.AttachTexture(NeosPlusAssets.NeosplusGridFloor); gridTexture.FilterMode.Value = TextureFilterMode.Anisotropic; groundModel.material.MainTex.Target = gridTexture; + groundModel.material.Metallic.Value = 0.2f; + groundModel.material.Glossiness.Value = 0.8f; + groundModel.material.Parallax.Value = 0.11f; + groundModel.material.ParallaxMinSamples.Value = 20f; + groundModel.material.ParallaxMaxSamples.Value = 30f; //parralax occlusion map StaticTexture2D ParralaxMap = groundSlot.AttachTexture(NeosPlusAssets.NeosplusGridParralax); ParralaxMap.FilterMode.Value = TextureFilterMode.Anisotropic; groundModel.material.ParallaxMap.Target = ParralaxMap; + groundSlot.GlobalRotation = floatQ.LookRotation(float3.Down, float3.Forward);