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

Fixed Button texture swapping. Fixed Button scripts on scene change. Added buttons to scenes. Added SHEDITOR define for Managed #341

Merged
maverickdgg merged 17 commits from SP3-20-UI-System into main 2023-02-04 00:32:29 +08:00
Conversation 0 Commits 17 Files Changed 85 +3103 -117
20 changed files with 3103 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4de32341e1 - Show all commits

337
Assets/Models/MD_RigTest01_SkinningTest.gltf Normal file
View File

File diff suppressed because one or more lines are too long

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

Binary file not shown.

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

@ -0,0 +1,7 @@
Name: MD_RigTest01_SkinningTest
ID: 72178939
Type: 4
Sub Assets:
Name: Cube
ID: 141097368
Type: 8

682
Assets/Models/MD_RigTest02_HierachyTest1.gltf Normal file
View File

File diff suppressed because one or more lines are too long

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

Binary file not shown.

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

@ -0,0 +1,7 @@
Name: MD_RigTest02_HierachyTest1
ID: 80500944
Type: 4
Sub Assets:
Name: Cube.001
ID: 135102560
Type: 8

682
Assets/Models/MD_RigTest03_HierachyTest2.gltf Normal file
View File

File diff suppressed because one or more lines are too long

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

Binary file not shown.

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

@ -0,0 +1,7 @@
Name: MD_RigTest03_HierachyTest2
ID: 72063399
Type: 4
Sub Assets:
Name: Cube.001
ID: 140361184
Type: 8

533
Assets/Models/MD_RigTest04_BakedIKLegTest.gltf Normal file
View File

File diff suppressed because one or more lines are too long

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

Binary file not shown.

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

@ -0,0 +1,7 @@
Name: MD_RigTest04_BakedIKLegTest
ID: 80728853
Type: 4
Sub Assets:
Name: Cube
ID: 149723808
Type: 8

199
Assets/Models/MD_RigTest05_MeshDeformTest.gltf Normal file
View File

File diff suppressed because one or more lines are too long

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

Binary file not shown.

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

@ -0,0 +1,7 @@
Name: MD_RigTest05_MeshDeformTest
ID: 82124728
Type: 4
Sub Assets:
Name: Sphere
ID: 138773466
Type: 8

515
Assets/Models/MD_RigTest06_Piston.gltf Normal file
View File

File diff suppressed because one or more lines are too long

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

Binary file not shown.

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

@ -0,0 +1,7 @@
Name: MD_RigTest06_Piston
ID: 76715962
Type: 4
Sub Assets:
Name: Cube
ID: 134911040
Type: 8

227
Assets/Scenes/Level1Scene.shade
View File

@ -2583,16 +2583,14 @@
Components:
Transform Component:
Translate: {x: 0, y: 0, z: 0}
Rotate: {x: 0, y: 0, z: 0}
Rotate: {x: -1.48352981, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 150924328
Material: 132690168
IsActive: true
Scripts:
- Type: FixRotation
Enabled: true
Scripts: ~
- EID: 2
Name: DoorFrame
IsActive: true
@ -4280,7 +4278,7 @@
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 1
Drag: 0.00999999978
Angular Drag: 0.100000001
Use Gravity: false
Interpolate: true
@ -4304,29 +4302,7 @@
Position Offset: {x: 0, y: 0.25, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: PlayerController
Enabled: true
respawnPoint: 239
currentState: 0
maxMoveVel: 3
moveForce: 50
sprintMultiplier: 1.5
rotationFactorPerFrame: 5
maxJumpHeight: 2
maxJumpTime: 0.75
fallMultipler: 3
lightMultiper: 0.75
mediumMultiper: 0.5
heavyMultiper: 0.25
- Type: PickAndThrow
Enabled: true
throwForce: [8, 10, 8]
cameraArmOffSet: [0, 0.25, 0]
delayTimer: 1
aimingLength: 0.5
throwItem: false
rayDistance: 0.5
Scripts: ~
- EID: 196
Name: HoldingPoint
IsActive: true
@ -4367,15 +4343,7 @@
Target Offset: {x: 0, y: 0, z: 0}
Camera Collision: true
IsActive: true
Scripts:
- Type: SHADE_Scripting.ThirdPersonCamera
Enabled: true
armLength: 1
turnSpeedPitch: 0.300000012
turnSpeedYaw: 0.5
pitchClamp: 45
inverseXControls: true
inverseYControls: true
Scripts: ~
- EID: 194
Name: PlayerBag
IsActive: true
@ -4458,21 +4426,7 @@
IsActive: true
NumberOfChildren: 0
Components: ~
Scripts:
- Type: GameManager
Enabled: true
winScene: 86098106
loseScene: 91685359
currGameState: 0
totalItemCount: 0
Score: 0
timer: 200
scoreText: 237
timeText: 206
multiplierText: 238
maxMultiplierDuration: 10
maxMultiplierCombo: 10
multiplierFont: 60
Scripts: ~
- EID: 235
Name: ====AI=====
IsActive: true
@ -4490,9 +4444,9 @@
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Angular Drag: 0.100000001
Use Gravity: true
Interpolate: false
Interpolate: true
Sleeping Enabled: true
Freeze Position X: false
Freeze Position Y: false
@ -4513,18 +4467,7 @@
Position Offset: {x: 0, y: 0.899999976, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: Homeowner1
Enabled: true
waypointsPool: 234
patrolSpeed: 1
chaseSpeed: 2
turningSpeed: 5
sightDistance: 8
eyeOffset: [0, 1.64999998, 0]
distanceToCapture: 0.5
captureTime: 0.5
footstepSFXIntervalMultiplier: 0.5
Scripts: ~
- EID: 234
Name: ====WaypointPool====
IsActive: true
@ -4598,7 +4541,7 @@
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Angular Drag: 0.100000001
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
@ -4621,13 +4564,7 @@
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: Item
Enabled: true
Score: 50
currCategory: 1
density: 1
dontReturn: false
Scripts: ~
- EID: 227
Name: Mesh_Cheese
IsActive: true
@ -4645,7 +4582,7 @@
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Angular Drag: 0.100000001
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
@ -4668,13 +4605,7 @@
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: Item
Enabled: true
Score: 500
currCategory: 2
density: 1
dontReturn: false
Scripts: ~
- EID: 65778
Name: Mesh_Apple
IsActive: true
@ -4692,7 +4623,7 @@
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Angular Drag: 0.100000001
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
@ -4715,13 +4646,7 @@
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: Item
Enabled: true
Score: 10
currCategory: 0
density: 1
dontReturn: false
Scripts: ~
- EID: 229
Name: ====ScoreZonePool====
IsActive: true
@ -4739,9 +4664,9 @@
Scale: {x: 1, y: 1, z: 1}
IsActive: true
RigidBody Component:
Type: Static
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Angular Drag: 0.100000001
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
@ -4764,9 +4689,7 @@
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: ScoringZone
Enabled: true
Scripts: ~
- EID: 225
Name: ScoreZone
IsActive: true
@ -4778,9 +4701,9 @@
Scale: {x: 1, y: 1, z: 1}
IsActive: true
RigidBody Component:
Type: Static
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Angular Drag: 0.100000001
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
@ -4803,9 +4726,7 @@
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: ScoringZone
Enabled: true
Scripts: ~
- EID: 224
Name: ScoreZone
IsActive: true
@ -4817,9 +4738,9 @@
Scale: {x: 1, y: 1, z: 1}
IsActive: true
RigidBody Component:
Type: Static
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Angular Drag: 0.100000001
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
@ -4842,9 +4763,7 @@
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: ScoringZone
Enabled: true
Scripts: ~
- EID: 223
Name: ScoreZone
IsActive: true
@ -4856,9 +4775,9 @@
Scale: {x: 1, y: 1, z: 1}
IsActive: true
RigidBody Component:
Type: Static
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Angular Drag: 0.100000001
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
@ -4881,9 +4800,7 @@
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: ScoringZone
Enabled: true
Scripts: ~
- EID: 222
Name: ScoreZone
IsActive: true
@ -4895,9 +4812,9 @@
Scale: {x: 1, y: 1, z: 1}
IsActive: true
RigidBody Component:
Type: Static
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Angular Drag: 0.100000001
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
@ -4920,6 +4837,86 @@
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: ScoringZone
Enabled: true
Scripts: ~
- EID: 217
Name: ===Anims===
IsActive: true
NumberOfChildren: 4
Components: ~
Scripts: ~
- EID: 221
Name: Obj1
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0.301929057, y: 0.912136197, z: -9.20810795}
Rotate: {x: 0, y: 1.57079637, z: 0}
Scale: {x: 0.100000024, y: 0.100000024, z: 0.100000024}
IsActive: true
Renderable Component:
Mesh: 141097368
Material: 117923942
IsActive: true
Animator Component:
Rig: 72178939
Clip: 72178939
IsActive: true
Scripts: ~
- EID: 219
Name: Obj3
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 2.48987007, y: 0.868837833, z: -9.20810795}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 0.113750041, y: 0.113750041, z: 0.113750041}
IsActive: true
Renderable Component:
Mesh: 149723808
Material: 117923942
IsActive: true
Animator Component:
Rig: 80728853
Clip: 80728853
IsActive: true
Scripts: ~
- EID: 218
Name: Obj2
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 1.47563028, y: 0.454107046, z: -9.20810795}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 0.0350000113, y: 0.0350000113, z: 0.0350000113}
IsActive: true
Renderable Component:
Mesh: 135102560
Material: 117923942
IsActive: true
Animator Component:
Rig: 80500944
Clip: 80500944
IsActive: true
Scripts: ~
- EID: 220
Name: Obj4
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.050871402, y: -0.0112784812, z: -8.23628521}
Rotate: {x: 0, y: -1.57079601, z: 0}
Scale: {x: 0.318530291, y: 0.318552583, z: 0.318530291}
IsActive: true
Renderable Component:
Mesh: 134911040
Material: 117923942
IsActive: true
Animator Component:
Rig: 76715962
Clip: 76715962
IsActive: true
Scripts: ~

3
SHADE_Engine/src/Physics/Collision/CollisionTags/SHCollisionTagMatrix.cpp
View File

@ -245,10 +245,9 @@ namespace SHADE
}
else
{
mask = static_cast<uint16_t>(std::stoi(maskString));
for (int i = 0; i < SHCollisionTag::NUM_LAYERS; ++i)
{
const bool LAYER_STATE = mask & 1U << i;
const bool LAYER_STATE = maskString[i] == '1';
collisionTags[tagIndex].SetLayerState(i, LAYER_STATE);
}
}