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

Fixed typos

This commit is contained in:
Diren D Bharwani 2023-01-22 17:38:51 +08:00
parent 36e01260ec
commit 1dc16fdcda
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Assets/Scenes/PhysicsSandbox.shade
View File

@ -62,7 +62,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 3, y: 7.5, z: 0} Translate: {x: -1, y: 7.5, z: 0}
Rotate: {x: -0, y: 0, z: 0.785398185} Rotate: {x: -0, y: 0, z: 0.785398185}
Scale: {x: 1, y: 1, z: 1} Scale: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
@ -77,11 +77,11 @@
Interpolate: true Interpolate: true
Sleeping Enabled: true Sleeping Enabled: true
Freeze Position X: false Freeze Position X: false
Freeze Position Y: true Freeze Position Y: false
Freeze Position Z: false Freeze Position Z: false
Freeze Rotation X: false Freeze Rotation X: true
Freeze Rotation Y: false Freeze Rotation Y: true
Freeze Rotation Z: false Freeze Rotation Z: true
IsActive: true IsActive: true
Collider Component: Collider Component:
DrawColliders: false DrawColliders: false
@ -90,7 +90,7 @@
Collision Tag: 1 Collision Tag: 1
Type: Sphere Type: Sphere
Radius: 1 Radius: 1
Friction: 0.400000006 Friction: 1
Bounciness: 0 Bounciness: 0
Density: 1 Density: 1
Position Offset: {x: 0, y: 0, z: 0} Position Offset: {x: 0, y: 0, z: 0}
@ -131,7 +131,7 @@
Collision Tag: 2 Collision Tag: 2
Type: Box Type: Box
Half Extents: {x: 1, y: 1, z: 1} Half Extents: {x: 1, y: 1, z: 1}
Friction: 0.400000006 Friction: 1
Bounciness: 0 Bounciness: 0
Density: 1 Density: 1
Position Offset: {x: 0, y: 0, z: 0} Position Offset: {x: 0, y: 0, z: 0}
@ -144,9 +144,9 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0, y: -1.74209237, z: 0} Translate: {x: 0, y: -3, z: 0}
Rotate: {x: -0, y: 0, z: -0} Rotate: {x: -0, y: 0, z: -0}
Scale: {x: 10, y: 0.5, z: 10} Scale: {x: 10, y: 3, z: 10}
IsActive: true IsActive: true
RigidBody Component: RigidBody Component:
Type: Static Type: Static
@ -267,8 +267,8 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: -1, y: 7, z: 0} Translate: {x: 2, y: 2, z: 3}
Rotate: {x: 0.785398185, y: 0.785398185, z: 0.785398185} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 0.999990404, y: 0.999994457, z: 0.999985337} Scale: {x: 0.999990404, y: 0.999994457, z: 0.999985337}
IsActive: true IsActive: true
RigidBody Component: RigidBody Component:
@ -278,7 +278,7 @@
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0 Angular Drag: 0
Use Gravity: true Use Gravity: true
Gravity Scale: 1 Gravity Scale: 5
Interpolate: true Interpolate: true
Sleeping Enabled: true Sleeping Enabled: true
Freeze Position X: false Freeze Position X: false

4
SHADE_Engine/src/Physics/Dynamics/SHPhysicsWorld.h
View File

@ -108,7 +108,7 @@ namespace SHADE
* Performs a single simulation step. <br/> * Performs a single simulation step. <br/>
* Detect Collisions -> Integrate Forces -> Resolve Contacts -> Integrate Velocities * Detect Collisions -> Integrate Forces -> Resolve Contacts -> Integrate Velocities
* @param dt * @param dt
* A discrete time step for the simulation. This should be consistent for deteministic * A discrete time step for the simulation. This should be consistent for deterministic
* behaviour. * behaviour.
*/ */
void Step (float dt); void Step (float dt);
@ -118,7 +118,7 @@ namespace SHADE
/* Type Definitions */ /* Type Definitions */
/*---------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/
// EntityIDs are used to map resolved contraints back to bodies // EntityIDs are used to map resolved constraints back to bodies
using RigidBodies = std::unordered_map<EntityID, SHRigidBody*>; using RigidBodies = std::unordered_map<EntityID, SHRigidBody*>;
/*---------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/