Skip to content

Commit

Permalink
Rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
@xeolabs
xeolabs committed Oct 26, 2023
1 parent 5e262b8 commit 2eb83f4
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 40 deletions.
26 changes: 12 additions & 14 deletions dist/xeokit-sdk.cjs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73275,9 +73275,9 @@ class TrianglesDataTextureColorRenderer {

src.push("uniform int renderPass;");

if (scene.entityOffsetsEnabled) {
src.push("in vec3 offset;");
}
// if (scene.entityOffsetsEnabled) {
// src.push("in vec3 offset;");
// }

src.push("uniform mat4 sceneModelWorldMatrix;");
src.push("uniform mat4 viewMatrix;");
Expand Down Expand Up @@ -74043,7 +74043,6 @@ const defaultColor = new Float32Array([0, 0, 0, 1]);

const tempVec3a$i = math.vec3();
const tempVec3b$e = math.vec3();
math.vec3();
const tempVec3d$8 = math.vec3();
const tempMat4a$9 = math.mat4();

Expand Down Expand Up @@ -74106,8 +74105,7 @@ class TrianglesDataTextureEdgesRenderer {
if (gotOrigin || gotPosition) {
const rtcOrigin = tempVec3a$i;
if (gotOrigin) {
const rotatedOrigin = tempVec3b$e;
math.transformPoint3(rotationMatrix, origin, rotatedOrigin);
const rotatedOrigin = math.transformPoint3(rotationMatrix, origin, tempVec3b$e);
rtcOrigin[0] = rotatedOrigin[0];
rtcOrigin[1] = rotatedOrigin[1];
rtcOrigin[2] = rotatedOrigin[2];
Expand Down Expand Up @@ -74289,9 +74287,9 @@ class TrianglesDataTextureEdgesRenderer {

src.push("uniform int renderPass;");

if (scene.entityOffsetsEnabled) {
src.push("in vec3 offset;");
}
// if (scene.entityOffsetsEnabled) {
// src.push("in vec3 offset;");
// }

src.push("uniform mat4 sceneModelWorldMatrix;");
src.push("uniform mat4 viewMatrix;");
Expand Down Expand Up @@ -74376,7 +74374,7 @@ class TrianglesDataTextureEdgesRenderer {
// get XYZ offset
src.push("vec4 offset = vec4(texelFetch (uTexturePerObjectIdOffsets, objectIndexCoords, 0).rgb, 0.0);");

src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz;");
src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz + vec3(110.0,50.0, 10.0);");

src.push(" vec4 viewPosition = viewMatrix * worldPosition; ");

Expand Down Expand Up @@ -74526,8 +74524,7 @@ class TrianglesDataTextureEdgesColorRenderer {
if (gotOrigin || gotPosition) {
const rtcOrigin = tempVec3a$h;
if (gotOrigin) {
const rotatedOrigin = tempVec3b$d;
math.transformPoint3(rotationMatrix, origin, rotatedOrigin);
const rotatedOrigin = math.transformPoint3(rotationMatrix, origin, tempVec3b$d);
rtcOrigin[0] = rotatedOrigin[0];
rtcOrigin[1] = rotatedOrigin[1];
rtcOrigin[2] = rotatedOrigin[2];
Expand Down Expand Up @@ -74794,7 +74791,7 @@ class TrianglesDataTextureEdgesColorRenderer {
// get XYZ offset
src.push("vec4 offset = vec4(texelFetch (uTexturePerObjectIdOffsets, objectIndexCoords, 0).rgb, 0.0);");

// src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz;");
src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz;");

src.push(" vec4 viewPosition = viewMatrix * worldPosition; ");

Expand Down Expand Up @@ -85871,12 +85868,13 @@ class MousePickHandler {
}

const hoverSubs = cameraControl.hasSubs("hover");
const hoverEnterSubs = cameraControl.hasSubs("hoverEnter");
const hoverOutSubs = cameraControl.hasSubs("hoverOut");
const hoverOffSubs = cameraControl.hasSubs("hoverOff");
const hoverSurfaceSubs = cameraControl.hasSubs("hoverSurface");
const hoverSnapOrSurfaceSubs = cameraControl.hasSubs("hoverSnapOrSurface");

if (hoverSubs || hoverOutSubs || hoverOffSubs || hoverSurfaceSubs || hoverSnapOrSurfaceSubs) {
if (hoverSubs || hoverEnterSubs || hoverOutSubs || hoverOffSubs || hoverSurfaceSubs || hoverSnapOrSurfaceSubs) {

pickController.pickCursorPos = states.pointerCanvasPos;
pickController.schedulePickEntity = true;
Expand Down
26 changes: 12 additions & 14 deletions dist/xeokit-sdk.es.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73271,9 +73271,9 @@ class TrianglesDataTextureColorRenderer {

src.push("uniform int renderPass;");

if (scene.entityOffsetsEnabled) {
src.push("in vec3 offset;");
}
// if (scene.entityOffsetsEnabled) {
// src.push("in vec3 offset;");
// }

src.push("uniform mat4 sceneModelWorldMatrix;");
src.push("uniform mat4 viewMatrix;");
Expand Down Expand Up @@ -74039,7 +74039,6 @@ const defaultColor = new Float32Array([0, 0, 0, 1]);

const tempVec3a$i = math.vec3();
const tempVec3b$e = math.vec3();
math.vec3();
const tempVec3d$8 = math.vec3();
const tempMat4a$9 = math.mat4();

Expand Down Expand Up @@ -74102,8 +74101,7 @@ class TrianglesDataTextureEdgesRenderer {
if (gotOrigin || gotPosition) {
const rtcOrigin = tempVec3a$i;
if (gotOrigin) {
const rotatedOrigin = tempVec3b$e;
math.transformPoint3(rotationMatrix, origin, rotatedOrigin);
const rotatedOrigin = math.transformPoint3(rotationMatrix, origin, tempVec3b$e);
rtcOrigin[0] = rotatedOrigin[0];
rtcOrigin[1] = rotatedOrigin[1];
rtcOrigin[2] = rotatedOrigin[2];
Expand Down Expand Up @@ -74285,9 +74283,9 @@ class TrianglesDataTextureEdgesRenderer {

src.push("uniform int renderPass;");

if (scene.entityOffsetsEnabled) {
src.push("in vec3 offset;");
}
// if (scene.entityOffsetsEnabled) {
// src.push("in vec3 offset;");
// }

src.push("uniform mat4 sceneModelWorldMatrix;");
src.push("uniform mat4 viewMatrix;");
Expand Down Expand Up @@ -74372,7 +74370,7 @@ class TrianglesDataTextureEdgesRenderer {
// get XYZ offset
src.push("vec4 offset = vec4(texelFetch (uTexturePerObjectIdOffsets, objectIndexCoords, 0).rgb, 0.0);");

src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz;");
src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz + vec3(110.0,50.0, 10.0);");

src.push(" vec4 viewPosition = viewMatrix * worldPosition; ");

Expand Down Expand Up @@ -74522,8 +74520,7 @@ class TrianglesDataTextureEdgesColorRenderer {
if (gotOrigin || gotPosition) {
const rtcOrigin = tempVec3a$h;
if (gotOrigin) {
const rotatedOrigin = tempVec3b$d;
math.transformPoint3(rotationMatrix, origin, rotatedOrigin);
const rotatedOrigin = math.transformPoint3(rotationMatrix, origin, tempVec3b$d);
rtcOrigin[0] = rotatedOrigin[0];
rtcOrigin[1] = rotatedOrigin[1];
rtcOrigin[2] = rotatedOrigin[2];
Expand Down Expand Up @@ -74790,7 +74787,7 @@ class TrianglesDataTextureEdgesColorRenderer {
// get XYZ offset
src.push("vec4 offset = vec4(texelFetch (uTexturePerObjectIdOffsets, objectIndexCoords, 0).rgb, 0.0);");

// src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz;");
src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz;");

src.push(" vec4 viewPosition = viewMatrix * worldPosition; ");

Expand Down Expand Up @@ -85867,12 +85864,13 @@ class MousePickHandler {
}

const hoverSubs = cameraControl.hasSubs("hover");
const hoverEnterSubs = cameraControl.hasSubs("hoverEnter");
const hoverOutSubs = cameraControl.hasSubs("hoverOut");
const hoverOffSubs = cameraControl.hasSubs("hoverOff");
const hoverSurfaceSubs = cameraControl.hasSubs("hoverSurface");
const hoverSnapOrSurfaceSubs = cameraControl.hasSubs("hoverSnapOrSurface");

if (hoverSubs || hoverOutSubs || hoverOffSubs || hoverSurfaceSubs || hoverSnapOrSurfaceSubs) {
if (hoverSubs || hoverEnterSubs || hoverOutSubs || hoverOffSubs || hoverSurfaceSubs || hoverSnapOrSurfaceSubs) {

pickController.pickCursorPos = states.pointerCanvasPos;
pickController.schedulePickEntity = true;
Expand Down
Loading

0 comments on commit 2eb83f4

Please sign in to comment.