xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Bug fixes, Scene changes and new features #376

Merged
glencelow merged 15 commits from PlayerController into main 2023-02-28 23:10:33 +08:00
Conversation 0 Commits 15 Files Changed 136 +575 -3
8 changed files with 575 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 52ba54a82a - Show all commits

2
Assets/Materials/ShinyHightlight.shmat
View File

@ -1,6 +1,6 @@
- VertexShader: 37048829 - VertexShader: 37048829
FragmentShader: 45685219 FragmentShader: 45685219
SubPass: G-Buffer Write SubPass: G-Buffer Write With VFX
Properties: Properties:
data.color: {x: 1, y: 1, z: 1, w: 1} data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 57342922 data.textureIndex: 57342922

160
Assets/Models/MD_LightBeam.gltf Normal file
View File

File diff suppressed because one or more lines are too long

BIN
Assets/Models/MD_LightBeam.shmodel Normal file
View File

Binary file not shown.

7
Assets/Models/MD_LightBeam.shmodel.shmeta Normal file
View File

@ -0,0 +1,7 @@
Name: MD_LightBeam
ID: 82341473
Type: 4
Sub Assets:
Name: Cylinder
ID: 143485560
Type: 8

394
Assets/Scenes/Level3.shade
View File

@ -1736,7 +1736,7 @@
- EID: 136 - EID: 136
Name: UpperFloorStructure Name: UpperFloorStructure
IsActive: true IsActive: true
NumberOfChildren: 2 NumberOfChildren: 3
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0, y: 2.20000005, z: 0} Translate: {x: 0, y: 2.20000005, z: 0}
@ -2981,6 +2981,42 @@
Material: 126223465 Material: 126223465
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 385
Name: LightBeam
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 4.23731899, y: -0.144421101, z: 8.01354504}
Rotate: {x: 0, y: -1.57079601, z: 0}
Scale: {x: 0.999963701, y: 1, z: 0.999963701}
IsActive: true
Renderable Component:
Mesh: 143485560
Material: 126223465
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 1
Type: Box
Half Extents: {x: 7, y: 0.100000001, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: -0.5, y: 0.0500000007, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
- Is Trigger: false
Collision Tag: 1
Type: Box
Half Extents: {x: 0.300000012, y: 0.100000001, z: 7.9000001}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: -0.0500000007, y: 0.0500000007, z: 1.20000005}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 137 - EID: 137
Name: CeilingStructure Name: CeilingStructure
IsActive: true IsActive: true
@ -4934,4 +4970,360 @@
Mesh: 140639624 Mesh: 140639624
Material: 131956078 Material: 131956078
IsActive: true IsActive: true
Scripts: ~
- EID: 358
Name: Food
IsActive: true
NumberOfChildren: 23
Components:
Transform Component:
Translate: {x: 0, y: 0, z: 0}
Rotate: {x: -0, y: 0, z: -0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Scripts: ~
- EID: 384
Name: Food_Apple
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 2.67368722, y: 0.803615987, z: -0.309674412}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 144128170
Material: 131956078
IsActive: true
Scripts: ~
- EID: 382
Name: Food_Cheese
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 12.1188478, y: 2.36368299, z: 0.0781341419}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 141841143
Material: 131956078
IsActive: true
Scripts: ~
- EID: 381
Name: Food_Apple
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 2.00008488, y: 1.02117109, z: -0.272745907}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 144128170
Material: 131956078
IsActive: true
Scripts: ~
- EID: 379
Name: Food_Cheese
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.289246678, y: 1.08858216, z: -0.335788906}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 141841143
Material: 131956078
IsActive: true
Scripts: ~
- EID: 378
Name: Food_Meat
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.289246678, y: 1.08858216, z: 2.63276219}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136892700
Material: 131956078
IsActive: true
Scripts: ~
- EID: 377
Name: Food_Meat
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 2.01955795, y: 2.79646635, z: -0.173300505}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136892700
Material: 131956078
IsActive: true
Scripts: ~
- EID: 376
Name: Food_Apple
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 5.82834911, y: 2.22263741, z: 7.94544458}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 144128170
Material: 131956078
IsActive: true
Scripts: ~
- EID: 374
Name: Food_Apple
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 2.35145187, y: 0.803615987, z: -0.625590205}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 144128170
Material: 131956078
IsActive: true
Scripts: ~
- EID: 373
Name: Food_Apple
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.00815489888, y: 2.73697543, z: 1.68815851}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 144128170
Material: 131956078
IsActive: true
Scripts: ~
- EID: 372
Name: Food_Apple
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 1.7647357, y: 0.405964196, z: 2.47084498}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 144128170
Material: 131956078
IsActive: true
Scripts: ~
- EID: 371
Name: Food_Apple
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 4.23329258, y: 0.354744881, z: -0.136515647}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 144128170
Material: 131956078
IsActive: true
Scripts: ~
- EID: 370
Name: Food_Cheese
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 4.26609802, y: 0.833776832, z: -0.677513659}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 141841143
Material: 131956078
IsActive: true
Scripts: ~
- EID: 369
Name: Food_Meat
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 2.10390115, y: 0.747627378, z: 1.75900662}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136892700
Material: 131956078
IsActive: true
Scripts: ~
- EID: 368
Name: Food_Meat
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 7.59302235, y: 2.3393712, z: -0.187277719}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136892700
Material: 131956078
IsActive: true
Scripts: ~
- EID: 366
Name: Food_Cheese
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 2.71393967, y: 0.539582014, z: 7.06600809}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 141841143
Material: 131956078
IsActive: true
Scripts: ~
- EID: 365
Name: Food_Meat
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 6.54555845, y: 2.07684445, z: 7.65922546}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136892700
Material: 131956078
IsActive: true
Scripts: ~
- EID: 364
Name: Food_Cheese
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 1.86549664, y: 2.73507738, z: 1.2655673}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 141841143
Material: 131956078
IsActive: true
Scripts: ~
- EID: 363
Name: Food_Meat
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 2.68094921, y: 2.79646635, z: 1.2316364}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136892700
Material: 131956078
IsActive: true
Scripts: ~
- EID: 362
Name: Food_Meat
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.548751414, y: 2.07684445, z: 10.5268383}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136892700
Material: 131956078
IsActive: true
Scripts: ~
- EID: 360
Name: Food_Apple
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 4.25191593, y: 2.21991086, z: 10.735425}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 144128170
Material: 131956078
IsActive: true
Scripts: ~
- EID: 359
Name: Food_Apple
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.711149335, y: 2.21991086, z: 7.94430065}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 144128170
Material: 131956078
IsActive: true
Scripts: ~
- EID: 357
Name: Food_Apple
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 6.44702148, y: 1.01102316, z: 6.54053688}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 144128170
Material: 131956078
IsActive: true
Scripts: ~
- EID: 356
Name: Food_Cheese
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 4.25000906, y: 2.28261352, z: 8.01108646}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 141841143
Material: 131956078
IsActive: true
Scripts: ~ Scripts: ~

1
Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs
View File

@ -89,7 +89,6 @@ public class PickAndThrow : Script
float temp = (1 - ratio) * 0.00075f; float temp = (1 - ratio) * 0.00075f;
if (temp <= 0.0006f) if (temp <= 0.0006f)
temp = 0.1f; temp = 0.1f;
Debug.Log($" RATIO {temp}");
silhouettePlayerRend.Material.SetProperty<float>("data.offset", temp); silhouettePlayerRend.Material.SetProperty<float>("data.offset", temp);
silhouetteBagRend.Material.SetProperty<float>("data.offset", temp); silhouetteBagRend.Material.SetProperty<float>("data.offset", temp);
} }

2
SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsConstants.h
View File

@ -127,6 +127,7 @@ namespace SHADE
static constexpr std::string_view GBUFFER_WRITE_SUBPASS = "G-Buffer Write"; static constexpr std::string_view GBUFFER_WRITE_SUBPASS = "G-Buffer Write";
static constexpr std::string_view GBUFFER_WRITE_VFX_SUBPASS = "G-Buffer Write With VFX";
static constexpr std::string_view UI_SUBPASS = "UI"; static constexpr std::string_view UI_SUBPASS = "UI";
static constexpr std::string_view UI_TRANSLUCENT_SUBPASS = "UI Translucent"; static constexpr std::string_view UI_TRANSLUCENT_SUBPASS = "UI Translucent";
static constexpr std::string_view VFX_SUBPASS = "VFX"; static constexpr std::string_view VFX_SUBPASS = "VFX";
@ -135,6 +136,7 @@ namespace SHADE
static constexpr std::array USABLE_SUBPASSES = static constexpr std::array USABLE_SUBPASSES =
{ {
GBUFFER_WRITE_SUBPASS, GBUFFER_WRITE_SUBPASS,
GBUFFER_WRITE_VFX_SUBPASS,
UI_SUBPASS, UI_SUBPASS,
UI_TRANSLUCENT_SUBPASS, UI_TRANSLUCENT_SUBPASS,
OBJ_VFX_SUBPASS OBJ_VFX_SUBPASS

12
SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
View File

@ -255,12 +255,24 @@ namespace SHADE
gBufferSubpass->AddColorOutput("Object VFX"); gBufferSubpass->AddColorOutput("Object VFX");
gBufferSubpass->AddDepthOutput("Depth Buffer", SH_RENDER_GRAPH_RESOURCE_FLAGS::DEPTH_STENCIL); gBufferSubpass->AddDepthOutput("Depth Buffer", SH_RENDER_GRAPH_RESOURCE_FLAGS::DEPTH_STENCIL);
auto gBufferVfxSubpass = gBufferNode->AddSubpass(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_VFX_SUBPASS.data(), worldViewport, worldRenderer);
gBufferVfxSubpass->AddColorOutput("Position");
gBufferVfxSubpass->AddColorOutput("Entity ID");
gBufferVfxSubpass->AddColorOutput("Light Layer Indices");
gBufferVfxSubpass->AddColorOutput("Normals");
gBufferVfxSubpass->AddColorOutput("Albedo");
gBufferVfxSubpass->AddColorOutput("Position World Space");
gBufferVfxSubpass->AddColorOutput("Object VFX");
gBufferVfxSubpass->AddDepthOutput("Depth Buffer", SH_RENDER_GRAPH_RESOURCE_FLAGS::DEPTH_STENCIL);
// We add the object VFX render target and depth buffer as input just in case we want to make comparisons // We add the object VFX render target and depth buffer as input just in case we want to make comparisons
auto objectVfxSubpassNoDepth = gBufferNode->AddSubpass(SHGraphicsConstants::RenderGraphEntityNames::OBJ_VFX_SUBPASS.data(), worldViewport, worldRenderer); auto objectVfxSubpassNoDepth = gBufferNode->AddSubpass(SHGraphicsConstants::RenderGraphEntityNames::OBJ_VFX_SUBPASS.data(), worldViewport, worldRenderer);
objectVfxSubpassNoDepth->AddColorOutput("Object VFX"); objectVfxSubpassNoDepth->AddColorOutput("Object VFX");
objectVfxSubpassNoDepth->AddInput ("Depth Buffer"); objectVfxSubpassNoDepth->AddInput ("Depth Buffer");
usableSubpassesMapping.emplace(std::string(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_SUBPASS.data()), gBufferSubpass); usableSubpassesMapping.emplace(std::string(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_SUBPASS.data()), gBufferSubpass);
usableSubpassesMapping.emplace(std::string(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_VFX_SUBPASS.data()), gBufferVfxSubpass);
usableSubpassesMapping.emplace(std::string(SHGraphicsConstants::RenderGraphEntityNames::OBJ_VFX_SUBPASS.data()), objectVfxSubpassNoDepth); usableSubpassesMapping.emplace(std::string(SHGraphicsConstants::RenderGraphEntityNames::OBJ_VFX_SUBPASS.data()), objectVfxSubpassNoDepth);
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/