Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/bcf opacity #345

Merged
merged 5 commits into from
Jun 10, 2020
Merged

Feature/bcf opacity #345

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b2d070
Fix BCF clipping planes realWorldOffset
Amoki Jun 9, 2020
bcf5062
Merge pull request #1 from Amoki/patch-5
Amoki Jun 10, 2020
33ff788
Merge pull request #2 from Amoki/feature/getviewpoint-coloring
Amoki Jun 10, 2020
bd65e69
Merge branch 'master' of github.com:Amoki/xeokit-sdk
Amoki Jun 10, 2020
7b9440f
[BCF] implement objects opacity
Amoki Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 42 additions & 23 deletions src/plugins/BCFViewpointsPlugin/BCFViewpointsPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@ class BCFViewpointsPlugin extends Plugin {
let bcfViewpoint = {};

// Camera

let lookDirection = math.normalizeVec3(math.subVec3(camera.look, camera.eye, math.vec3()));
let eye = camera.eye;
let up = camera.up;
Expand Down Expand Up @@ -351,8 +350,9 @@ class BCFViewpointsPlugin extends Plugin {
location = YToZ(location);
direction = YToZ(direction);
}
math.addVec3(location, realWorldOffset);

location = xyzArrayToObject(sectionPlane.pos);
location = xyzArrayToObject(location);
direction = xyzArrayToObject(direction);
bcfViewpoint.clipping_planes.push({location, direction});
}
Expand All @@ -370,32 +370,50 @@ class BCFViewpointsPlugin extends Plugin {
}
};

const objectIds = scene.objectIds;
const visibleObjects = scene.visibleObjects;
const visibleObjectIds = scene.visibleObjectIds;
const invisibleObjectIds = objectIds.filter(id => !visibleObjects[id]);
const selectedObjectIds = scene.selectedObjectIds;
const opacityObjectIds = new Set(scene.opacityObjectIds);
const xrayedObjectIds = new Set(scene.xrayedObjectIds);
const colorizedObjectIds = new Set(scene.colorizedObjectIds);

const coloring = Object.values(scene.objects)
.filter(object => opacityObjectIds.has(object.id) || colorizedObjectIds.has(object.id) || xrayedObjectIds.has(object.id))
.reduce((coloring, object) => {
let color = colorizeToRGB(object.colorize);
let alpha;

if (object.xrayed) {
if (scene.xrayMaterial.fillAlpha === 0.0 && scene.xrayMaterial.edgeAlpha !== 0.0) {
// BCF can't deal with edges. If xRay is implemented only with edges, set an arbitrary opacity
alpha = 0.1;
} else {
alpha = scene.xrayMaterial.fillAlpha;
}
alpha = Math.round(alpha * 255).toString(16).padStart(2, "0");
color = alpha + color;
} else if (opacityObjectIds.has(object.id)) {
alpha = Math.round(object.opacity * 255).toString(16).padStart(2, "0");
color = alpha + color;
}

const coloring = Object.values(scene.colorizedObjects).reduce((coloring, object) => {
let color = colorizeToRGB(object.colorize);
if (object.opacity !== 1) {
const alpha = Math.round(object.opacity * 255).toString(16).padStart(2, "0");
color = alpha + color;
}
if (!coloring[color]) {
coloring[color] = [];
}
coloring[color].push({
ifc_guid: object.id,
originating_system: this.originatingSystem
});
return coloring;
}, {});
if (!coloring[color]) {
coloring[color] = [];
}
coloring[color].push({
ifc_guid: object.id,
originating_system: this.originatingSystem
});
return coloring;
}, {});

const coloringArray = Object.entries(coloring).map(([color, components]) => { return { color, components } });

bcfViewpoint.components.coloring = coloringArray;

const objectIds = scene.objectIds;
const visibleObjects = scene.visibleObjects;
const visibleObjectIds = scene.visibleObjectIds;
const invisibleObjectIds = objectIds.filter(id => !visibleObjects[id]);
const selectedObjectIds = scene.selectedObjectIds;

if (options.defaultInvisible || visibleObjectIds.length < invisibleObjectIds.length) {
bcfViewpoint.components.visibility.exceptions = visibleObjectIds.map(el => this._objectIdToComponent(el));
bcfViewpoint.components.visibility.default_visibility = false;
Expand Down Expand Up @@ -469,6 +487,7 @@ class BCFViewpointsPlugin extends Plugin {
if (reverseClippingPlanes) {
math.negateVec3(dir);
}
math.subVec3(pos, realWorldOffset);

if (camera.yUp) {
pos = ZToY(pos);
Expand Down Expand Up @@ -566,7 +585,7 @@ class BCFViewpointsPlugin extends Plugin {
projection = "ortho";
}

math.subVec4(eye, realWorldOffset);
math.subVec3(eye, realWorldOffset);

if (camera.yUp) {
eye = ZToY(eye);
Expand Down