docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
listlengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
public setPivotPoint(point: Vector3, space: Space = Space.LOCAL): AbstractMesh {
<mask> Vector3.TransformNormalToRef(localAxis, this.getWorldMatrix(), result); <mask> return this; <mask> } <mask> <mask> public setPivotPoint(point:Vector3, space:Space = Space.LOCAL): AbstractMesh { <mask> <mask> if(this.getScene().getRenderId() == 0){ <mask> this.computeWorldMatrix(true); <mask> } <mask> </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove if(this.getScene().getRenderId() == 0){ </s> add if (this.getScene().getRenderId() == 0) { </s> remove public getDirectionToRef(localAxis:Vector3, result:Vector3): AbstractMesh { </s> add public getDirectionToRef(localAxis: Vector3, result: Vector3): AbstractMesh { </s> remove // Facet data </s> add // Facet data </s> remove public getAbsolutePivotPointToRef(result:Vector3): AbstractMesh { </s> add public getAbsolutePivotPointToRef(result: Vector3): AbstractMesh { </s> remove public setParent(mesh:AbstractMesh): AbstractMesh { </s> add public setParent(mesh: AbstractMesh): AbstractMesh {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.abstractMesh.ts
if (this.getScene().getRenderId() == 0) {
<mask> } <mask> <mask> public setPivotPoint(point:Vector3, space:Space = Space.LOCAL): AbstractMesh { <mask> <mask> if(this.getScene().getRenderId() == 0){ <mask> this.computeWorldMatrix(true); <mask> } <mask> <mask> var wm = this.getWorldMatrix(); <mask> </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove public setPivotPoint(point:Vector3, space:Space = Space.LOCAL): AbstractMesh { </s> add public setPivotPoint(point: Vector3, space: Space = Space.LOCAL): AbstractMesh { </s> remove public getDirectionToRef(localAxis:Vector3, result:Vector3): AbstractMesh { </s> add public getDirectionToRef(localAxis: Vector3, result: Vector3): AbstractMesh { </s> remove if(mesh == null){ </s> add if (mesh == null) { </s> remove public setParent(mesh:AbstractMesh): AbstractMesh { </s> add public setParent(mesh: AbstractMesh): AbstractMesh { </s> remove if (this.getClassName() !== "InstancedMesh"){ </s> add if (this.getClassName() !== "InstancedMesh") {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.abstractMesh.ts
public getPivotPointToRef(result: Vector3): AbstractMesh {
<mask> /** <mask> * Sets the passed Vector3 "result" with the coordinates of the mesh pivot point in the local space. <mask> * Returns the AbstractMesh. <mask> */ <mask> public getPivotPointToRef(result:Vector3): AbstractMesh{ <mask> result.x = -this._pivotMatrix.m[12]; <mask> result.y = -this._pivotMatrix.m[13]; <mask> result.z = -this._pivotMatrix.m[14]; <mask> return this; <mask> } </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove public getAbsolutePivotPointToRef(result:Vector3): AbstractMesh { </s> add public getAbsolutePivotPointToRef(result: Vector3): AbstractMesh { </s> remove public getDirection(localAxis:Vector3): Vector3 { </s> add public getDirection(localAxis: Vector3): Vector3 { </s> remove public getDirectionToRef(localAxis:Vector3, result:Vector3): AbstractMesh { </s> add public getDirectionToRef(localAxis: Vector3, result: Vector3): AbstractMesh { </s> remove public setParent(mesh:AbstractMesh): AbstractMesh { </s> add public setParent(mesh: AbstractMesh): AbstractMesh { </s> remove public removeChild(mesh:AbstractMesh): AbstractMesh { </s> add public removeChild(mesh: AbstractMesh): AbstractMesh {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.abstractMesh.ts
public setParent(mesh: AbstractMesh): AbstractMesh {
<mask> /** <mask> * Defines the passed mesh as the parent of the current mesh. <mask> * Returns the AbstractMesh. <mask> */ <mask> public setParent(mesh:AbstractMesh): AbstractMesh { <mask> <mask> var child = this; <mask> var parent = mesh; <mask> <mask> if(mesh == null){ <mask> </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove if(mesh == null){ </s> add if (mesh == null) { </s> remove public addChild(mesh:AbstractMesh): AbstractMesh { </s> add public addChild(mesh: AbstractMesh): AbstractMesh { </s> remove public removeChild(mesh:AbstractMesh): AbstractMesh { </s> add public removeChild(mesh: AbstractMesh): AbstractMesh { </s> remove public getPivotPointToRef(result:Vector3): AbstractMesh{ </s> add public getPivotPointToRef(result: Vector3): AbstractMesh { </s> remove public getAbsolutePivotPointToRef(result:Vector3): AbstractMesh { </s> add public getAbsolutePivotPointToRef(result: Vector3): AbstractMesh {
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.abstractMesh.ts
if (mesh == null) {
<mask> <mask> var child = this; <mask> var parent = mesh; <mask> <mask> if(mesh == null){ <mask> <mask> var rotation = Tmp.Quaternion[0]; <mask> var position = Tmp.Vector3[0]; <mask> var scale = Tmp.Vector3[1]; <mask> </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove public setParent(mesh:AbstractMesh): AbstractMesh { </s> add public setParent(mesh: AbstractMesh): AbstractMesh { </s> remove if(this.getScene().getRenderId() == 0){ </s> add if (this.getScene().getRenderId() == 0) { </s> remove if (this.getClassName() !== "InstancedMesh"){ </s> add if (this.getClassName() !== "InstancedMesh") { </s> remove if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_X) === AbstractMesh.BILLBOARDMODE_X) { </s> add if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_X) === AbstractMesh.BILLBOARDMODE_X) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.abstractMesh.ts
public addChild(mesh: AbstractMesh): AbstractMesh {
<mask> /** <mask> * Adds the passed mesh as a child to the current mesh. <mask> * Returns the AbstractMesh. <mask> */ <mask> public addChild(mesh:AbstractMesh): AbstractMesh { <mask> mesh.setParent(this); <mask> return this; <mask> } <mask> <mask> /** </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove public setParent(mesh:AbstractMesh): AbstractMesh { </s> add public setParent(mesh: AbstractMesh): AbstractMesh { </s> remove public removeChild(mesh:AbstractMesh): AbstractMesh { </s> add public removeChild(mesh: AbstractMesh): AbstractMesh { </s> remove public getPivotPointToRef(result:Vector3): AbstractMesh{ </s> add public getPivotPointToRef(result: Vector3): AbstractMesh { </s> remove public getDirection(localAxis:Vector3): Vector3 { </s> add public getDirection(localAxis: Vector3): Vector3 { </s> remove public getDirectionToRef(localAxis:Vector3, result:Vector3): AbstractMesh { </s> add public getDirectionToRef(localAxis: Vector3, result: Vector3): AbstractMesh {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.abstractMesh.ts
public removeChild(mesh: AbstractMesh): AbstractMesh {
<mask> /** <mask> * Removes the passed mesh from the current mesh children list. <mask> * Returns the AbstractMesh. <mask> */ <mask> public removeChild(mesh:AbstractMesh): AbstractMesh { <mask> mesh.setParent(null); <mask> return this; <mask> } <mask> <mask> /** </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove public addChild(mesh:AbstractMesh): AbstractMesh { </s> add public addChild(mesh: AbstractMesh): AbstractMesh { </s> remove public setParent(mesh:AbstractMesh): AbstractMesh { </s> add public setParent(mesh: AbstractMesh): AbstractMesh { </s> remove public getPivotPointToRef(result:Vector3): AbstractMesh{ </s> add public getPivotPointToRef(result: Vector3): AbstractMesh { </s> remove public getDirectionToRef(localAxis:Vector3, result:Vector3): AbstractMesh { </s> add public getDirectionToRef(localAxis: Vector3, result: Vector3): AbstractMesh { </s> remove public getAbsolutePivotPointToRef(result:Vector3): AbstractMesh { </s> add public getAbsolutePivotPointToRef(result: Vector3): AbstractMesh {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.abstractMesh.ts
public getAbsolutePivotPointToRef(result: Vector3): AbstractMesh {
<mask> /** <mask> * Sets the Vector3 "result" coordinates with the mesh pivot point World coordinates. <mask> * Returns the AbstractMesh. <mask> */ <mask> public getAbsolutePivotPointToRef(result:Vector3): AbstractMesh { <mask> result.x = this._pivotMatrix.m[12]; <mask> result.y = this._pivotMatrix.m[13]; <mask> result.z = this._pivotMatrix.m[14]; <mask> this.getPivotPointToRef(result); <mask> Vector3.TransformCoordinatesToRef(result, this.getWorldMatrix(), result); </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove public getPivotPointToRef(result:Vector3): AbstractMesh{ </s> add public getPivotPointToRef(result: Vector3): AbstractMesh { </s> remove public getDirection(localAxis:Vector3): Vector3 { </s> add public getDirection(localAxis: Vector3): Vector3 { </s> remove public getDirectionToRef(localAxis:Vector3, result:Vector3): AbstractMesh { </s> add public getDirectionToRef(localAxis: Vector3, result: Vector3): AbstractMesh { </s> remove // Facet data </s> add // Facet data </s> remove public setParent(mesh:AbstractMesh): AbstractMesh { </s> add public setParent(mesh: AbstractMesh): AbstractMesh {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.abstractMesh.ts
// Facet data
<mask> Vector3.TransformCoordinatesToRef(result, this.getWorldMatrix(), result); <mask> return this; <mask> } <mask> <mask> // Facet data <mask> /** <mask> * Initialize the facet data arrays : facetNormals, facetPositions and facetPartitioning. <mask> * Returns the AbstractMesh. <mask> */ <mask> private _initFacetData(): AbstractMesh { </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove public getAbsolutePivotPointToRef(result:Vector3): AbstractMesh { </s> add public getAbsolutePivotPointToRef(result: Vector3): AbstractMesh { </s> remove public getDirectionToRef(localAxis:Vector3, result:Vector3): AbstractMesh { </s> add public getDirectionToRef(localAxis: Vector3, result: Vector3): AbstractMesh { </s> remove public removeChild(mesh:AbstractMesh): AbstractMesh { </s> add public removeChild(mesh: AbstractMesh): AbstractMesh { </s> remove public addChild(mesh:AbstractMesh): AbstractMesh { </s> add public addChild(mesh: AbstractMesh): AbstractMesh { </s> remove public setPivotPoint(point:Vector3, space:Space = Space.LOCAL): AbstractMesh { </s> add public setPivotPoint(point: Vector3, space: Space = Space.LOCAL): AbstractMesh {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.abstractMesh.ts
if (!checkFace || (checkFace && facing && d >= 0.0) || (checkFace && !facing && d <= 0.0)) {
<mask> norm = facetNormals[fib]; <mask> p0 = facetPositions[fib]; <mask> <mask> d = (x - p0.x) * norm.x + (y - p0.y) * norm.y + (z - p0.z) * norm.z; <mask> if ( !checkFace || (checkFace && facing && d >= 0.0) || (checkFace && !facing && d <= 0.0) ) { <mask> // compute (x,y,z) projection on the facet = (projx, projy, projz) <mask> d = norm.x * p0.x + norm.y * p0.y + norm.z * p0.z; <mask> t0 = -(norm.x * x + norm.y * y + norm.z * z - d) / (norm.x * norm.x + norm.y * norm.y + norm.z * norm.z); <mask> projx = x + norm.x * t0; <mask> projy = y + norm.y * t0; </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) { </s> add while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) { </s> remove if (this.geometry.isVerticesDataPresent(VertexBuffer.NormalKind + index)) { </s> add if (this.geometry.isVerticesDataPresent(VertexBuffer.NormalKind + index)) { </s> remove if (this.geometry.isVerticesDataPresent(VertexBuffer.TangentKind + index)) { </s> add if (this.geometry.isVerticesDataPresent(VertexBuffer.TangentKind + index)) { </s> remove var mesh : Mesh; </s> add var mesh: Mesh; </s> remove this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); </s> add if (this.occlusionType !== AbstractMesh.OCCLUSION_TYPE_NO_VALUE) { console.log("Enter Draw"); this._gl.beginQuery(this._gl.ANY_SAMPLES_PASSED, this.occlusionQuery); this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); this._gl.endQuery(this._gl.ANY_SAMPLES_PASSED); this.isOcclusionQueryInProgress = true; } else { this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); }
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.abstractMesh.ts
if (this.occlusionType !== AbstractMesh.OCCLUSION_TYPE_NO_VALUE) { console.log("Enter Draw"); this._gl.beginQuery(this._gl.ANY_SAMPLES_PASSED, this.occlusionQuery); this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); this._gl.endQuery(this._gl.ANY_SAMPLES_PASSED); this.isOcclusionQueryInProgress = true; } else { this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); }
<mask> effectiveMaterial.bind(world, this); <mask> } <mask> <mask> // Draw <mask> this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); <mask> <mask> // Unbind <mask> effectiveMaterial.unbind(); <mask> <mask> // Outline - step 2 </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove if (this.getClassName() !== "InstancedMesh"){ </s> add if (this.getClassName() !== "InstancedMesh") { </s> remove // Facet data </s> add // Facet data </s> remove this.instances.forEach(instance => { </s> add this.instances.forEach(instance => { </s> remove if ( !checkFace || (checkFace && facing && d >= 0.0) || (checkFace && !facing && d <= 0.0) ) { </s> add if (!checkFace || (checkFace && facing && d >= 0.0) || (checkFace && !facing && d <= 0.0)) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.mesh.ts
this.instances.forEach(instance => {
<mask> else { <mask> this._delayLoadingFunction(JSON.parse(data), this); <mask> } <mask> <mask> this.instances.forEach(instance => <mask> { <mask> instance._syncSubMeshes(); <mask> }); <mask> <mask> <mask> this.delayLoadState = Engine.DELAYLOADSTATE_LOADED; </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); </s> add if (this.occlusionType !== AbstractMesh.OCCLUSION_TYPE_NO_VALUE) { console.log("Enter Draw"); this._gl.beginQuery(this._gl.ANY_SAMPLES_PASSED, this.occlusionQuery); this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); this._gl.endQuery(this._gl.ANY_SAMPLES_PASSED); this.isOcclusionQueryInProgress = true; } else { this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); } </s> remove if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_Z) === AbstractMesh.BILLBOARDMODE_Z) { </s> add if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_Z) === AbstractMesh.BILLBOARDMODE_Z) { </s> remove while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) { </s> add while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) { </s> remove var mesh : Mesh; </s> add var mesh: Mesh; </s> remove if(this.getScene().getRenderId() == 0){ </s> add if (this.getScene().getRenderId() == 0) {
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.mesh.ts
while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) {
<mask> } else { <mask> var index = 0; <mask> <mask> // Positions <mask> while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) <mask> { <mask> this.geometry.removeVerticesData(VertexBuffer.PositionKind + index); <mask> <mask> if (this.geometry.isVerticesDataPresent(VertexBuffer.NormalKind + index)) <mask> { <mask> this.geometry.removeVerticesData(VertexBuffer.NormalKind + index); </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove if (this.geometry.isVerticesDataPresent(VertexBuffer.NormalKind + index)) { </s> add if (this.geometry.isVerticesDataPresent(VertexBuffer.NormalKind + index)) { </s> remove if (this.geometry.isVerticesDataPresent(VertexBuffer.TangentKind + index)) { </s> add if (this.geometry.isVerticesDataPresent(VertexBuffer.TangentKind + index)) { </s> remove if ( !checkFace || (checkFace && facing && d >= 0.0) || (checkFace && !facing && d <= 0.0) ) { </s> add if (!checkFace || (checkFace && facing && d >= 0.0) || (checkFace && !facing && d <= 0.0)) { </s> remove if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_Z) === AbstractMesh.BILLBOARDMODE_Z) { </s> add if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_Z) === AbstractMesh.BILLBOARDMODE_Z) { </s> remove this.instances.forEach(instance => { </s> add this.instances.forEach(instance => {
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.mesh.ts
if (this.geometry.isVerticesDataPresent(VertexBuffer.NormalKind + index)) {
<mask> // Positions <mask> while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) <mask> { <mask> this.geometry.removeVerticesData(VertexBuffer.PositionKind + index); <mask> <mask> if (this.geometry.isVerticesDataPresent(VertexBuffer.NormalKind + index)) <mask> { <mask> this.geometry.removeVerticesData(VertexBuffer.NormalKind + index); <mask> } <mask> if (this.geometry.isVerticesDataPresent(VertexBuffer.TangentKind + index)) <mask> { <mask> this.geometry.removeVerticesData(VertexBuffer.TangentKind + index); </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) { </s> add while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) { </s> remove if (this.geometry.isVerticesDataPresent(VertexBuffer.TangentKind + index)) { </s> add if (this.geometry.isVerticesDataPresent(VertexBuffer.TangentKind + index)) { </s> remove if ( !checkFace || (checkFace && facing && d >= 0.0) || (checkFace && !facing && d <= 0.0) ) { </s> add if (!checkFace || (checkFace && facing && d >= 0.0) || (checkFace && !facing && d <= 0.0)) { </s> remove if (this.getClassName() !== "InstancedMesh"){ </s> add if (this.getClassName() !== "InstancedMesh") { </s> remove if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_Z) === AbstractMesh.BILLBOARDMODE_Z) { </s> add if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_Z) === AbstractMesh.BILLBOARDMODE_Z) {
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.mesh.ts
if (this.geometry.isVerticesDataPresent(VertexBuffer.TangentKind + index)) {
<mask> if (this.geometry.isVerticesDataPresent(VertexBuffer.NormalKind + index)) <mask> { <mask> this.geometry.removeVerticesData(VertexBuffer.NormalKind + index); <mask> } <mask> if (this.geometry.isVerticesDataPresent(VertexBuffer.TangentKind + index)) <mask> { <mask> this.geometry.removeVerticesData(VertexBuffer.TangentKind + index); <mask> } <mask> index++; <mask> } <mask> } </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove if (this.geometry.isVerticesDataPresent(VertexBuffer.NormalKind + index)) { </s> add if (this.geometry.isVerticesDataPresent(VertexBuffer.NormalKind + index)) { </s> remove while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) { </s> add while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) { </s> remove if ( !checkFace || (checkFace && facing && d >= 0.0) || (checkFace && !facing && d <= 0.0) ) { </s> add if (!checkFace || (checkFace && facing && d >= 0.0) || (checkFace && !facing && d <= 0.0)) { </s> remove if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_Z) === AbstractMesh.BILLBOARDMODE_Z) { </s> add if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_Z) === AbstractMesh.BILLBOARDMODE_Z) { </s> remove if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_Y) === AbstractMesh.BILLBOARDMODE_Y) { </s> add if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_Y) === AbstractMesh.BILLBOARDMODE_Y) {
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.mesh.ts
var mesh: Mesh;
<mask> * The parameter `parsedMesh` is the mesh to be copied. <mask> * The parameter `rootUrl` is a string, it's the root URL to prefix the `delayLoadingFile` property with <mask> */ <mask> public static Parse(parsedMesh: any, scene: Scene, rootUrl: string): Mesh { <mask> var mesh : Mesh; <mask> <mask> if (parsedMesh.type && parsedMesh.type === "GroundMesh") { <mask> mesh = GroundMesh.Parse(parsedMesh, scene); <mask> } else { <mask> mesh = new Mesh(parsedMesh.name, scene); </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove public getDirection(localAxis:Vector3): Vector3 { </s> add public getDirection(localAxis: Vector3): Vector3 { </s> remove /** * Creates an extruded polygon mesh, with depth in the Y direction. * Please consider using the same method from the MeshBuilder class instead. */ </s> add /** * Creates an extruded polygon mesh, with depth in the Y direction. * Please consider using the same method from the MeshBuilder class instead. */ </s> remove public addChild(mesh:AbstractMesh): AbstractMesh { </s> add public addChild(mesh: AbstractMesh): AbstractMesh { </s> remove public getDirectionToRef(localAxis:Vector3, result:Vector3): AbstractMesh { </s> add public getDirectionToRef(localAxis: Vector3, result: Vector3): AbstractMesh { </s> remove } </s> add }
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.mesh.ts
}
<mask> updatable: updatable, <mask> sideOrientation: sideOrientation <mask> } <mask> return MeshBuilder.CreatePolygon(name, options, scene); <mask> } <mask> <mask> /** <mask> * Creates an extruded polygon mesh, with depth in the Y direction. <mask> * Please consider using the same method from the MeshBuilder class instead. <mask> */ </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove /** * Creates an extruded polygon mesh, with depth in the Y direction. * Please consider using the same method from the MeshBuilder class instead. */ </s> add /** * Creates an extruded polygon mesh, with depth in the Y direction. * Please consider using the same method from the MeshBuilder class instead. */ </s> remove } </s> add } </s> remove public getPivotPointToRef(result:Vector3): AbstractMesh{ </s> add public getPivotPointToRef(result: Vector3): AbstractMesh { </s> remove public getDirectionToRef(localAxis:Vector3, result:Vector3): AbstractMesh { </s> add public getDirectionToRef(localAxis: Vector3, result: Vector3): AbstractMesh { </s> remove public removeChild(mesh:AbstractMesh): AbstractMesh { </s> add public removeChild(mesh: AbstractMesh): AbstractMesh {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.mesh.ts
/** * Creates an extruded polygon mesh, with depth in the Y direction. * Please consider using the same method from the MeshBuilder class instead. */
<mask> } <mask> return MeshBuilder.CreatePolygon(name, options, scene); <mask> } <mask> <mask> /** <mask> * Creates an extruded polygon mesh, with depth in the Y direction. <mask> * Please consider using the same method from the MeshBuilder class instead. <mask> */ <mask> public static ExtrudePolygon(name: string, shape: Vector3[], depth: number, scene: Scene, holes?: Vector3[][], updatable?: boolean, sideOrientation?: number): Mesh { <mask> var options = { <mask> shape: shape, <mask> holes: holes, <mask> depth: depth, </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove } </s> add } </s> remove } </s> add } </s> remove var mesh : Mesh; </s> add var mesh: Mesh; </s> remove public getPivotPointToRef(result:Vector3): AbstractMesh{ </s> add public getPivotPointToRef(result: Vector3): AbstractMesh { </s> remove public getDirectionToRef(localAxis:Vector3, result:Vector3): AbstractMesh { </s> add public getDirectionToRef(localAxis: Vector3, result: Vector3): AbstractMesh {
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.mesh.ts
}
<mask> updatable: updatable, <mask> sideOrientation: sideOrientation <mask> } <mask> return MeshBuilder.ExtrudePolygon(name, options, scene); <mask> } <mask> <mask> /** <mask> * Creates an extruded shape mesh. <mask> * The extrusion is a parametric shape : http://doc.babylonjs.com/tutorials/Parametric_Shapes. It has no predefined shape. Its final shape will depend on the input parameters. <mask> * Please consider using the same method from the MeshBuilder class instead. </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove } </s> add } </s> remove /** * Creates an extruded polygon mesh, with depth in the Y direction. * Please consider using the same method from the MeshBuilder class instead. */ </s> add /** * Creates an extruded polygon mesh, with depth in the Y direction. * Please consider using the same method from the MeshBuilder class instead. */ </s> remove var mesh : Mesh; </s> add var mesh: Mesh; </s> remove public addChild(mesh:AbstractMesh): AbstractMesh { </s> add public addChild(mesh: AbstractMesh): AbstractMesh { </s> remove public getDirection(localAxis:Vector3): Vector3 { </s> add public getDirection(localAxis: Vector3): Vector3 {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/Mesh/babylon.mesh.ts
// Occlusion Query createQuery(): WebGLQuery; beginQuery(target: number, query: WebGLQuery); endQuery(target: number): void; getQueryParameter(query: WebGLQuery, pname: number): any;
<mask> uniformBlockBinding(program: WebGLProgram, uniformBlockIndex: number, uniformBlockBinding: number): void; <mask> <mask> MAX_SAMPLES: number; <mask> RGBA8: number; <mask> READ_FRAMEBUFFER: number; <mask> DRAW_FRAMEBUFFER: number; <mask> UNIFORM_BUFFER: number; <mask> </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove /** * Creates an extruded polygon mesh, with depth in the Y direction. * Please consider using the same method from the MeshBuilder class instead. */ </s> add /** * Creates an extruded polygon mesh, with depth in the Y direction. * Please consider using the same method from the MeshBuilder class instead. */ </s> remove if(mesh == null){ </s> add if (mesh == null) { </s> remove if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_X) === AbstractMesh.BILLBOARDMODE_X) { </s> add if ((this.billboardMode & AbstractMesh.BILLBOARDMODE_X) === AbstractMesh.BILLBOARDMODE_X) {
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/babylon.mixins.ts
// Occlusion Query ANY_SAMPLES_PASSED_CONSERVATIVE: number; ANY_SAMPLES_PASSED: number; QUERY_RESULT_AVAILABLE: number; QUERY_RESULT: number;
<mask> readonly COLOR_ATTACHMENT0: number; // 0x8CE1 <mask> readonly COLOR_ATTACHMENT1: number; // 0x8CE2 <mask> readonly COLOR_ATTACHMENT2: number; // 0x8CE3 <mask> readonly COLOR_ATTACHMENT3: number; // 0x8CE4 <mask> } <mask> <mask> interface HTMLURL { <mask> createObjectURL(param1: any, param2?: any); <mask> } <mask> </s> Adding occlusion query and basic object checks Former-commit-id: 35b024ebaa16d16ccc96eb5424142da9914cd95a </s> remove if (this.getClassName() !== "InstancedMesh"){ </s> add if (this.getClassName() !== "InstancedMesh") { </s> remove this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); </s> add if (this.occlusionType !== AbstractMesh.OCCLUSION_TYPE_NO_VALUE) { console.log("Enter Draw"); this._gl.beginQuery(this._gl.ANY_SAMPLES_PASSED, this.occlusionQuery); this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); this._gl.endQuery(this._gl.ANY_SAMPLES_PASSED); this.isOcclusionQueryInProgress = true; } else { this._processRendering(subMesh, effect, fillMode, batch, hardwareInstancedRendering, this._onBeforeDraw, effectiveMaterial); } </s> remove // Facet data </s> add // Facet data </s> remove while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) { </s> add while (this.geometry.isVerticesDataPresent(VertexBuffer.PositionKind + index)) {
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e06ed03540a7ce211e254652356b3f31baf371ff
src/babylon.mixins.ts
import { PrePassConfiguration } from "../prePassConfiguration";
<mask> import { IMaterialAnisotropicDefines, PBRAnisotropicConfiguration } from "./pbrAnisotropicConfiguration"; <mask> import { IMaterialBRDFDefines, PBRBRDFConfiguration } from "./pbrBRDFConfiguration"; <mask> import { IMaterialSheenDefines, PBRSheenConfiguration } from "./pbrSheenConfiguration"; <mask> import { IMaterialSubSurfaceDefines, PBRSubSurfaceConfiguration } from "./pbrSubSurfaceConfiguration"; <mask> import { PrePassConfiguration } from "../PrePassConfiguration"; <mask> import { Color3, TmpColors } from '../../Maths/math.color'; <mask> import { Scalar } from "../../Maths/math.scalar"; <mask> <mask> import { ImageProcessingConfiguration, IImageProcessingConfigurationDefines } from "../../Materials/imageProcessingConfiguration"; <mask> import { Effect, IEffectCreationOptions } from "../../Materials/effect"; </s> linting and doc Former-commit-id: e518c8caff0d610d6119681951b26d1241ff7265 </s> remove import { PrePassConfiguration } from "./PrePassConfiguration"; </s> add import { PrePassConfiguration } from "./prePassConfiguration"; </s> remove } else{ </s> add } else {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e08768299db462df5be5213c493f706f9cfac9c3
src/Materials/PBR/pbrBaseMaterial.ts
* @param prePassConfiguration Configuration for the prepass, in case prepass is activated
<mask> * Binds the bones information from the mesh to the effect. <mask> * @param mesh The mesh we are binding the information to render <mask> * @param effect The effect we are binding the data to <mask> */ <mask> public static BindBonesParameters(mesh?: AbstractMesh, effect?: Effect, prePassConfiguration?: PrePassConfiguration): void { <mask> if (!effect || !mesh) { <mask> return; <mask> } <mask> if (mesh.computeBonesUsingShaders && effect._bonesComputationForcedToCPU) { </s> linting and doc Former-commit-id: e518c8caff0d610d6119681951b26d1241ff7265
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e08768299db462df5be5213c493f706f9cfac9c3
src/Materials/materialHelper.ts
/** * Configuration needed for prepass-capable materials */
<mask> import { Constants } from "../Engines/constants"; <mask> <mask> export class PrePassConfiguration { <mask> /** <mask> * Previous world matrices of meshes carrying this material <mask> * Used for computing velocity <mask> */ <mask> public previousWorldMatrices: { [index: number]: Matrix } = {}; </s> linting and doc Former-commit-id: e518c8caff0d610d6119681951b26d1241ff7265 </s> remove import { PrePassConfiguration } from "./PrePassConfiguration"; </s> add import { PrePassConfiguration } from "./prePassConfiguration"; </s> remove import { PrePassConfiguration } from "../PrePassConfiguration"; </s> add import { PrePassConfiguration } from "../prePassConfiguration";
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e08768299db462df5be5213c493f706f9cfac9c3
src/Materials/prePassConfiguration.ts
/** * Previous world matrices of meshes carrying this material * Used for computing velocity */
<mask> */ <mask> export class PrePassConfiguration { <mask> public previousWorldMatrices: { [index: number]: Matrix } = {}; <mask> /** <mask> * Previous view project matrix <mask> * Used for computing velocity <mask> */ </s> linting and doc Former-commit-id: e518c8caff0d610d6119681951b26d1241ff7265
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e08768299db462df5be5213c493f706f9cfac9c3
src/Materials/prePassConfiguration.ts
/** * Previous view project matrix * Used for computing velocity */
<mask> */ <mask> public previousWorldMatrices: { [index: number]: Matrix } = {}; <mask> public previousViewProjection: Matrix; <mask> /** <mask> * Previous bones of meshes carrying this material <mask> * Used for computing velocity <mask> */ </s> linting and doc Former-commit-id: e518c8caff0d610d6119681951b26d1241ff7265
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e08768299db462df5be5213c493f706f9cfac9c3
src/Materials/prePassConfiguration.ts
/** * Previous bones of meshes carrying this material * Used for computing velocity */
<mask> */ <mask> public previousViewProjection: Matrix; <mask> public previousBones: { [index: number]: Float32Array } = {}; <mask> <mask> /** <mask> * Add the required uniforms to the current list. <mask> * @param uniforms defines the current uniform list. <mask> */ </s> linting and doc Former-commit-id: e518c8caff0d610d6119681951b26d1241ff7265
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e08768299db462df5be5213c493f706f9cfac9c3
src/Materials/prePassConfiguration.ts
* @param mesh The mesh * @param world World matrix of this mesh * @param isFrozen Is the material frozen
<mask> * Binds the material data. <mask> * @param effect defines theeffect to update <mask> * @param scene defines the scene the material belongs to. <mask> */ <mask> public bindForSubMesh(effect: Effect, scene: Scene, mesh: Mesh, world: Matrix, isFrozen: boolean): void { <mask> if (scene.prePassRenderer && scene.prePassRenderer.enabled) { <mask> if (scene.prePassRenderer.getIndex(Constants.PREPASS_VELOCITY_TEXTURE_TYPE) !== -1) { <mask> if (!this.previousWorldMatrices[mesh.uniqueId]) { <mask> this.previousWorldMatrices[mesh.uniqueId] = Matrix.Identity(); </s> linting and doc Former-commit-id: e518c8caff0d610d6119681951b26d1241ff7265
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e08768299db462df5be5213c493f706f9cfac9c3
src/Materials/prePassConfiguration.ts
import { PrePassConfiguration } from "./prePassConfiguration";
<mask> import { VertexBuffer } from "../Meshes/buffer"; <mask> import { SubMesh } from "../Meshes/subMesh"; <mask> import { AbstractMesh } from "../Meshes/abstractMesh"; <mask> import { Mesh } from "../Meshes/mesh"; <mask> import { PrePassConfiguration } from "./PrePassConfiguration"; <mask> <mask> import { ImageProcessingConfiguration, IImageProcessingConfigurationDefines } from "./imageProcessingConfiguration"; <mask> import { ColorCurves } from "./colorCurves"; <mask> import { FresnelParameters } from "./fresnelParameters"; <mask> import { Material, ICustomShaderNameResolveOptions } from "../Materials/material"; </s> linting and doc Former-commit-id: e518c8caff0d610d6119681951b26d1241ff7265 </s> remove import { PrePassConfiguration } from "../PrePassConfiguration"; </s> add import { PrePassConfiguration } from "../prePassConfiguration"; </s> remove } else{ </s> add } else {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e08768299db462df5be5213c493f706f9cfac9c3
src/Materials/standardMaterial.ts
} else {
<mask> <mask> effect.setTexture("normalSampler", geometryBufferRenderer.getGBuffer().textures[1]); <mask> effect.setTexture("positionSampler", geometryBufferRenderer.getGBuffer().textures[positionIndex]); <mask> effect.setTexture("reflectivitySampler", geometryBufferRenderer.getGBuffer().textures[roughnessIndex]); <mask> } else{ <mask> // Samplers <mask> const positionIndex = prePassRenderer.getIndex(Constants.PREPASS_POSITION_TEXTURE_TYPE); <mask> const roughnessIndex = prePassRenderer.getIndex(Constants.PREPASS_REFLECTIVITY_TEXTURE_TYPE); <mask> const normalIndex = prePassRenderer.getIndex(Constants.PREPASS_DEPTHNORMAL_TEXTURE_TYPE); <mask> </s> linting and doc Former-commit-id: e518c8caff0d610d6119681951b26d1241ff7265
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e08768299db462df5be5213c493f706f9cfac9c3
src/PostProcesses/screenSpaceReflectionPostProcess.ts
<mask> { <mask> "compilerOptions": { <mask> "target": "es5", <mask> "module": "commonjs", <mask> "noResolve": false, <mask> "noImplicitAny": false, <mask> "strictNullChecks": true, <mask> "removeComments": false, <mask> "preserveConstEnums": true, <mask> "sourceMap": false, <mask> "experimentalDecorators": true, <mask> "isolatedModules": false, <mask> "declaration": true, <mask> "lib": [ <mask> "dom", <mask> "es2015.promise", <mask> "es5" </s> fixing gulp build Former-commit-id: a2fbc6aa9f6f645fb5af47fdc1efdcc1ad6d5e8a </s> remove "es5" ], "types": [ "node" </s> add "es2015.collection", "es2015.iterable" </s> remove "baseUrl": "./", </s> add "skipDefaultLibCheck": true, "skipLibCheck": true, "baseUrl": "./src/", "rootDir": "./", </s> remove vertx: true, "./Oimo": "OIMO", </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e1704bf4a3b683ac086a9d668049fc1f8ffbfb82
Viewer/tsconfig-gulp.json
"experimentalDecorators": true, "emitDecoratorMetadata": true, "moduleResolution": "node", "strictNullChecks": true, "noImplicitAny": false, "noFallthroughCasesInSwitch": true, "inlineSourceMap": true,
<mask> "module": "commonjs", <mask> "declaration": true, <mask> "lib": [ <mask> "es5", <mask> "dom", <mask> "es2015.promise", </s> fixing gulp build Former-commit-id: a2fbc6aa9f6f645fb5af47fdc1efdcc1ad6d5e8a </s> remove "noResolve": false, "noImplicitAny": false, "strictNullChecks": true, "removeComments": false, "preserveConstEnums": true, "sourceMap": false, "experimentalDecorators": true, "isolatedModules": false, </s> add </s> remove "es5" ], "types": [ "node" </s> add "es2015.collection", "es2015.iterable" </s> remove "baseUrl": "./", </s> add "skipDefaultLibCheck": true, "skipLibCheck": true, "baseUrl": "./src/", "rootDir": "./",
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e1704bf4a3b683ac086a9d668049fc1f8ffbfb82
Viewer/tsconfig-gulp.json
"es5",
<mask> "noFallthroughCasesInSwitch": true, <mask> "inlineSourceMap": true, <mask> "lib": [ <mask> "dom", <mask> "es2015.promise", <mask> "es2015.collection", <mask> "es2015.iterable" </s> fixing gulp build Former-commit-id: a2fbc6aa9f6f645fb5af47fdc1efdcc1ad6d5e8a </s> remove "es5" ], "types": [ "node" </s> add "es2015.collection", "es2015.iterable" </s> remove "noResolve": false, "noImplicitAny": false, "strictNullChecks": true, "removeComments": false, "preserveConstEnums": true, "sourceMap": false, "experimentalDecorators": true, "isolatedModules": false, </s> add </s> remove "baseUrl": "./", </s> add "skipDefaultLibCheck": true, "skipLibCheck": true, "baseUrl": "./src/", "rootDir": "./", </s> remove vertx: true, "./Oimo": "OIMO", </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e1704bf4a3b683ac086a9d668049fc1f8ffbfb82
Viewer/tsconfig-gulp.json
"es2015.collection", "es2015.iterable"
<mask> "declaration": true, <mask> "lib": [ <mask> "dom", <mask> "es2015.promise", <mask> "es5" <mask> ], <mask> "types": [ <mask> "node" <mask> ], <mask> "baseUrl": "./", <mask> "paths": { <mask> "babylonjs": [ <mask> "../dist/preview release/babylon.d.ts" </s> fixing gulp build Former-commit-id: a2fbc6aa9f6f645fb5af47fdc1efdcc1ad6d5e8a </s> remove "baseUrl": "./", </s> add "skipDefaultLibCheck": true, "skipLibCheck": true, "baseUrl": "./src/", "rootDir": "./", </s> remove "../dist/preview release/babylon.d.ts" </s> add "../../dist/preview release/babylon.d.ts" </s> remove "noResolve": false, "noImplicitAny": false, "strictNullChecks": true, "removeComments": false, "preserveConstEnums": true, "sourceMap": false, "experimentalDecorators": true, "isolatedModules": false, </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e1704bf4a3b683ac086a9d668049fc1f8ffbfb82
Viewer/tsconfig-gulp.json
"skipDefaultLibCheck": true, "skipLibCheck": true, "baseUrl": "./src/", "rootDir": "./",
<mask> ], <mask> "types": [ <mask> "node" <mask> ], <mask> "baseUrl": "./", <mask> "paths": { <mask> "babylonjs": [ <mask> "../dist/preview release/babylon.d.ts" <mask> ], <mask> "babylonjs-loaders": [ </s> fixing gulp build Former-commit-id: a2fbc6aa9f6f645fb5af47fdc1efdcc1ad6d5e8a </s> remove "es5" ], "types": [ "node" </s> add "es2015.collection", "es2015.iterable" </s> remove "../dist/preview release/babylon.d.ts" </s> add "../../dist/preview release/babylon.d.ts" </s> remove } </s> add }, "outDir": "./dist/build" </s> remove "noResolve": false, "noImplicitAny": false, "strictNullChecks": true, "removeComments": false, "preserveConstEnums": true, "sourceMap": false, "experimentalDecorators": true, "isolatedModules": false, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e1704bf4a3b683ac086a9d668049fc1f8ffbfb82
Viewer/tsconfig-gulp.json
"../../dist/preview release/babylon.d.ts"
<mask> ], <mask> "baseUrl": "./", <mask> "paths": { <mask> "babylonjs": [ <mask> "../dist/preview release/babylon.d.ts" <mask> ], <mask> "babylonjs-loaders": [ <mask> "externalModules.d.ts" <mask> ] <mask> } </s> fixing gulp build Former-commit-id: a2fbc6aa9f6f645fb5af47fdc1efdcc1ad6d5e8a </s> remove "baseUrl": "./", </s> add "skipDefaultLibCheck": true, "skipLibCheck": true, "baseUrl": "./src/", "rootDir": "./", </s> remove "es5" ], "types": [ "node" </s> add "es2015.collection", "es2015.iterable" </s> remove } </s> add }, "outDir": "./dist/build" </s> remove "babylonjs-loaders": __dirname + '/../dist/preview release/loaders/babylonjs.loaders.js', // "es6-promise": __dirname + '/assets/es6-promise.min.js', "pep": __dirname + '/assets/pep.min.js', </s> add "babylonjs-loaders": __dirname + '/../dist/preview release/loaders/babylonjs.loaders.js'
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e1704bf4a3b683ac086a9d668049fc1f8ffbfb82
Viewer/tsconfig-gulp.json
], "babylonjs-gltf2interface": [ "../../dist/babylon.glTF2Interface.d.ts" ], "deepmerge": [ "./helper/deepmerge.d.ts" ], "handlebars": [ "./templates/handlebars.d.ts"
<mask> "../../dist/preview release/babylon.d.ts" <mask> ], <mask> "babylonjs-loaders": [ <mask> "externalModules.d.ts" <mask> ] <mask> }, <mask> "outDir": "./dist/build" <mask> }, </s> fixing gulp build Former-commit-id: a2fbc6aa9f6f645fb5af47fdc1efdcc1ad6d5e8a </s> remove } </s> add }, "outDir": "./dist/build" </s> remove "../dist/preview release/babylon.d.ts" </s> add "../../dist/preview release/babylon.d.ts" </s> remove vertx: true, "./Oimo": "OIMO", </s> add </s> remove "es5" ], "types": [ "node" </s> add "es2015.collection", "es2015.iterable" </s> remove "baseUrl": "./", </s> add "skipDefaultLibCheck": true, "skipLibCheck": true, "baseUrl": "./src/", "rootDir": "./",
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e1704bf4a3b683ac086a9d668049fc1f8ffbfb82
Viewer/tsconfig-gulp.json
}, "outDir": "./dist/build"
<mask> ], <mask> "babylonjs-loaders": [ <mask> "externalModules.d.ts" <mask> ] <mask> } <mask> }, <mask> "exclude": [ <mask> "node_modules", <mask> "dist", <mask> "tests" </s> fixing gulp build Former-commit-id: a2fbc6aa9f6f645fb5af47fdc1efdcc1ad6d5e8a </s> remove "../dist/preview release/babylon.d.ts" </s> add "../../dist/preview release/babylon.d.ts" </s> remove "es5" ], "types": [ "node" </s> add "es2015.collection", "es2015.iterable" </s> remove "baseUrl": "./", </s> add "skipDefaultLibCheck": true, "skipLibCheck": true, "baseUrl": "./src/", "rootDir": "./",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e1704bf4a3b683ac086a9d668049fc1f8ffbfb82
Viewer/tsconfig-gulp.json
<mask> }, <mask> externals: { <mask> cannon: 'CANNON', <mask> oimo: 'OIMO', <mask> vertx: true, <mask> "./Oimo": "OIMO", <mask> "earcut": true <mask> }, <mask> resolve: { <mask> extensions: ['.ts', '.js'], <mask> alias: { </s> fixing gulp build Former-commit-id: a2fbc6aa9f6f645fb5af47fdc1efdcc1ad6d5e8a </s> remove "babylonjs-loaders": __dirname + '/../dist/preview release/loaders/babylonjs.loaders.js', // "es6-promise": __dirname + '/assets/es6-promise.min.js', "pep": __dirname + '/assets/pep.min.js', </s> add "babylonjs-loaders": __dirname + '/../dist/preview release/loaders/babylonjs.loaders.js' </s> remove "noResolve": false, "noImplicitAny": false, "strictNullChecks": true, "removeComments": false, "preserveConstEnums": true, "sourceMap": false, "experimentalDecorators": true, "isolatedModules": false, </s> add </s> remove "baseUrl": "./", </s> add "skipDefaultLibCheck": true, "skipLibCheck": true, "baseUrl": "./src/", "rootDir": "./", </s> remove "es5" ], "types": [ "node" </s> add "es2015.collection", "es2015.iterable" </s> remove } </s> add }, "outDir": "./dist/build"
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e1704bf4a3b683ac086a9d668049fc1f8ffbfb82
Viewer/webpack.gulp.config.js
"babylonjs-loaders": __dirname + '/../dist/preview release/loaders/babylonjs.loaders.js'
<mask> extensions: ['.ts', '.js'], <mask> alias: { <mask> "babylonjs": __dirname + '/../dist/preview release/babylon.max.js', <mask> "babylonjs-materials": __dirname + '/../dist/preview release/materialsLibrary/babylonjs.materials.js', <mask> "babylonjs-loaders": __dirname + '/../dist/preview release/loaders/babylonjs.loaders.js', <mask> // "es6-promise": __dirname + '/assets/es6-promise.min.js', <mask> "pep": __dirname + '/assets/pep.min.js', <mask> } <mask> }, <mask> module: { <mask> loaders: [{ <mask> test: /\.tsx?$/, </s> fixing gulp build Former-commit-id: a2fbc6aa9f6f645fb5af47fdc1efdcc1ad6d5e8a </s> remove vertx: true, "./Oimo": "OIMO", </s> add </s> remove "../dist/preview release/babylon.d.ts" </s> add "../../dist/preview release/babylon.d.ts" </s> remove } </s> add }, "outDir": "./dist/build" </s> remove "es5" ], "types": [ "node" </s> add "es2015.collection", "es2015.iterable" </s> remove "baseUrl": "./", </s> add "skipDefaultLibCheck": true, "skipLibCheck": true, "baseUrl": "./src/", "rootDir": "./",
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e1704bf4a3b683ac086a9d668049fc1f8ffbfb82
Viewer/webpack.gulp.config.js
/** * Represents a physics imposter */
<mask> */ <mask> getClassName(): string; <mask> } <mask> <mask> export class PhysicsImpostor { <mask> <mask> /** <mask> * The default object size of the imposter </s> docs for physics classes Former-commit-id: c17a3ae6889d67a4330cc7eb438d5933052003c9
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e3cacf91fb2fa970ec30696ca9cb2d3cc4663e7b
src/Physics/babylon.physicsImpostor.ts
/** * Gets the box size of the physics imposter and stores the result in the input parameter * @param result Stores the box size * @returns The physics imposter */
<mask> } <mask> <mask> public getBoxSizeToRef(result: Vector3): PhysicsImpostor { <mask> if (this._physicsEngine) { <mask> this._physicsEngine.getPhysicsPlugin().getBoxSizeToRef(this, result); <mask> } </s> docs for physics classes Former-commit-id: c17a3ae6889d67a4330cc7eb438d5933052003c9
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e3cacf91fb2fa970ec30696ca9cb2d3cc4663e7b
src/Physics/babylon.physicsImpostor.ts
/** * Lock-Joint type */
<mask> * Spring-Joint type <mask> */ <mask> public static SpringJoint = 9; <mask> public static LockJoint = 10; <mask> } <mask> <mask> /** <mask> * A class representing a physics distance joint. <mask> */ </s> docs for physics classes Former-commit-id: c17a3ae6889d67a4330cc7eb438d5933052003c9
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e3cacf91fb2fa970ec30696ca9cb2d3cc4663e7b
src/Physics/babylon.physicsJoint.ts
"@babylonjs/core": "^5.34.0",
<mask> "packages/public/@babylonjs/node-editor": { <mask> "version": "5.33.2", <mask> "license": "Apache-2.0", <mask> "devDependencies": { <mask> "@babylonjs/core": "^5.33.2", <mask> "react": "^17.0.2", <mask> "react-dom": "^17.0.2", <mask> "rimraf": "^3.0.2", <mask> "typescript": "^4.4.4" <mask> }, </s> Version update 5.34.0 Former-commit-id: 42f3ca5c939b27664c01b9ca3f49e81fd664d2dc </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0", </s> remove "babylonjs": "^5.33.2", "babylonjs-gltf2interface": "^5.33.2" </s> add "babylonjs": "^5.34.0", "babylonjs-gltf2interface": "^5.34.0" </s> remove "babylonjs": "^5.33.2" </s> add "babylonjs": "^5.34.0" </s> remove "babylonjs": "^5.33.2" </s> add "babylonjs": "^5.34.0" </s> remove "version": "5.33.2", </s> add "version": "5.34.0",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e6af98a436c8441c6c00e09a340e52e580cff21e
package-lock.json
"@babylonjs/core": "^5.34.0",
<mask> }, <mask> "@babylonjs/loaders": { <mask> "version": "file:packages/public/@babylonjs/loaders", <mask> "requires": { <mask> "@babylonjs/core": "^5.33.2", <mask> "@dev/build-tools": "^1.0.0", <mask> "@lts/loaders": "^1.0.0", <mask> "babylonjs-gltf2interface": "^5.33.2", <mask> "rimraf": "^3.0.2", <mask> "typescript": "^4.4.4" </s> Version update 5.34.0 Former-commit-id: 42f3ca5c939b27664c01b9ca3f49e81fd664d2dc </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0", </s> remove "babylonjs": "^5.33.2", "babylonjs-gltf2interface": "^5.33.2" </s> add "babylonjs": "^5.34.0", "babylonjs-gltf2interface": "^5.34.0" </s> remove "babylonjs-gltf2interface": "^5.33.2" </s> add "babylonjs-gltf2interface": "^5.34.0" </s> remove "babylonjs": "^5.33.2" </s> add "babylonjs": "^5.34.0" </s> remove "babylonjs": "^5.33.2" </s> add "babylonjs": "^5.34.0"
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e6af98a436c8441c6c00e09a340e52e580cff21e
package-lock.json
"version": "5.34.0",
<mask> { <mask> "name": "@babylonjs/inspector", <mask> "version": "5.33.2", <mask> "module": "dist/babylon.inspector.bundle.max.js", <mask> "main": "dist/babylon.inspector.bundle.max.js", <mask> "typings": "dist/babylon.inspector.module.d.ts", <mask> "files": [ <mask> "dist/**/*.*", </s> Version update 5.34.0 Former-commit-id: 42f3ca5c939b27664c01b9ca3f49e81fd664d2dc </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0",
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e6af98a436c8441c6c00e09a340e52e580cff21e
packages/public/@babylonjs/inspector/package.json
"babylonjs": "^5.34.0"
<mask> "build:declaration": "build-tools -c pud --config ./config.json", <mask> "clean": "rimraf dist && rimraf babylon*.*" <mask> }, <mask> "dependencies": { <mask> "babylonjs": "^5.33.2" <mask> }, <mask> "devDependencies": { <mask> "@dev/build-tools": "1.0.0", <mask> "@lts/post-processes": "1.0.0", <mask> "rimraf": "^3.0.2", </s> Version update 5.34.0 Former-commit-id: 42f3ca5c939b27664c01b9ca3f49e81fd664d2dc </s> remove "babylonjs": "^5.33.2" </s> add "babylonjs": "^5.34.0" </s> remove "babylonjs": "^5.33.2", "babylonjs-gltf2interface": "^5.33.2" </s> add "babylonjs": "^5.34.0", "babylonjs-gltf2interface": "^5.34.0" </s> remove "babylonjs-gltf2interface": "^5.33.2" </s> add "babylonjs-gltf2interface": "^5.34.0" </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0", </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e6af98a436c8441c6c00e09a340e52e580cff21e
packages/public/umd/babylonjs-post-process/package.json
"version": "5.34.0",
<mask> { <mask> "name": "babylonjs-procedural-textures", <mask> "version": "5.33.2", <mask> "main": "babylonjs.proceduralTextures.js", <mask> "types": "babylonjs.proceduralTextures.module.d.ts", <mask> "files": [ <mask> "*" <mask> ], </s> Version update 5.34.0 Former-commit-id: 42f3ca5c939b27664c01b9ca3f49e81fd664d2dc </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0",
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e6af98a436c8441c6c00e09a340e52e580cff21e
packages/public/umd/babylonjs-procedural-textures/package.json
"babylonjs": "^5.34.0"
<mask> "build:declaration": "build-tools -c pud --config ./config.json", <mask> "clean": "rimraf dist && rimraf babylon*.*" <mask> }, <mask> "dependencies": { <mask> "babylonjs": "^5.33.2" <mask> }, <mask> "devDependencies": { <mask> "@dev/build-tools": "1.0.0", <mask> "@lts/procedural-textures": "1.0.0", <mask> "rimraf": "^3.0.2", </s> Version update 5.34.0 Former-commit-id: 42f3ca5c939b27664c01b9ca3f49e81fd664d2dc </s> remove "babylonjs": "^5.33.2" </s> add "babylonjs": "^5.34.0" </s> remove "babylonjs": "^5.33.2", "babylonjs-gltf2interface": "^5.33.2" </s> add "babylonjs": "^5.34.0", "babylonjs-gltf2interface": "^5.34.0" </s> remove "babylonjs-gltf2interface": "^5.33.2" </s> add "babylonjs-gltf2interface": "^5.34.0" </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0", </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e6af98a436c8441c6c00e09a340e52e580cff21e
packages/public/umd/babylonjs-procedural-textures/package.json
"version": "5.34.0",
<mask> { <mask> "name": "babylonjs-serializers", <mask> "version": "5.33.2", <mask> "main": "babylonjs.serializers.js", <mask> "types": "babylonjs.serializers.module.d.ts", <mask> "files": [ <mask> "*" <mask> ], </s> Version update 5.34.0 Former-commit-id: 42f3ca5c939b27664c01b9ca3f49e81fd664d2dc </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0",
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e6af98a436c8441c6c00e09a340e52e580cff21e
packages/public/umd/babylonjs-serializers/package.json
"babylonjs": "^5.34.0", "babylonjs-gltf2interface": "^5.34.0"
<mask> "build:declaration": "build-tools -c pud --config ./config.json", <mask> "clean": "rimraf dist && rimraf babylon*.*" <mask> }, <mask> "dependencies": { <mask> "babylonjs": "^5.33.2", <mask> "babylonjs-gltf2interface": "^5.33.2" <mask> }, <mask> "devDependencies": { <mask> "@dev/build-tools": "1.0.0", <mask> "@lts/serializers": "1.0.0", <mask> "rimraf": "^3.0.2", </s> Version update 5.34.0 Former-commit-id: 42f3ca5c939b27664c01b9ca3f49e81fd664d2dc </s> remove "babylonjs": "^5.33.2" </s> add "babylonjs": "^5.34.0" </s> remove "babylonjs": "^5.33.2" </s> add "babylonjs": "^5.34.0" </s> remove "babylonjs-gltf2interface": "^5.33.2" </s> add "babylonjs-gltf2interface": "^5.34.0" </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0", </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0",
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e6af98a436c8441c6c00e09a340e52e580cff21e
packages/public/umd/babylonjs-serializers/package.json
"version": "5.34.0",
<mask> { <mask> "name": "babylonjs-viewer", <mask> "version": "5.33.2", <mask> "main": "babylon.viewer.js", <mask> "types": "babylon.viewer.module.d.ts", <mask> "files": [ <mask> "*" <mask> ], </s> Version update 5.34.0 Former-commit-id: 42f3ca5c939b27664c01b9ca3f49e81fd664d2dc </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0",
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e6af98a436c8441c6c00e09a340e52e580cff21e
packages/public/umd/babylonjs-viewer/package.json
"babylonjs-gltf2interface": "^5.34.0"
<mask> "build:declaration": "build-tools -c pud --config ./config.json", <mask> "clean": "rimraf dist && rimraf babylon*.*" <mask> }, <mask> "dependencies": { <mask> "babylonjs-gltf2interface": "^5.33.2" <mask> }, <mask> "devDependencies": { <mask> "@dev/build-tools": "1.0.0", <mask> "@dev/core": "1.0.0", <mask> "@dev/loaders": "1.0.0", </s> Version update 5.34.0 Former-commit-id: 42f3ca5c939b27664c01b9ca3f49e81fd664d2dc </s> remove "babylonjs": "^5.33.2", "babylonjs-gltf2interface": "^5.33.2" </s> add "babylonjs": "^5.34.0", "babylonjs-gltf2interface": "^5.34.0" </s> remove "babylonjs": "^5.33.2" </s> add "babylonjs": "^5.34.0" </s> remove "babylonjs": "^5.33.2" </s> add "babylonjs": "^5.34.0" </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0", </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e6af98a436c8441c6c00e09a340e52e580cff21e
packages/public/umd/babylonjs-viewer/package.json
"version": "5.34.0",
<mask> { <mask> "name": "babylonjs", <mask> "version": "5.33.2", <mask> "main": "babylon.js", <mask> "types": "babylon.module.d.ts", <mask> "files": [ <mask> "*" <mask> ], </s> Version update 5.34.0 Former-commit-id: 42f3ca5c939b27664c01b9ca3f49e81fd664d2dc </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "version": "5.33.2", </s> add "version": "5.34.0", </s> remove "@babylonjs/core": "^5.33.2", </s> add "@babylonjs/core": "^5.34.0",
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e6af98a436c8441c6c00e09a340e52e580cff21e
packages/public/umd/babylonjs/package.json
<mask> { <mask> "../../src/Culling/Octrees/octree.ts": [ <mask> "../../src/Culling/Octrees/octreeBlock.ts" <mask> ], <mask> "../../src/Culling/Octrees/octreeBlock.ts": [ <mask> "../../src/Culling/Octrees/octree.ts" <mask> ], <mask> "../../src/Engines/engine.ts": [ <mask> "../../src/Materials/Textures/internalTexture.ts" <mask> ], <mask> "../../src/Layers/effectLayer.ts": [ <mask> "../../src/Layers/effectLayerSceneComponent.ts" </s> octree block dep Former-commit-id: 0e624ab4df0971391c80fd847b18923ad21eee2e </s> remove "errorCount": 28 </s> add "errorCount": 26 </s> remove import { Octree } from "./octree"; </s> add /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> remove /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> add </s> remove /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } } } </s> add </s> remove Octree._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); </s> add OctreeBlock._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); } /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } }
[ "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7034abef32687e25914f47af387b3e1f42314f4
Tools/Config/tempCircularValidation/core.json
"errorCount": 26
<mask> ], <mask> "../../src/scene.ts": [ <mask> "../../src/Materials/standardMaterial.ts" <mask> ], <mask> "errorCount": 28 <mask> } </s> octree block dep Former-commit-id: 0e624ab4df0971391c80fd847b18923ad21eee2e </s> remove "../../src/Culling/Octrees/octree.ts": [ "../../src/Culling/Octrees/octreeBlock.ts" ], "../../src/Culling/Octrees/octreeBlock.ts": [ "../../src/Culling/Octrees/octree.ts" ], </s> add </s> remove import { Octree } from "./octree"; </s> add /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> remove /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> add </s> remove Octree._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); </s> add OctreeBlock._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); } /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } } </s> remove /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } } } </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7034abef32687e25914f47af387b3e1f42314f4
Tools/Config/tempCircularValidation/core.json
<mask> import { SubMesh } from "../../Meshes/subMesh"; <mask> import { AbstractMesh } from "../../Meshes/abstractMesh"; <mask> import { Ray } from "../../Culling/ray"; <mask> import { OctreeBlock } from "./octreeBlock"; <mask> /** <mask> * Contains an array of blocks representing the octree <mask> */ <mask> export interface IOctreeContainer<T> { <mask> /** <mask> * Blocks within the octree <mask> */ <mask> blocks: Array<OctreeBlock<T>>; <mask> } <mask> <mask> /** <mask> * Octrees are a really powerful data structure that can quickly select entities based on space coordinates. <mask> * @see https://doc.babylonjs.com/how_to/optimizing_your_scene_with_octrees <mask> */ </s> octree block dep Former-commit-id: 0e624ab4df0971391c80fd847b18923ad21eee2e </s> remove import { Octree } from "./octree"; </s> add /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> remove Octree._CreateBlocks(worldMin, worldMax, entries, this._maxBlockCapacity, 0, this.maxDepth, this, this._creationFunc); </s> add OctreeBlock._CreateBlocks(worldMin, worldMax, entries, this._maxBlockCapacity, 0, this.maxDepth, this, this._creationFunc); </s> remove /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } } } </s> add </s> remove Octree._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); </s> add OctreeBlock._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); } /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } } </s> remove "errorCount": 28 </s> add "errorCount": 26
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7034abef32687e25914f47af387b3e1f42314f4
src/Culling/Octrees/octree.ts
OctreeBlock._CreateBlocks(worldMin, worldMax, entries, this._maxBlockCapacity, 0, this.maxDepth, this, this._creationFunc);
<mask> * @param worldMax worldMax for the octree blocks var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); <mask> * @param entries meshes to be added to the octree blocks <mask> */ <mask> public update(worldMin: Vector3, worldMax: Vector3, entries: T[]): void { <mask> Octree._CreateBlocks(worldMin, worldMax, entries, this._maxBlockCapacity, 0, this.maxDepth, this, this._creationFunc); <mask> } <mask> <mask> /** <mask> * Adds a mesh to the octree <mask> * @param entry Mesh to add to the octree </s> octree block dep Former-commit-id: 0e624ab4df0971391c80fd847b18923ad21eee2e </s> remove Octree._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); </s> add OctreeBlock._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); } /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } } </s> remove /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } } } </s> add </s> remove import { Octree } from "./octree"; </s> add /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> remove /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> add </s> remove "errorCount": 28 </s> add "errorCount": 26
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7034abef32687e25914f47af387b3e1f42314f4
src/Culling/Octrees/octree.ts
<mask> <mask> return this._selectionContent; <mask> } <mask> <mask> /** <mask> * @hidden <mask> */ <mask> public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { <mask> target.blocks = new Array<OctreeBlock<T>>(); <mask> var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); <mask> <mask> // Segmenting space <mask> for (var x = 0; x < 2; x++) { <mask> for (var y = 0; y < 2; y++) { <mask> for (var z = 0; z < 2; z++) { <mask> var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); <mask> var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); <mask> <mask> var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); <mask> block.addEntries(entries); <mask> target.blocks.push(block); <mask> } <mask> } <mask> } <mask> } <mask> <mask> /** <mask> * Adds a mesh into the octree block if it intersects the block <mask> */ <mask> public static CreationFuncForMeshes = (entry: AbstractMesh, block: OctreeBlock<AbstractMesh>): void => { <mask> let boundingInfo = entry.getBoundingInfo(); </s> octree block dep Former-commit-id: 0e624ab4df0971391c80fd847b18923ad21eee2e </s> remove Octree._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); </s> add OctreeBlock._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); } /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } } </s> remove Octree._CreateBlocks(worldMin, worldMax, entries, this._maxBlockCapacity, 0, this.maxDepth, this, this._creationFunc); </s> add OctreeBlock._CreateBlocks(worldMin, worldMax, entries, this._maxBlockCapacity, 0, this.maxDepth, this, this._creationFunc); </s> remove import { Octree } from "./octree"; </s> add /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> remove /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> add </s> remove "errorCount": 28 </s> add "errorCount": 26
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/BabylonJS/Babylon.js/commit/e7034abef32687e25914f47af387b3e1f42314f4
src/Culling/Octrees/octree.ts
/** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; }
<mask> import { SmartArrayNoDuplicate } from "../../Misc/smartArray"; <mask> import { Vector3, Plane } from "../../Maths/math"; <mask> import { Ray } from "../../Culling/ray"; <mask> import { BoundingBox } from "../../Culling/boundingBox"; <mask> import { Octree } from "./octree"; <mask> /** <mask> * Class used to store a cell in an octree <mask> * @see http://doc.babylonjs.com/how_to/optimizing_your_scene_with_octrees <mask> */ <mask> export class OctreeBlock<T> { </s> octree block dep Former-commit-id: 0e624ab4df0971391c80fd847b18923ad21eee2e </s> remove /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> add </s> remove Octree._CreateBlocks(worldMin, worldMax, entries, this._maxBlockCapacity, 0, this.maxDepth, this, this._creationFunc); </s> add OctreeBlock._CreateBlocks(worldMin, worldMax, entries, this._maxBlockCapacity, 0, this.maxDepth, this, this._creationFunc); </s> remove /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } } } </s> add </s> remove Octree._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); </s> add OctreeBlock._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); } /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } } </s> remove "../../src/Culling/Octrees/octree.ts": [ "../../src/Culling/Octrees/octreeBlock.ts" ], "../../src/Culling/Octrees/octreeBlock.ts": [ "../../src/Culling/Octrees/octree.ts" ], </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7034abef32687e25914f47af387b3e1f42314f4
src/Culling/Octrees/octreeBlock.ts
OctreeBlock._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); } /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } }
<mask> /** <mask> * Subdivide the content into child blocks (this block will then be empty) <mask> */ <mask> public createInnerBlocks(): void { <mask> Octree._CreateBlocks(this._minPoint, this._maxPoint, this.entries, this._capacity, this._depth, this._maxDepth, this, this._creationFunc); <mask> } <mask> } </s> octree block dep Former-commit-id: 0e624ab4df0971391c80fd847b18923ad21eee2e </s> remove Octree._CreateBlocks(worldMin, worldMax, entries, this._maxBlockCapacity, 0, this.maxDepth, this, this._creationFunc); </s> add OctreeBlock._CreateBlocks(worldMin, worldMax, entries, this._maxBlockCapacity, 0, this.maxDepth, this, this._creationFunc); </s> remove /** * @hidden */ public static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void { target.blocks = new Array<OctreeBlock<T>>(); var blockSize = new Vector3((worldMax.x - worldMin.x) / 2, (worldMax.y - worldMin.y) / 2, (worldMax.z - worldMin.z) / 2); // Segmenting space for (var x = 0; x < 2; x++) { for (var y = 0; y < 2; y++) { for (var z = 0; z < 2; z++) { var localMin = worldMin.add(blockSize.multiplyByFloats(x, y, z)); var localMax = worldMin.add(blockSize.multiplyByFloats(x + 1, y + 1, z + 1)); var block = new OctreeBlock<T>(localMin, localMax, maxBlockCapacity, currentDepth + 1, maxDepth, creationFunc); block.addEntries(entries); target.blocks.push(block); } } } } </s> add </s> remove import { Octree } from "./octree"; </s> add /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> remove /** * Contains an array of blocks representing the octree */ export interface IOctreeContainer<T> { /** * Blocks within the octree */ blocks: Array<OctreeBlock<T>>; } </s> add </s> remove "errorCount": 28 </s> add "errorCount": 26
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7034abef32687e25914f47af387b3e1f42314f4
src/Culling/Octrees/octreeBlock.ts
<mask> private _currentType: number; <mask> private _lightParent: TransformNode; <mask> private _postprocess: Nullable<PostProcess>; <mask> private _particleSystem: Nullable<ParticleSystem>; <mask> private _particleSystemDrawObserver: Nullable<Observer<Effect>>; <mask> <mask> public constructor(targetCanvas: HTMLCanvasElement, globalState: GlobalState) { <mask> this._nodeMaterial = globalState.nodeMaterial; <mask> this._globalState = globalState; <mask> this._particleSystemDrawObserver = null; </s> Simplify code with particle system reloading Former-commit-id: 27d45df5223bbfb09461c7b886b4ea3d514ee31d </s> remove this._particleSystemDrawObserver = null; </s> add </s> remove this._particleSystem.customEffect = null; </s> add </s> remove this._particleSystemDrawObserver = null; </s> add </s> remove if (this._particleSystemDrawObserver) { this._particleSystem.onBeforeDrawParticlesObservable.remove(this._particleSystemDrawObserver); } </s> add this._particleSystem.onBeforeDrawParticlesObservable.clear(); </s> remove this._particleSystemDrawObserver = this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => { </s> add this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e798f045be92a3f5092ceecb75f42c0264d00b01
nodeEditor/src/components/preview/previewManager.ts
<mask> <mask> public constructor(targetCanvas: HTMLCanvasElement, globalState: GlobalState) { <mask> this._nodeMaterial = globalState.nodeMaterial; <mask> this._globalState = globalState; <mask> this._particleSystemDrawObserver = null; <mask> <mask> this._onBuildObserver = this._nodeMaterial.onBuildObservable.add((nodeMaterial) => { <mask> let serializationObject = nodeMaterial.serialize(); <mask> this._updatePreview(serializationObject); <mask> }); </s> Simplify code with particle system reloading Former-commit-id: 27d45df5223bbfb09461c7b886b4ea3d514ee31d </s> remove private _particleSystemDrawObserver: Nullable<Observer<Effect>>; </s> add </s> remove this._particleSystem.customEffect = null; </s> add </s> remove this._particleSystemDrawObserver = this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => { </s> add this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => { </s> remove this._particleSystemDrawObserver = null; </s> add </s> remove if (this._particleSystemDrawObserver) { this._particleSystem.onBeforeDrawParticlesObservable.remove(this._particleSystemDrawObserver); } </s> add this._particleSystem.onBeforeDrawParticlesObservable.clear();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e798f045be92a3f5092ceecb75f42c0264d00b01
nodeEditor/src/components/preview/previewManager.ts
this._particleSystem.onBeforeDrawParticlesObservable.clear();
<mask> <mask> this._engine.releaseEffects(); <mask> <mask> if (this._particleSystem) { <mask> if (this._particleSystemDrawObserver) { <mask> this._particleSystem.onBeforeDrawParticlesObservable.remove(this._particleSystemDrawObserver); <mask> } <mask> this._particleSystem.onDisposeObservable.clear(); <mask> this._particleSystem.customEffect = null; <mask> this._particleSystem.stop(); <mask> this._particleSystem.dispose(); <mask> this._particleSystem = null; </s> Simplify code with particle system reloading Former-commit-id: 27d45df5223bbfb09461c7b886b4ea3d514ee31d </s> remove this._particleSystem.customEffect = null; </s> add </s> remove this._particleSystemDrawObserver = null; </s> add </s> remove this._particleSystemDrawObserver = this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => { </s> add this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => { </s> remove if (this._globalState.mode === NodeMaterialModes.Particle && this._globalState.previewType === particleNumber) { this._loadParticleSystem(particleNumber, systemIndex, false); } </s> add this._loadParticleSystem(particleNumber, systemIndex, false); </s> remove this._particleSystemDrawObserver = null; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e798f045be92a3f5092ceecb75f42c0264d00b01
nodeEditor/src/components/preview/previewManager.ts
<mask> if (this._particleSystemDrawObserver) { <mask> this._particleSystem.onBeforeDrawParticlesObservable.remove(this._particleSystemDrawObserver); <mask> } <mask> this._particleSystem.onDisposeObservable.clear(); <mask> this._particleSystem.customEffect = null; <mask> this._particleSystem.stop(); <mask> this._particleSystem.dispose(); <mask> this._particleSystem = null; <mask> this._particleSystemDrawObserver = null; <mask> } </s> Simplify code with particle system reloading Former-commit-id: 27d45df5223bbfb09461c7b886b4ea3d514ee31d </s> remove if (this._particleSystemDrawObserver) { this._particleSystem.onBeforeDrawParticlesObservable.remove(this._particleSystemDrawObserver); } </s> add this._particleSystem.onBeforeDrawParticlesObservable.clear(); </s> remove this._particleSystemDrawObserver = null; </s> add </s> remove this._particleSystemDrawObserver = this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => { </s> add this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => { </s> remove this._particleSystemDrawObserver = null; </s> add </s> remove if (this._globalState.mode === NodeMaterialModes.Particle && this._globalState.previewType === particleNumber) { this._loadParticleSystem(particleNumber, systemIndex, false); } </s> add this._loadParticleSystem(particleNumber, systemIndex, false);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e798f045be92a3f5092ceecb75f42c0264d00b01
nodeEditor/src/components/preview/previewManager.ts
<mask> this._particleSystem.customEffect = null; <mask> this._particleSystem.stop(); <mask> this._particleSystem.dispose(); <mask> this._particleSystem = null; <mask> this._particleSystemDrawObserver = null; <mask> } <mask> <mask> SceneLoader.ShowLoadingScreen = false; <mask> <mask> this._globalState.onIsLoadingChanged.notifyObservers(true); </s> Simplify code with particle system reloading Former-commit-id: 27d45df5223bbfb09461c7b886b4ea3d514ee31d </s> remove this._particleSystem.customEffect = null; </s> add </s> remove if (this._particleSystemDrawObserver) { this._particleSystem.onBeforeDrawParticlesObservable.remove(this._particleSystemDrawObserver); } </s> add this._particleSystem.onBeforeDrawParticlesObservable.clear(); </s> remove this._particleSystemDrawObserver = null; </s> add </s> remove private _particleSystemDrawObserver: Nullable<Observer<Effect>>; </s> add </s> remove this._particleSystemDrawObserver = this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => { </s> add this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e798f045be92a3f5092ceecb75f42c0264d00b01
nodeEditor/src/components/preview/previewManager.ts
this._loadParticleSystem(particleNumber, systemIndex, false);
<mask> if (i == systemIndex) { <mask> this._particleSystem = set.systems[i] as ParticleSystem; <mask> this._particleSystem.disposeOnStop = true; <mask> this._particleSystem.onDisposeObservable.add(() => { <mask> if (this._globalState.mode === NodeMaterialModes.Particle && this._globalState.previewType === particleNumber) { <mask> this._loadParticleSystem(particleNumber, systemIndex, false); <mask> } <mask> }); <mask> this._particleSystem.start(); <mask> } else { <mask> set.systems[i].dispose(); <mask> } </s> Simplify code with particle system reloading Former-commit-id: 27d45df5223bbfb09461c7b886b4ea3d514ee31d </s> remove this._particleSystemDrawObserver = this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => { </s> add this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => { </s> remove if (this._particleSystemDrawObserver) { this._particleSystem.onBeforeDrawParticlesObservable.remove(this._particleSystemDrawObserver); } </s> add this._particleSystem.onBeforeDrawParticlesObservable.clear(); </s> remove this._particleSystem.customEffect = null; </s> add </s> remove this._particleSystemDrawObserver = null; </s> add </s> remove this._particleSystemDrawObserver = null; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e798f045be92a3f5092ceecb75f42c0264d00b01
nodeEditor/src/components/preview/previewManager.ts
this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => {
<mask> if (this._particleSystemDrawObserver) { <mask> this._particleSystem.onBeforeDrawParticlesObservable.remove(this._particleSystemDrawObserver); <mask> } <mask> <mask> this._particleSystemDrawObserver = this._particleSystem.onBeforeDrawParticlesObservable.add((effect) => { <mask> const textureBlock = tempMaterial.getBlockByPredicate((block) => block instanceof ParticleTextureBlock); <mask> if (textureBlock && (textureBlock as ParticleTextureBlock).texture) { <mask> effect.setTexture("diffuseSampler", (textureBlock as ParticleTextureBlock).texture); <mask> } <mask> }); </s> Simplify code with particle system reloading Former-commit-id: 27d45df5223bbfb09461c7b886b4ea3d514ee31d </s> remove if (this._globalState.mode === NodeMaterialModes.Particle && this._globalState.previewType === particleNumber) { this._loadParticleSystem(particleNumber, systemIndex, false); } </s> add this._loadParticleSystem(particleNumber, systemIndex, false); </s> remove this._particleSystem.customEffect = null; </s> add </s> remove if (this._particleSystemDrawObserver) { this._particleSystem.onBeforeDrawParticlesObservable.remove(this._particleSystemDrawObserver); } </s> add this._particleSystem.onBeforeDrawParticlesObservable.clear(); </s> remove this._particleSystemDrawObserver = null; </s> add </s> remove this._particleSystemDrawObserver = null; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e798f045be92a3f5092ceecb75f42c0264d00b01
nodeEditor/src/components/preview/previewManager.ts
var data = this.RGBE_ReadPixels(uint8array, hdrInfo);
<mask> */ <mask> public static GetCubeMapTextureData(buffer: ArrayBuffer, size: number): CubeMapInfo { <mask> var uint8array = new Uint8Array(buffer); <mask> var hdrInfo = this.RGBE_ReadHeader(uint8array); <mask> var data = this.RGBE_ReadPixels_RLE(uint8array, hdrInfo); <mask> <mask> var cubeMapData = PanoramaToCubeMapTools.ConvertPanoramaToCubemap(data, hdrInfo.width, hdrInfo.height, size); <mask> <mask> return cubeMapData; <mask> } </s> Fix Not RLE RGBE HDR files Former-commit-id: 1bd4c347c5f8ba4ca2e280c35fd495694fa49cd5 </s> remove // Keep for multi format supports. </s> add </s> remove if (a != 2 || b != 2 || (c & 0x80)) { // this file is not run length encoded throw "HDR Bad header format, not RLE"; </s> add if (a != 2 || b != 2 || (c & 0x80) || hdrInfo.width < 8 || hdrInfo.width > 32767) { return this.RGBE_ReadPixels_NOT_RLE(uint8array, hdrInfo);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7d5e22f1bae95e23d5c7fdde868a438bb0fd6ea
src/Misc/HighDynamicRange/hdr.ts
<mask> * @param hdrInfo The header information of the file. <mask> * @return The pixels data in RGB right to left up to down order. <mask> */ <mask> public static RGBE_ReadPixels(uint8array: Uint8Array, hdrInfo: HDRInfo): Float32Array { <mask> // Keep for multi format supports. <mask> return this.RGBE_ReadPixels_RLE(uint8array, hdrInfo); <mask> } <mask> <mask> private static RGBE_ReadPixels_RLE(uint8array: Uint8Array, hdrInfo: HDRInfo): Float32Array { <mask> var num_scanlines = hdrInfo.height; </s> Fix Not RLE RGBE HDR files Former-commit-id: 1bd4c347c5f8ba4ca2e280c35fd495694fa49cd5 </s> remove var data = this.RGBE_ReadPixels_RLE(uint8array, hdrInfo); </s> add var data = this.RGBE_ReadPixels(uint8array, hdrInfo); </s> remove if (a != 2 || b != 2 || (c & 0x80)) { // this file is not run length encoded throw "HDR Bad header format, not RLE"; </s> add if (a != 2 || b != 2 || (c & 0x80) || hdrInfo.width < 8 || hdrInfo.width > 32767) { return this.RGBE_ReadPixels_NOT_RLE(uint8array, hdrInfo);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7d5e22f1bae95e23d5c7fdde868a438bb0fd6ea
src/Misc/HighDynamicRange/hdr.ts
if (a != 2 || b != 2 || (c & 0x80) || hdrInfo.width < 8 || hdrInfo.width > 32767) { return this.RGBE_ReadPixels_NOT_RLE(uint8array, hdrInfo);
<mask> b = uint8array[dataIndex++]; <mask> c = uint8array[dataIndex++]; <mask> d = uint8array[dataIndex++]; <mask> <mask> if (a != 2 || b != 2 || (c & 0x80)) { <mask> // this file is not run length encoded <mask> throw "HDR Bad header format, not RLE"; <mask> } <mask> <mask> if (((c << 8) | d) != scanline_width) { <mask> throw "HDR Bad header format, wrong scan line width"; <mask> } </s> Fix Not RLE RGBE HDR files Former-commit-id: 1bd4c347c5f8ba4ca2e280c35fd495694fa49cd5 </s> remove // Keep for multi format supports. </s> add </s> remove var data = this.RGBE_ReadPixels_RLE(uint8array, hdrInfo); </s> add var data = this.RGBE_ReadPixels(uint8array, hdrInfo);
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7d5e22f1bae95e23d5c7fdde868a438bb0fd6ea
src/Misc/HighDynamicRange/hdr.ts
private _displayingPosterTexture = false; private _settings: VideoTextureSettings; private _createInternalTextureOnEvent: string;
<mask> <mask> private _generateMipMaps: boolean; <mask> private _engine: Engine; <mask> private _stillImageCaptured = false; <mask> private _poster = false; <mask> <mask> /** <mask> * Creates a video texture. <mask> * If you want to display a video in your scene, this is the special texture for that. <mask> * This special texture works similar to other textures, with the exception of a few parameters. </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove this._poster = false; </s> add this._displayingPosterTexture = false; </s> remove if (this._poster) { </s> add if (this._displayingPosterTexture) { </s> remove this._poster = true; </s> add this._displayingPosterTexture = true; } else if (videoHasEnoughData) { this._createInternalTexture(); </s> remove if (!this.video.autoplay) { </s> add if (!this.video.autoplay && !this._settings.poster) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
this._settings = settings;
<mask> this.name = name || this._getName(src); <mask> this.video = this._getVideo(src); <mask> if (settings.poster) { <mask> this.video.poster = settings.poster; <mask> } <mask> </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { this._createInternalTexture(); } if (settings.poster) { </s> add const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); if (settings.poster && (!settings.autoPlay || !videoHasEnoughData)) { </s> remove this._poster = true; </s> add this._displayingPosterTexture = true; } else if (videoHasEnoughData) { this._createInternalTexture(); </s> remove this._poster = false; </s> add this._displayingPosterTexture = false; </s> remove if (this._poster) { </s> add if (this._displayingPosterTexture) { </s> remove if (!this._poster) { </s> add if (!this._displayingPosterTexture) {
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
<mask> } <mask> <mask> this.video.setAttribute("playsinline", ""); <mask> <mask> this.video.addEventListener("canplay", this._createInternalTexture); <mask> this.video.addEventListener("paused", this._updateInternalTexture); <mask> this.video.addEventListener("seeked", this._updateInternalTexture); <mask> this.video.addEventListener("emptied", this.reset); <mask> <mask> if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { this._createInternalTexture(); } if (settings.poster) { </s> add const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); if (settings.poster && (!settings.autoPlay || !videoHasEnoughData)) { </s> remove this.video.removeEventListener("canplay", this._createInternalTexture); </s> add this.video.removeEventListener(this._createInternalTextureOnEvent, this._createInternalTexture); </s> remove if (!this._poster) { </s> add if (!this._displayingPosterTexture) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
this._createInternalTextureOnEvent = (settings.poster && !settings.autoPlay) ? "play" : "canplay"; this.video.addEventListener(this._createInternalTextureOnEvent, this._createInternalTexture);
<mask> <mask> this.video.addEventListener("paused", this._updateInternalTexture); <mask> this.video.addEventListener("seeked", this._updateInternalTexture); <mask> this.video.addEventListener("emptied", this.reset); <mask> <mask> const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); <mask> if (settings.poster && <mask> (!settings.autoPlay || !videoHasEnoughData)) { </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { this._createInternalTexture(); } if (settings.poster) { </s> add const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); if (settings.poster && (!settings.autoPlay || !videoHasEnoughData)) { </s> remove this.video.addEventListener("canplay", this._createInternalTexture); </s> add </s> remove this.video.removeEventListener("canplay", this._createInternalTexture); </s> add this.video.removeEventListener(this._createInternalTextureOnEvent, this._createInternalTexture); </s> remove if (!this.video.autoplay) { </s> add if (!this.video.autoplay && !this._settings.poster) {
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); if (settings.poster && (!settings.autoPlay || !videoHasEnoughData)) {
<mask> this.video.addEventListener("paused", this._updateInternalTexture); <mask> this.video.addEventListener("seeked", this._updateInternalTexture); <mask> this.video.addEventListener("emptied", this.reset); <mask> <mask> if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { <mask> this._createInternalTexture(); <mask> } <mask> <mask> if (settings.poster) { <mask> this._texture = this._engine.createTexture(settings.poster!, false, true, scene); <mask> this._poster = true; <mask> } <mask> } <mask> </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove this._poster = true; </s> add this._displayingPosterTexture = true; } else if (videoHasEnoughData) { this._createInternalTexture(); </s> remove this.video.addEventListener("canplay", this._createInternalTexture); </s> add </s> remove if (!this._poster) { </s> add if (!this._displayingPosterTexture) { </s> remove this._poster = false; </s> add this._displayingPosterTexture = false;
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
this._displayingPosterTexture = true; } else if (videoHasEnoughData) { this._createInternalTexture();
<mask> } <mask> <mask> if (settings.poster) { <mask> this._texture = this._engine.createTexture(settings.poster!, false, true, scene); <mask> this._poster = true; <mask> } <mask> } <mask> <mask> private _getName(src: string | string[] | HTMLVideoElement): string { <mask> if (src instanceof HTMLVideoElement) { </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { this._createInternalTexture(); } if (settings.poster) { </s> add const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); if (settings.poster && (!settings.autoPlay || !videoHasEnoughData)) { </s> remove this._poster = false; </s> add this._displayingPosterTexture = false; </s> remove if (!this._poster) { </s> add if (!this._displayingPosterTexture) { </s> remove if (this._poster) { </s> add if (this._displayingPosterTexture) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
if (this._displayingPosterTexture) {
<mask> } <mask> <mask> private _createInternalTexture = (): void => { <mask> if (this._texture != null) { <mask> if (this._poster) { <mask> this._texture.dispose(); <mask> this._poster = false; <mask> } <mask> else { <mask> return; </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove this._poster = false; </s> add this._displayingPosterTexture = false; </s> remove if (!this._poster) { </s> add if (!this._displayingPosterTexture) { </s> remove this._poster = true; </s> add this._displayingPosterTexture = true; } else if (videoHasEnoughData) { this._createInternalTexture(); </s> remove if (!this.video.autoplay) { </s> add if (!this.video.autoplay && !this._settings.poster) { </s> remove if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { this._createInternalTexture(); } if (settings.poster) { </s> add const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); if (settings.poster && (!settings.autoPlay || !videoHasEnoughData)) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
this._displayingPosterTexture = false;
<mask> private _createInternalTexture = (): void => { <mask> if (this._texture != null) { <mask> if (this._poster) { <mask> this._texture.dispose(); <mask> this._poster = false; <mask> } <mask> else { <mask> return; <mask> } <mask> } </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove if (this._poster) { </s> add if (this._displayingPosterTexture) { </s> remove if (!this._poster) { </s> add if (!this._displayingPosterTexture) { </s> remove this._poster = true; </s> add this._displayingPosterTexture = true; } else if (videoHasEnoughData) { this._createInternalTexture(); </s> remove if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { this._createInternalTexture(); } if (settings.poster) { </s> add const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); if (settings.poster && (!settings.autoPlay || !videoHasEnoughData)) { </s> remove if (!this.video.autoplay) { </s> add if (!this.video.autoplay && !this._settings.poster) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
if (!this.video.autoplay && !this._settings.poster) {
<mask> this._generateMipMaps, <mask> this._samplingMode <mask> ); <mask> <mask> if (!this.video.autoplay) { <mask> let oldHandler = this.video.onplaying; <mask> let error = false; <mask> this.video.onplaying = () => { <mask> this.video.onplaying = oldHandler; <mask> this._texture!.isReady = true; </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove this._poster = false; </s> add this._displayingPosterTexture = false; </s> remove if (this._poster) { </s> add if (this._displayingPosterTexture) { </s> remove this._poster = true; </s> add this._displayingPosterTexture = true; } else if (videoHasEnoughData) { this._createInternalTexture(); </s> remove if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { this._createInternalTexture(); } if (settings.poster) { </s> add const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); if (settings.poster && (!settings.autoPlay || !videoHasEnoughData)) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
if (!this._displayingPosterTexture) {
<mask> if (this._texture == null) { <mask> return; <mask> } <mask> <mask> if (!this._poster) { <mask> this._texture.dispose(); <mask> this._texture = null; <mask> } <mask> } <mask> </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove this._poster = false; </s> add this._displayingPosterTexture = false; </s> remove if (this._poster) { </s> add if (this._displayingPosterTexture) { </s> remove this._poster = true; </s> add this._displayingPosterTexture = true; } else if (videoHasEnoughData) { this._createInternalTexture(); </s> remove if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { this._createInternalTexture(); } if (settings.poster) { </s> add const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); if (settings.poster && (!settings.autoPlay || !videoHasEnoughData)) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
if (this._displayingPosterTexture) { return; }
<mask> if (this.video.readyState < this.video.HAVE_CURRENT_DATA) { <mask> return; <mask> } <mask> <mask> this._engine.updateVideoTexture(this._texture, this.video, this._invertY); <mask> } <mask> <mask> /** <mask> * Change video content. Changing video instance or setting multiple urls (as in constructor) is not supported. </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove private _poster = false; </s> add private _displayingPosterTexture = false; private _settings: VideoTextureSettings; private _createInternalTextureOnEvent: string; </s> remove if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { this._createInternalTexture(); } if (settings.poster) { </s> add const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); if (settings.poster && (!settings.autoPlay || !videoHasEnoughData)) { </s> remove this.video.addEventListener("canplay", this._createInternalTexture); </s> add </s> remove if (!this._poster) { </s> add if (!this._displayingPosterTexture) { </s> remove this._poster = false; </s> add this._displayingPosterTexture = false;
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
this.video.removeEventListener(this._createInternalTextureOnEvent, this._createInternalTexture);
<mask> this._onUserActionRequestedObservable.clear(); <mask> this._onUserActionRequestedObservable = null; <mask> } <mask> <mask> this.video.removeEventListener("canplay", this._createInternalTexture); <mask> this.video.removeEventListener("paused", this._updateInternalTexture); <mask> this.video.removeEventListener("seeked", this._updateInternalTexture); <mask> this.video.removeEventListener("emptied", this.reset); <mask> this.video.pause(); <mask> } </s> Fix VideoTexture poster without autoplay Former-commit-id: a2c9f439a48cbb416b25037b66a55bd7b11985ea </s> remove this.video.addEventListener("canplay", this._createInternalTexture); </s> add </s> remove if (this.video.readyState >= this.video.HAVE_CURRENT_DATA) { this._createInternalTexture(); } if (settings.poster) { </s> add const videoHasEnoughData = (this.video.readyState >= this.video.HAVE_CURRENT_DATA); if (settings.poster && (!settings.autoPlay || !videoHasEnoughData)) { </s> remove if (!this._poster) { </s> add if (!this._displayingPosterTexture) { </s> remove this._poster = false; </s> add this._displayingPosterTexture = false;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e7e0948d5514ce686a20720b9ea41dcec84ff4d6
src/Materials/Textures/babylon.videoTexture.ts
private _teleportationTarget: Mesh; private _isDefaultTeleportationTarget = true;
<mask> private _teleportationBackRequestInitiated = false; <mask> private teleportBackwardsVector = new Vector3(0, -1, -1); <mask> private _rotationRightAsked = false; <mask> private _rotationLeftAsked = false; <mask> private _teleportationCircle: Mesh; <mask> private _postProcessMove: ImageProcessingPostProcess; <mask> private _passProcessMove: PassPostProcess; <mask> private _teleportationFillColor: string = "#444444"; <mask> private _teleportationBorderColor: string = "#FFFFFF"; <mask> private _rotationAngle: number = 0; </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove this._teleportationCircle.position.y += 0.1; </s> add this._teleportationTarget.position.y += 0.1; </s> remove private _hideTeleportationCircle() { </s> add private _hideTeleportationTarget() { </s> remove private _displayTeleportationCircle() { </s> add private _displayTeleportationTarget() { </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove this._teleportationCircle.isVisible = false; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = false; </s> add this._teleportationTarget.isVisible = false; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = false; }
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
public get teleportationTarget(): Mesh { return this._teleportationTarget; } public set teleportationTarget(value: Mesh) { if (value) { value.name = "teleportationTarget"; this._isDefaultTeleportationTarget = false; this._teleportationTarget = value; } }
<mask> private _displayGaze = true; <mask> private _displayLaserPointer = true; <mask> <mask> public get displayGaze(): boolean { <mask> return this._displayGaze; <mask> } <mask> </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove private _displayTeleportationCircle() { </s> add private _displayTeleportationTarget() { </s> remove private _hideTeleportationCircle() { </s> add private _hideTeleportationTarget() { </s> remove this._teleportationCircle.isVisible = false; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = false; </s> add this._teleportationTarget.isVisible = false; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = false; } </s> remove && mesh.name.indexOf("teleportationCircle") === -1 </s> add && mesh.name.indexOf("teleportationTarget") === -1
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
&& mesh.name.indexOf("teleportationTarget") === -1
<mask> } <mask> <mask> this._raySelectionPredicate = (mesh) => { <mask> if (this._isTeleportationFloor(mesh) || (mesh.isVisible && mesh.name.indexOf("gazeTracker") === -1 <mask> && mesh.name.indexOf("teleportationCircle") === -1 <mask> && mesh.name.indexOf("torusTeleportation") === -1 <mask> && mesh.name.indexOf("laserPointer") === -1)) { <mask> return this.raySelectionPredicate(mesh); <mask> } <mask> return false; </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove this._hideTeleportationCircle(); </s> add this._hideTeleportationTarget(); </s> remove this._createTeleportationCircles(); </s> add if (this._isDefaultTeleportationTarget) { this._createTeleportationCircles(); } </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove this._teleportationCircle.isVisible = false; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = false; </s> add this._teleportationTarget.isVisible = false; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = false; }
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
if (this._isDefaultTeleportationTarget) { this._createTeleportationCircles(); }
<mask> <mask> this._webVRCamera.detachPostProcess(this._postProcessMove) <mask> this._passProcessMove = new BABYLON.PassPostProcess("pass", 1.0, this._webVRCamera); <mask> this._teleportationEnabled = true; <mask> this._createTeleportationCircles(); <mask> } <mask> } <mask> <mask> private _onNewGamepadConnected = (gamepad: Gamepad) => { <mask> if (gamepad.type !== BABYLON.Gamepad.POSE_ENABLED) { </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove private _hideTeleportationCircle() { </s> add private _hideTeleportationTarget() { </s> remove this._teleportationCircle.isVisible = false; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = false; </s> add this._teleportationTarget.isVisible = false; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = false; } </s> remove private _displayTeleportationCircle() { </s> add private _displayTeleportationTarget() {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
this._teleportationTarget = BABYLON.Mesh.CreateGround("teleportationTarget", 2, 2, 2, this._scene); this._teleportationTarget.isPickable = false;
<mask> this._gazeTracker.material = targetMat; <mask> } <mask> <mask> private _createTeleportationCircles() { <mask> this._teleportationCircle = BABYLON.Mesh.CreateGround("teleportationCircle", 2, 2, 2, this._scene); <mask> this._teleportationCircle.isPickable = false; <mask> <mask> var length = 512; <mask> var dynamicTexture = new BABYLON.DynamicTexture("DynamicTexture", length, this._scene, true); <mask> dynamicTexture.hasAlpha = true; <mask> var context = dynamicTexture.getContext(); </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove this._teleportationCircle.material = teleportationCircleMaterial; </s> add this._teleportationTarget.material = teleportationCircleMaterial; </s> remove torus.parent = this._teleportationCircle; </s> add torus.parent = this._teleportationTarget; </s> remove BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationCircle.rotation); </s> add BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationTarget.rotation); </s> remove this._teleportationCircle.position.y += 0.1; </s> add this._teleportationTarget.position.y += 0.1; </s> remove this._teleportationCircle.position.copyFrom(hit.pickedPoint); </s> add this._teleportationTarget.position.copyFrom(hit.pickedPoint);
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
this._teleportationTarget.material = teleportationCircleMaterial;
<mask> dynamicTexture.update(); <mask> <mask> var teleportationCircleMaterial = new BABYLON.StandardMaterial("TextPlaneMaterial", this._scene); <mask> teleportationCircleMaterial.diffuseTexture = dynamicTexture; <mask> this._teleportationCircle.material = teleportationCircleMaterial; <mask> <mask> var torus = BABYLON.Mesh.CreateTorus("torusTeleportation", 0.75, 0.1, 25, this._scene, false); <mask> torus.isPickable = false; <mask> torus.parent = this._teleportationCircle; <mask> </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove torus.parent = this._teleportationCircle; </s> add torus.parent = this._teleportationTarget; </s> remove this._teleportationCircle = BABYLON.Mesh.CreateGround("teleportationCircle", 2, 2, 2, this._scene); this._teleportationCircle.isPickable = false; </s> add this._teleportationTarget = BABYLON.Mesh.CreateGround("teleportationTarget", 2, 2, 2, this._scene); this._teleportationTarget.isPickable = false; </s> remove BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationCircle.rotation); </s> add BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationTarget.rotation); </s> remove this._teleportationCircle.position.copyFrom(hit.pickedPoint); </s> add this._teleportationTarget.position.copyFrom(hit.pickedPoint); </s> remove this._teleportationCircle.position.y += 0.1; </s> add this._teleportationTarget.position.y += 0.1;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
torus.parent = this._teleportationTarget;
<mask> this._teleportationCircle.material = teleportationCircleMaterial; <mask> <mask> var torus = BABYLON.Mesh.CreateTorus("torusTeleportation", 0.75, 0.1, 25, this._scene, false); <mask> torus.isPickable = false; <mask> torus.parent = this._teleportationCircle; <mask> <mask> var animationInnerCircle = new BABYLON.Animation("animationInnerCircle", "position.y", 30, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE); <mask> <mask> var keys = []; <mask> keys.push({ </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove this._teleportationCircle.material = teleportationCircleMaterial; </s> add this._teleportationTarget.material = teleportationCircleMaterial; </s> remove this._teleportationCircle = BABYLON.Mesh.CreateGround("teleportationCircle", 2, 2, 2, this._scene); this._teleportationCircle.isPickable = false; </s> add this._teleportationTarget = BABYLON.Mesh.CreateGround("teleportationTarget", 2, 2, 2, this._scene); this._teleportationTarget.isPickable = false; </s> remove this._teleportationCircle.position.copyFrom(hit.pickedPoint); </s> add this._teleportationTarget.position.copyFrom(hit.pickedPoint); </s> remove BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationCircle.rotation); </s> add BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationTarget.rotation); </s> remove this._teleportationCircle.position.y += 0.1; </s> add this._teleportationTarget.position.y += 0.1;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
this._hideTeleportationTarget();
<mask> torus.animations.push(animationInnerCircle); <mask> <mask> this._scene.beginAnimation(torus, 0, 60, true); <mask> <mask> this._hideTeleportationCircle(); <mask> } <mask> <mask> private _displayTeleportationCircle() { <mask> if (this._teleportationEnabled) { <mask> this._teleportationCircle.isVisible = true; </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove private _displayTeleportationCircle() { </s> add private _displayTeleportationTarget() { </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove private _hideTeleportationCircle() { </s> add private _hideTeleportationTarget() { </s> remove this._teleportationCircle.isVisible = false; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = false; </s> add this._teleportationTarget.isVisible = false; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = false; } </s> remove this._displayTeleportationCircle(); </s> add this._displayTeleportationTarget();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
private _displayTeleportationTarget() {
<mask> <mask> this._hideTeleportationCircle(); <mask> } <mask> <mask> private _displayTeleportationCircle() { <mask> if (this._teleportationEnabled) { <mask> this._teleportationCircle.isVisible = true; <mask> (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; <mask> } <mask> } </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove private _hideTeleportationCircle() { </s> add private _hideTeleportationTarget() { </s> remove this._hideTeleportationCircle(); </s> add this._hideTeleportationTarget(); </s> remove this._teleportationCircle.isVisible = false; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = false; </s> add this._teleportationTarget.isVisible = false; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = false; } </s> remove this._displayTeleportationCircle(); </s> add this._displayTeleportationTarget();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; }
<mask> } <mask> <mask> private _displayTeleportationCircle() { <mask> if (this._teleportationEnabled) { <mask> this._teleportationCircle.isVisible = true; <mask> (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; <mask> } <mask> } <mask> <mask> private _hideTeleportationCircle() { <mask> if (this._teleportationEnabled) { </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove private _hideTeleportationCircle() { </s> add private _hideTeleportationTarget() { </s> remove private _displayTeleportationCircle() { </s> add private _displayTeleportationTarget() { </s> remove this._teleportationCircle.isVisible = false; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = false; </s> add this._teleportationTarget.isVisible = false; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = false; } </s> remove this._hideTeleportationCircle(); </s> add this._hideTeleportationTarget(); </s> remove this._displayTeleportationCircle(); </s> add this._displayTeleportationTarget();
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
private _hideTeleportationTarget() {
<mask> (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; <mask> } <mask> } <mask> <mask> private _hideTeleportationCircle() { <mask> if (this._teleportationEnabled) { <mask> this._teleportationCircle.isVisible = false; <mask> (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = false; <mask> } <mask> } </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove this._teleportationCircle.isVisible = false; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = false; </s> add this._teleportationTarget.isVisible = false; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = false; } </s> remove private _displayTeleportationCircle() { </s> add private _displayTeleportationTarget() { </s> remove this._hideTeleportationCircle(); </s> add this._hideTeleportationTarget();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
this._teleportationTarget.isVisible = false; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = false; }
<mask> } <mask> <mask> private _hideTeleportationCircle() { <mask> if (this._teleportationEnabled) { <mask> this._teleportationCircle.isVisible = false; <mask> (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = false; <mask> } <mask> } <mask> <mask> private _rotateCamera(right: boolean) { <mask> if (!(this.currentVRCamera instanceof FreeCamera)) { </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove private _hideTeleportationCircle() { </s> add private _hideTeleportationTarget() { </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove private _displayTeleportationCircle() { </s> add private _displayTeleportationTarget() { </s> remove this._hideTeleportationCircle(); </s> add this._hideTeleportationTarget(); </s> remove this._displayTeleportationCircle(); </s> add this._displayTeleportationTarget();
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
this._displayTeleportationTarget();
<mask> private _moveTeleportationSelectorTo(hit: PickingInfo) { <mask> if (hit.pickedPoint) { <mask> this._teleportationAllowed = true; <mask> if (this._teleportationRequestInitiated) { <mask> this._displayTeleportationCircle(); <mask> } <mask> else { <mask> this._hideTeleportationCircle(); <mask> } <mask> this._haloCenter.copyFrom(hit.pickedPoint); </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove this._hideTeleportationCircle(); </s> add this._hideTeleportationTarget(); </s> remove private _displayTeleportationCircle() { </s> add private _displayTeleportationTarget() { </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove this._teleportationCircle.position.copyFrom(hit.pickedPoint); </s> add this._teleportationTarget.position.copyFrom(hit.pickedPoint); </s> remove this._teleportationCircle.isVisible = false; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = false; </s> add this._teleportationTarget.isVisible = false; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = false; }
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
this._hideTeleportationTarget();
<mask> if (this._teleportationRequestInitiated) { <mask> this._displayTeleportationCircle(); <mask> } <mask> else { <mask> this._hideTeleportationCircle(); <mask> } <mask> this._haloCenter.copyFrom(hit.pickedPoint); <mask> this._teleportationCircle.position.copyFrom(hit.pickedPoint); <mask> var pickNormal = hit.getNormal(true, false); <mask> if (pickNormal) { </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove this._teleportationCircle.position.copyFrom(hit.pickedPoint); </s> add this._teleportationTarget.position.copyFrom(hit.pickedPoint); </s> remove this._displayTeleportationCircle(); </s> add this._displayTeleportationTarget(); </s> remove BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationCircle.rotation); </s> add BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationTarget.rotation); </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove private _displayTeleportationCircle() { </s> add private _displayTeleportationTarget() {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
this._teleportationTarget.position.copyFrom(hit.pickedPoint);
<mask> else { <mask> this._hideTeleportationCircle(); <mask> } <mask> this._haloCenter.copyFrom(hit.pickedPoint); <mask> this._teleportationCircle.position.copyFrom(hit.pickedPoint); <mask> var pickNormal = hit.getNormal(true, false); <mask> if (pickNormal) { <mask> var axis1 = BABYLON.Vector3.Cross(BABYLON.Axis.Y, pickNormal); <mask> var axis2 = BABYLON.Vector3.Cross(pickNormal, axis1); <mask> BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationCircle.rotation); </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationCircle.rotation); </s> add BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationTarget.rotation); </s> remove this._teleportationCircle.position.y += 0.1; </s> add this._teleportationTarget.position.y += 0.1; </s> remove this._hideTeleportationCircle(); </s> add this._hideTeleportationTarget(); </s> remove this._displayTeleportationCircle(); </s> add this._displayTeleportationTarget(); </s> remove this._teleportationCircle = BABYLON.Mesh.CreateGround("teleportationCircle", 2, 2, 2, this._scene); this._teleportationCircle.isPickable = false; </s> add this._teleportationTarget = BABYLON.Mesh.CreateGround("teleportationTarget", 2, 2, 2, this._scene); this._teleportationTarget.isPickable = false;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationTarget.rotation);
<mask> var pickNormal = hit.getNormal(true, false); <mask> if (pickNormal) { <mask> var axis1 = BABYLON.Vector3.Cross(BABYLON.Axis.Y, pickNormal); <mask> var axis2 = BABYLON.Vector3.Cross(pickNormal, axis1); <mask> BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationCircle.rotation); <mask> } <mask> this._teleportationCircle.position.y += 0.1; <mask> } <mask> } <mask> private _workingVector = Vector3.Zero(); </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove this._teleportationCircle.position.y += 0.1; </s> add this._teleportationTarget.position.y += 0.1; </s> remove this._teleportationCircle.position.copyFrom(hit.pickedPoint); </s> add this._teleportationTarget.position.copyFrom(hit.pickedPoint); </s> remove this._hideTeleportationCircle(); </s> add this._hideTeleportationTarget(); </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove private _hideTeleportationCircle() { </s> add private _hideTeleportationTarget() {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts
this._teleportationTarget.position.y += 0.1;
<mask> var axis1 = BABYLON.Vector3.Cross(BABYLON.Axis.Y, pickNormal); <mask> var axis2 = BABYLON.Vector3.Cross(pickNormal, axis1); <mask> BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationCircle.rotation); <mask> } <mask> this._teleportationCircle.position.y += 0.1; <mask> } <mask> } <mask> private _workingVector = Vector3.Zero(); <mask> private _workingQuaternion = Quaternion.Identity(); <mask> private _workingMatrix = Matrix.Identity(); </s> Exposing teleportationTarget mesh Former-commit-id: af4bcb5133f14f80b169526ea01534992ae5fc61 </s> remove BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationCircle.rotation); </s> add BABYLON.Vector3.RotationFromAxisToRef(axis2, pickNormal, axis1, this._teleportationTarget.rotation); </s> remove this._teleportationCircle.position.copyFrom(hit.pickedPoint); </s> add this._teleportationTarget.position.copyFrom(hit.pickedPoint); </s> remove private _hideTeleportationCircle() { </s> add private _hideTeleportationTarget() { </s> remove this._teleportationCircle.isVisible = true; (<Mesh>this._teleportationCircle.getChildren()[0]).isVisible = true; </s> add this._teleportationTarget.isVisible = true; if (this._isDefaultTeleportationTarget) { (<Mesh>this._teleportationTarget.getChildren()[0]).isVisible = true; } </s> remove private _displayTeleportationCircle() { </s> add private _displayTeleportationTarget() {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/BabylonJS/Babylon.js/commit/e81d51d4b83d43904c34bbed25af551355604f73
src/Cameras/VR/babylon.vrExperienceHelper.ts