Skip to content

Commit

Permalink
Merge pull request #3 from BabylonJS/master
Browse files Browse the repository at this point in the history
merge
  • Loading branch information
PolygonalSun authored Jan 15, 2021
2 parents 53bb0fb + 5f1c14e commit abff5c2
Show file tree
Hide file tree
Showing 112 changed files with 7,229 additions and 3,099 deletions.
14 changes: 14 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,20 @@
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch WebGPU Build Validation (Edge) - Direct",
"type": "edge",
"version": "canary",
"request": "launch",
"url": "http://localhost:1338/tests/validation/?engine=webgpu",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis",
"--enable-unsafe-webgpu"
]
},
{
"name": "Launch memory checks (Chrome)",
"type": "chrome",
Expand Down
30 changes: 21 additions & 9 deletions Playground/libs/babylon.manager.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1489,7 +1489,7 @@ declare module BABYLON {
/** Creates a targeted float animation for tweening. */
static CreateTweenAnimation(name: string, targetProperty: string, startValue: number, endValue: number, frameRate?: number, loopMode?: number): BABYLON.Animation;
/** Gets the last key frame index value. */
static GetLastKeyFrameValue(animation: BABYLON.Animation): number;
static GetLastKeyFrameIndex(animation: BABYLON.Animation): number;
/** Private internal frame interpolation helper */
private static InterpolateAnimation;
/** Initialize default shader material properties */
Expand Down Expand Up @@ -2177,6 +2177,7 @@ declare module BABYLON {
private _isPhysicsReady;
private _maxCollisions;
private _useGhostSweepTest;
private _tmpPositionBuffer;
private _tmpCollisionContacts;
updatePosition: boolean;
getInternalCharacter(): any;
Expand Down Expand Up @@ -2214,7 +2215,7 @@ declare module BABYLON {
protected m_moveDeltaX: number;
protected m_moveDeltaZ: number;
protected m_physicsEngine: BABYLON.IPhysicsEngine;
protected m_collisionPosition: BABYLON.Vector3;
protected m_characterPosition: BABYLON.Vector3;
protected internalWarp(position: any): void;
protected internalJump(): void;
protected internalSetJumpSpeed(speed: number): void;
Expand Down Expand Up @@ -2254,13 +2255,19 @@ declare module BABYLON {
getContactProcessingThreshold(): number;
/** Sets character contact processing threshold using physics ghost object. (Advanved Use Only) */
setContactProcessingThreshold(threshold: number): void;
/** Get the current position of the physics ghost object world transform. (Advanved Use Only) */
getGhostWorldPosition(): BABYLON.Vector3;
/** Get the current position of the physics ghost object world transform. (Advanved Use Only) */
getGhostWorldPositionToRef(result: BABYLON.Vector3): void;
/** Manually set the position of the physics ghost object world transform. (Advanved Use Only) */
setGhostWorldPosition(position: BABYLON.Nullable<BABYLON.Vector3>): void;
/** Translates the kinematic character with the specfied movement velocity. */
/** Sets the kinematic character position to the specified location. */
set(x: number, y: number, z: number): void;
/** Translates the kinematic character with the specfied velocity. */
move(velocity: BABYLON.Vector3): void;
/** Jumps the kinematic chacracter with the specified jump speed. */
/** Jumps the kinematic chacracter with the specified speed. */
jump(speed: number): void;
/** Warps the kinematic chacracter to the specified warp position. */
/** Warps the kinematic chacracter to the specified position. */
warp(position: BABYLON.Vector3): void;
}
}
Expand All @@ -2286,10 +2293,13 @@ declare module BABYLON {
private avoidancePriority;
private obstacleAvoidanceType;
private distanceToTarget;
private teleporting;
private moveDirection;
private resetPosition;
private lastPosition;
private distancePosition;
private currentPosition;
private currentRotation;
private currentVelocity;
private currentWaypoint;
heightOffset: number;
Expand All @@ -2302,26 +2312,30 @@ declare module BABYLON {
stoppingDistance: number;
isReady(): boolean;
isNavigating(): boolean;
isTeleporting(): boolean;
isOnOffMeshLink(): boolean;
getAgentType(): number;
getAgentState(): number;
getAgentIndex(): number;
getAgentOffset(): number;
getTargetDistance(): number;
getCurrentWaypoint(): BABYLON.Vector3;
getCurrentPosition(): BABYLON.Vector3;
getCurrentRotation(): BABYLON.Quaternion;
getCurrentVelocity(): BABYLON.Vector3;
getAgentParameters(): BABYLON.IAgentParameters;
setAgentParameters(parameters: BABYLON.IAgentParameters): void;
protected m_agentState: number;
protected m_agentIndex: number;
protected m_agentReady: boolean;
protected m_agentGhost: BABYLON.TransformNode;
protected m_agentParams: BABYLON.IAgentParameters;
protected m_agentRotation: BABYLON.Quaternion;
protected m_agentMovement: BABYLON.Vector3;
protected m_agentDirection: BABYLON.Vector3;
protected m_agentQuaternion: BABYLON.Quaternion;
protected m_agentDestination: BABYLON.Vector3;
protected awake(): void;
protected late(): void;
protected update(): void;
protected destroy(): void;
/** Register handler that is triggered when the agent is ready for navigation */
onReadyObservable: Observable<TransformNode>;
Expand Down Expand Up @@ -2353,8 +2367,6 @@ declare module BABYLON {
getAgentWaypoint(): BABYLON.Vector3;
/** Gets agent current waypoint position. */
getAgentWaypointToRef(result: BABYLON.Vector3): void;
/** Reset the agent to transform world space position. */
resetAgentPosition(): void;
/** Cancel current waypoint path navigation. */
cancelNavigation(): void;
}
Expand Down
10 changes: 5 additions & 5 deletions Playground/libs/babylon.manager.js

Large diffs are not rendered by default.

Loading

0 comments on commit abff5c2

Please sign in to comment.