テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

Untitled diff

作成日 7 年前差分は期限切れになりません

17 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

280 行

12 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

275 行

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using KinematicCharacterController;

using System;

namespace KinematicCharacterController.Walkthrough.WallJumping

namespace LezCharacterController

{

public struct PlayerCharacterInputs

{

public float horizontal;

public bool JumpDown;

}

public class MyCharacterController : BaseCharacterController

public class KinematicCharacter : BaseCharacterController

{

[Header("Stable Movement")]

[Header("Movement")]

public float MaxStableMoveSpeed = 10f;

public float StableMovementSharpness = 15;

public float rotateSpeed = 10;

[Header("Air Movement")]

public float MaxAirMoveSpeed = 10f;

public float AirAccelerationSpeed = 5f;

public float Drag = 0.1f;

[Header("Jumping")]

public bool AllowJumpingWhenSliding = false;

public bool AllowDoubleJump = false;

public bool AllowWallJump = false;

public float JumpSpeed = 10f;

public float JumpPreGroundingGraceTime = 0f;

public float JumpPostGroundingGraceTime = 0f;

[Header("Misc")]

public bool RotationObstruction;

public Vector3 Gravity = new Vector3(0, -30f, 0);

public Transform MeshRoot;

private Vector3 moveDirection;

private float Angle;

private float inputAmount;

private bool _jumpRequested = false;

private bool _jumpConsumed = false;

private bool _jumpedThisFrame = false;

private float _timeSinceJumpRequested = Mathf.Infinity;

private float _timeSinceLastAbleToJump = 0f;

private bool _doubleJumpConsumed = false;

private bool _canWallJump = false;

private Vector3 _wallJumpNormal;

float inputAmount, Angle;

public Transform DirectionReference;

Vector3 moveDirection;

Transform DirectionReference;

private void Start()

{

DirectionReference = new GameObject("Player's Direction Reference").transform;

}

/// <summary>

/// This is called every frame by MyPlayer in order to tell the character what its inputs are

/// </summary>

public void SetInputs(ref PlayerCharacterInputs inputs)

{

// Clamp input

float inputMagnitude = Mathf.Abs(inputs.horizontal);

inputAmount = Mathf.Clamp01(inputMagnitude);

// base movement on direction reference

Vector3 correctedHorizontal = inputs.horizontal * DirectionReference.transform.right;

moveDirection = new Vector3((correctedHorizontal).normalized.x, 0, (correctedHorizontal).normalized.z);

// Jumping input

if (inputs.JumpDown)

{

_timeSinceJumpRequested = 0f;

_jumpRequested = true;

}

/// <summary>

/// (Called by KinematicCharacterMotor during its update cycle)

/// This is called before the character begins its movement update

/// </summary>

public override void BeforeCharacterUpdate(float deltaTime)

{

}

/// <summary>

/// (Called by KinematicCharacterMotor during its update cycle)

/// This is where you tell your character what its rotation should be right now.

/// This is the ONLY place where you should set the character's rotation

/// </summary>

public override void UpdateRotation(ref Quaternion currentRotation, float deltaTime)

{

// rotate player to movement direction

if (moveDirection != Vector3.zero)

{

Angle = Vector3.Angle(transform.forward, DirectionReference.right);

Quaternion rot = Quaternion.LookRotation(moveDirection);

Quaternion targetRotation = Quaternion.Slerp(transform.rotation, rot, deltaTime * inputAmount * rotateSpeed);

currentRotation = targetRotation;

}

else

{

if (Angle < 90)

{

Quaternion rot = Quaternion.LookRotation(DirectionReference.right);

Quaternion targetRotation = Quaternion.Slerp(transform.rotation, rot, deltaTime * rotateSpeed);

currentRotation = targetRotation;

}

else

{

Quaternion rot = Quaternion.LookRotation(-DirectionReference.right);

Quaternion targetRotation = Quaternion.Slerp(transform.rotation, rot, deltaTime * rotateSpeed);

currentRotation = targetRotation;

}

/// <summary>

/// (Called by KinematicCharacterMotor during its update cycle)

/// This is where you tell your character what its velocity should be right now.

/// This is the ONLY place where you can set the character's velocity

/// </summary>

public override void UpdateVelocity(ref Vector3 currentVelocity, float deltaTime)

{

Vector3 targetMovementVelocity = Vector3.zero;

if (Motor.GroundingStatus.IsStableOnGround)

{

// Reorient velocity on slope

currentVelocity = Motor.GetDirectionTangentToSurface(currentVelocity, Motor.GroundingStatus.GroundNormal) * currentVelocity.magnitude;

// Calculate target velocity

Vector3 inputRight = Vector3.Cross(moveDirection, Motor.CharacterUp);

Vector3 reorientedInput = Vector3.Cross(Motor.GroundingStatus.GroundNormal, inputRight).normalized * moveDirection.magnitude;

targetMovementVelocity = reorientedInput * MaxStableMoveSpeed;

// Smooth movement Velocity

currentVelocity = Vector3.Lerp(currentVelocity, targetMovementVelocity, 1 - Mathf.Exp(-StableMovementSharpness * deltaTime));

}

else

{

// Add move input

if (moveDirection.sqrMagnitude > 0f)

{

targetMovementVelocity = moveDirection * MaxAirMoveSpeed;

// Prevent climbing on un-stable slopes with air movement

if (Motor.GroundingStatus.FoundAnyGround)

{

Vector3 perpenticularObstructionNormal = Vector3.Cross(Vector3.Cross(Motor.CharacterUp, Motor.GroundingStatus.GroundNormal), Motor.CharacterUp).normalized;

targetMovementVelocity = Vector3.ProjectOnPlane(targetMovementVelocity, perpenticularObstructionNormal);

}

Vector3 velocityDiff = Vector3.ProjectOnPlane(targetMovementVelocity - currentVelocity, Gravity);

currentVelocity += velocityDiff * AirAccelerationSpeed * deltaTime;

}

// Gravity

currentVelocity += Gravity * deltaTime;

// Drag

currentVelocity *= (1f / (1f + (Drag * deltaTime)));

}

// Handle jumping

{

_jumpedThisFrame = false;

_timeSinceJumpRequested += deltaTime;

if (_jumpRequested)

{

// Handle double jump

if (AllowDoubleJump)

{

if (_jumpConsumed && !_doubleJumpConsumed && (AllowJumpingWhenSliding ? !Motor.GroundingStatus.FoundAnyGround : !Motor.GroundingStatus.IsStableOnGround))

{

Motor.ForceUnground();

// Add to the return velocity and reset jump state

currentVelocity += (Motor.CharacterUp * JumpSpeed) - Vector3.Project(currentVelocity, Motor.CharacterUp);

_jumpRequested = false;

_doubleJumpConsumed = true;

_jumpedThisFrame = true;

}

// See if we actually are allowed to jump

if (_canWallJump ||

(!_jumpConsumed && ((AllowJumpingWhenSliding ? Motor.GroundingStatus.FoundAnyGround : Motor.GroundingStatus.IsStableOnGround) || _timeSinceLastAbleToJump <= JumpPostGroundingGraceTime)))

{

// Calculate jump direction before ungrounding

Vector3 jumpDirection = Motor.CharacterUp;

if (_canWallJump)

{

jumpDirection = _wallJumpNormal;

}

else if (Motor.GroundingStatus.FoundAnyGround && !Motor.GroundingStatus.IsStableOnGround)

{

jumpDirection = Motor.GroundingStatus.GroundNormal;

}

// Makes the character skip ground probing/snapping on its next update.

// If this line weren't here, the character would remain snapped to the ground when trying to jump. Try commenting this line out and see.

Motor.ForceUnground();

// Add to the return velocity and reset jump state

currentVelocity += (jumpDirection * JumpSpeed) - Vector3.Project(currentVelocity, Motor.CharacterUp);

_jumpRequested = false;

_jumpConsumed = true;

_jumpedThisFrame = true;

}

// Reset wall jump

_canWallJump = false;

}

/// <summary>

/// (Called by KinematicCharacterMotor during its update cycle)

/// This is called after the character has finished its movement update

/// </summary>

public override void AfterCharacterUpdate(float deltaTime)

{

// Handle jump-related values

{

// Handle jumping pre-ground grace period

if (_jumpRequested && _timeSinceJumpRequested > JumpPreGroundingGraceTime)

{

_jumpRequested = false;

}

if (AllowJumpingWhenSliding ? Motor.GroundingStatus.FoundAnyGround : Motor.GroundingStatus.IsStableOnGround)

{

// If we're on a ground surface, reset jumping values

if (!_jumpedThisFrame)

{

_doubleJumpConsumed = false;

_jumpConsumed = false;

}

_timeSinceLastAbleToJump = 0f;

}

else

{

// Keep track of time since we were last able to jump (for grace period)

_timeSinceLastAbleToJump += deltaTime;

}

public override bool IsColliderValidForCollisions(Collider coll)

{

return true;

}

public override void OnGroundHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, ref HitStabilityReport hitStabilityReport)

{

}

public override void OnMovementHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, ref HitStabilityReport hitStabilityReport)

{

// We can wall jump only if we are not stable on ground and are moving against an obstruction

if (AllowWallJump && !Motor.GroundingStatus.IsStableOnGround && !hitStabilityReport.IsStable)

{

_canWallJump = true;

_wallJumpNormal = hitNormal;

}

public override void PostGroundingUpdate(float deltaTime)

public override void ProcessHitStabilityReport(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, Vector3 atCharacterPosition, Quaternion atCharacterRotation, ref HitStabilityReport hitStabilityReport)

{

}

public void AddVelocity(Vector3 velocity)

{

}

public override void PostGroundingUpdate(float deltaTime)

{

}

保存された差分

原文

ファイルを開く

using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using KinematicCharacterController;
using System;

namespace KinematicCharacterController.Walkthrough.WallJumping
{
    public struct PlayerCharacterInputs
    {
        public float horizontal;
        public bool JumpDown;
    }

public class MyCharacterController : BaseCharacterController
    {
        [Header("Stable Movement")]
        public float MaxStableMoveSpeed = 10f;
        public float StableMovementSharpness = 15;
        public float rotateSpeed = 10;

[Header("Air Movement")]
        public float MaxAirMoveSpeed = 10f;
        public float AirAccelerationSpeed = 5f;
        public float Drag = 0.1f;

[Header("Jumping")]
        public bool AllowJumpingWhenSliding = false;
        public bool AllowDoubleJump = false;
        public bool AllowWallJump = false;
        public float JumpSpeed = 10f;
        public float JumpPreGroundingGraceTime = 0f;
        public float JumpPostGroundingGraceTime = 0f;

[Header("Misc")]
        public Vector3 Gravity = new Vector3(0, -30f, 0);
        public Transform MeshRoot;
        
        private bool _jumpRequested = false;
        private bool _jumpConsumed = false;
        private bool _jumpedThisFrame = false;
        private float _timeSinceJumpRequested = Mathf.Infinity;
        private float _timeSinceLastAbleToJump = 0f;
        private bool _doubleJumpConsumed = false;
        private bool _canWallJump = false;
        private Vector3 _wallJumpNormal;

float inputAmount, Angle;
        Vector3 moveDirection;
        Transform DirectionReference;

private void Start()
        {
            DirectionReference = new GameObject("Player's Direction Reference").transform;
        }

/// <summary>
        /// This is called every frame by MyPlayer in order to tell the character what its inputs are
        /// </summary>
        public void SetInputs(ref PlayerCharacterInputs inputs)
        {
            // Clamp input
            float inputMagnitude = Mathf.Abs(inputs.horizontal);
            inputAmount = Mathf.Clamp01(inputMagnitude);

// base movement on direction reference
            Vector3 correctedHorizontal = inputs.horizontal * DirectionReference.transform.right;
            moveDirection = new Vector3((correctedHorizontal).normalized.x, 0, (correctedHorizontal).normalized.z);

// Jumping input
            if (inputs.JumpDown)
            {
                _timeSinceJumpRequested = 0f;
                _jumpRequested = true;
            }
        }

/// <summary>
        /// (Called by KinematicCharacterMotor during its update cycle)
        /// This is called before the character begins its movement update
        /// </summary>
        public override void BeforeCharacterUpdate(float deltaTime)
        {
        }

/// <summary>
        /// (Called by KinematicCharacterMotor during its update cycle)
        /// This is where you tell your character what its rotation should be right now. 
        /// This is the ONLY place where you should set the character's rotation
        /// </summary>
        public override void UpdateRotation(ref Quaternion currentRotation, float deltaTime)
        {
            // rotate player to movement direction
            if (moveDirection != Vector3.zero)
            {
                Angle = Vector3.Angle(transform.forward, DirectionReference.right);
                Quaternion rot = Quaternion.LookRotation(moveDirection);
                Quaternion targetRotation = Quaternion.Slerp(transform.rotation, rot, deltaTime * inputAmount * rotateSpeed);
                currentRotation = targetRotation;
            }
            else
            {
                if (Angle < 90)
                {
                    Quaternion rot = Quaternion.LookRotation(DirectionReference.right);
                    Quaternion targetRotation = Quaternion.Slerp(transform.rotation, rot, deltaTime * rotateSpeed);
                    currentRotation = targetRotation;
                }
                else
                {
                    Quaternion rot = Quaternion.LookRotation(-DirectionReference.right);
                    Quaternion targetRotation = Quaternion.Slerp(transform.rotation, rot, deltaTime * rotateSpeed);
                    currentRotation = targetRotation;
                }
            }
        }

/// <summary>
        /// (Called by KinematicCharacterMotor during its update cycle)
        /// This is where you tell your character what its velocity should be right now. 
        /// This is the ONLY place where you can set the character's velocity
        /// </summary>
        public override void UpdateVelocity(ref Vector3 currentVelocity, float deltaTime)
        {
            Vector3 targetMovementVelocity = Vector3.zero;
            if (Motor.GroundingStatus.IsStableOnGround)
            {
                // Reorient velocity on slope
                currentVelocity = Motor.GetDirectionTangentToSurface(currentVelocity, Motor.GroundingStatus.GroundNormal) * currentVelocity.magnitude;

// Calculate target velocity
                Vector3 inputRight = Vector3.Cross(moveDirection, Motor.CharacterUp);
                Vector3 reorientedInput = Vector3.Cross(Motor.GroundingStatus.GroundNormal, inputRight).normalized * moveDirection.magnitude;
                targetMovementVelocity = reorientedInput * MaxStableMoveSpeed;

// Smooth movement Velocity
                currentVelocity = Vector3.Lerp(currentVelocity, targetMovementVelocity, 1 - Mathf.Exp(-StableMovementSharpness * deltaTime));
            }
            else
            {
                // Add move input
                if (moveDirection.sqrMagnitude > 0f)
                {
                    targetMovementVelocity = moveDirection * MaxAirMoveSpeed;

// Prevent climbing on un-stable slopes with air movement
                    if (Motor.GroundingStatus.FoundAnyGround)
                    {
                        Vector3 perpenticularObstructionNormal = Vector3.Cross(Vector3.Cross(Motor.CharacterUp, Motor.GroundingStatus.GroundNormal), Motor.CharacterUp).normalized;
                        targetMovementVelocity = Vector3.ProjectOnPlane(targetMovementVelocity, perpenticularObstructionNormal);
                    }

Vector3 velocityDiff = Vector3.ProjectOnPlane(targetMovementVelocity - currentVelocity, Gravity);
                    currentVelocity += velocityDiff * AirAccelerationSpeed * deltaTime;
                }

// Gravity
                currentVelocity += Gravity * deltaTime;

// Drag
                currentVelocity *= (1f / (1f + (Drag * deltaTime)));
            }

// Handle jumping
            {
                _jumpedThisFrame = false;
                _timeSinceJumpRequested += deltaTime;
                if (_jumpRequested)
                {
                    // Handle double jump
                    if (AllowDoubleJump)
                    {
                        if (_jumpConsumed && !_doubleJumpConsumed && (AllowJumpingWhenSliding ? !Motor.GroundingStatus.FoundAnyGround : !Motor.GroundingStatus.IsStableOnGround))
                        {
                            Motor.ForceUnground();

// Add to the return velocity and reset jump state
                            currentVelocity += (Motor.CharacterUp * JumpSpeed) - Vector3.Project(currentVelocity, Motor.CharacterUp);
                            _jumpRequested = false;
                            _doubleJumpConsumed = true;
                            _jumpedThisFrame = true;
                        }
                    }

// See if we actually are allowed to jump
                    if (_canWallJump ||
                        (!_jumpConsumed && ((AllowJumpingWhenSliding ? Motor.GroundingStatus.FoundAnyGround : Motor.GroundingStatus.IsStableOnGround) || _timeSinceLastAbleToJump <= JumpPostGroundingGraceTime)))
                    {
                        // Calculate jump direction before ungrounding
                        Vector3 jumpDirection = Motor.CharacterUp;
                        if (_canWallJump)
                        {
                            jumpDirection = _wallJumpNormal;
                        }
                        else if (Motor.GroundingStatus.FoundAnyGround && !Motor.GroundingStatus.IsStableOnGround)
                        {
                            jumpDirection = Motor.GroundingStatus.GroundNormal;
                        }

// Makes the character skip ground probing/snapping on its next update. 
                        // If this line weren't here, the character would remain snapped to the ground when trying to jump. Try commenting this line out and see.
                        Motor.ForceUnground();

// Add to the return velocity and reset jump state
                        currentVelocity += (jumpDirection * JumpSpeed) - Vector3.Project(currentVelocity, Motor.CharacterUp);
                        _jumpRequested = false;
                        _jumpConsumed = true;
                        _jumpedThisFrame = true;
                    }
                }

// Reset wall jump
                _canWallJump = false;
            }
        }

/// <summary>
        /// (Called by KinematicCharacterMotor during its update cycle)
        /// This is called after the character has finished its movement update
        /// </summary>
        public override void AfterCharacterUpdate(float deltaTime)
        {
            // Handle jump-related values
            {
                // Handle jumping pre-ground grace period
                if (_jumpRequested && _timeSinceJumpRequested > JumpPreGroundingGraceTime)
                {
                    _jumpRequested = false;
                }

if (AllowJumpingWhenSliding ? Motor.GroundingStatus.FoundAnyGround : Motor.GroundingStatus.IsStableOnGround)
                {
                    // If we're on a ground surface, reset jumping values
                    if (!_jumpedThisFrame)
                    {
                        _doubleJumpConsumed = false;
                        _jumpConsumed = false;
                    }
                    _timeSinceLastAbleToJump = 0f;
                }
                else
                {
                    // Keep track of time since we were last able to jump (for grace period)
                    _timeSinceLastAbleToJump += deltaTime;
                }
            }
        }

public override bool IsColliderValidForCollisions(Collider coll)
        {
            return true;
        }

public override void OnGroundHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, ref HitStabilityReport hitStabilityReport)
        {
        }

public override void OnMovementHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, ref HitStabilityReport hitStabilityReport)
        {
            // We can wall jump only if we are not stable on ground and are moving against an obstruction
            if (AllowWallJump && !Motor.GroundingStatus.IsStableOnGround && !hitStabilityReport.IsStable)
            {
                _canWallJump = true;
                _wallJumpNormal = hitNormal;
            }
        }

public override void PostGroundingUpdate(float deltaTime)
        {
        }

public void AddVelocity(Vector3 velocity)
        {
        }

変更されたテキスト

ファイルを開く

using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using KinematicCharacterController;
using System;

namespace LezCharacterController
{
    public struct PlayerCharacterInputs
    {
        public float horizontal;
        public bool JumpDown;
    }

public class KinematicCharacter : BaseCharacterController
    {
        [Header("Movement")]
        public float MaxStableMoveSpeed = 10f;
        public float StableMovementSharpness = 15;
        public float rotateSpeed = 10;

[Header("Air Movement")]
        public float MaxAirMoveSpeed = 10f;
        public float AirAccelerationSpeed = 5f;
        public float Drag = 0.1f;

[Header("Misc")]
        public bool RotationObstruction;
        public Vector3 Gravity = new Vector3(0, -30f, 0);
        public Transform MeshRoot;

private Vector3 moveDirection;
        private float Angle;
        private float inputAmount;
        private bool _jumpRequested = false;
        private bool _jumpConsumed = false;
        private bool _jumpedThisFrame = false;
        private float _timeSinceJumpRequested = Mathf.Infinity;
        private float _timeSinceLastAbleToJump = 0f;
        private bool _doubleJumpConsumed = false;
        private bool _canWallJump = false;
        private Vector3 _wallJumpNormal;

public Transform DirectionReference;

private void Start()
        {
            DirectionReference = new GameObject("Player's Direction Reference").transform;
        }

// Jumping input
            if (inputs.JumpDown)
            {
                _timeSinceJumpRequested = 0f;
                _jumpRequested = true;
            }
        }

public override void BeforeCharacterUpdate(float deltaTime)
        {
        }

// Gravity
                currentVelocity += Gravity * deltaTime;

// Drag
                currentVelocity *= (1f / (1f + (Drag * deltaTime)));
            }

// Reset wall jump
                _canWallJump = false;
            }
        }

public override bool IsColliderValidForCollisions(Collider coll)
        {
            return true;
        }

public override void OnGroundHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, ref HitStabilityReport hitStabilityReport)
        {
        }

public override void PostGroundingUpdate(float deltaTime)
        {
        }
    }
}