archive-gh-me/openglobus
1
0
Fork 0
mirror of https://github.com/openglobus/openglobus.git synced 2025-12-08 19:25:27 +00:00
Code Issues Projects Releases Wiki Activity

938 fixed

Browse Source
This commit is contained in:
mige 2025-10-15 12:37:36 +04:00
parent fb9f01fc58
commit b43f70b4ab
3 changed files with 83 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
sandbox/nestedEntities/nestedEntities.js
View File

@ -12,104 +12,100 @@ import {
let renderer = new Renderer("frame", {
msaa: 8,
controls: [new control.SimpleNavigation({ speed: 0.01 })],
controls: [
new control.SimpleNavigation({speed: 0.01}),
// new control.GeoObjectEditor()
],
autoActivate: true
});
window.renderer = renderer;
class MyScene extends RenderNode {
constructor() {
super("MyScene");
}
init() {
const baseObj = Object3d.createCube(10, 10, 10).translate(new Vec3(0, 0, 0)).setMaterial({
ambient: "#c2c2c2",
diffuse: "#ffffff",
shininess: 1
});
window.test = () => {
parentEntity.setPitch(0);
cube2.setPitch(0);
cube3.setPitch(0);
const baseObj = Object3d
.createCube(0.4, 2, 0.4)
.translate(new Vec3(0, 1, 0))
.setMaterial({
ambient: "#882a2a",
diffuse: "#fb3434",
shininess: 1
});
parentEntity.setYaw(0);
cube2.setYaw(0);
cube3.setYaw(0);
const frustumObj = Object3d
.createFrustum(3, 2, 1)
.setMaterial({
ambient: "#236028",
diffuse: "#1cdd23",
shininess: 1
});
this.renderer.activeCamera.set(new Vec3(10.5, 0, 0), new Vec3(0, 0, 0), new Vec3(0, 1, 0));
}
const cylinderObj = Object3d
.createCylinder(1, 0, 3)
.applyMat4(new Mat4().setRotation(new Vec3(1, 0, 0), 90 * Math.PI / 180))
.setMaterial({
ambient: "#773381",
diffuse: "#ef00ff",
shininess: 1
});
let parentEntity = new Entity({
cartesian: new Vec3(0, 0, 0),
cartesian: new Vec3(1, 1, 1),
independentPicking: true,
//yaw: 45 * Math.PI / 180,
//pitch: 45 * Math.PI / 180,
geoObject: {
color: "rgb(90,90,90)",
scale: 1,
instanced: true,
tag: `baseObj`,
object3d: baseObj
object3d: baseObj,
}
});
let cube2 = new Entity({
cartesian: new Vec3(45, 0, 5),
let childEntity = new Entity({
cartesian: new Vec3(0, 1, 0),
independentPicking: true,
//yaw: 45 * Math.PI / 180,
//pitch: 45 * Math.PI / 180,
relativePosition: true,
geoObject: {
color: "rgb(90,90,90)",
scale: 1,
instanced: true,
tag: `baseObj`,
object3d: baseObj
tag: `frustumObj`,
object3d: frustumObj,
}
});
let cube3 = new Entity({
cartesian: new Vec3(-1, 3, 1),
let childChildEntity = new Entity({
cartesian: new Vec3(0, 3, -1),
independentPicking: true,
//yaw: 45 * Math.PI / 180,
pitch: 45 * Math.PI / 180,
relativePosition: true,
geoObject: {
color: "rgb(90,90,90)",
scale: 1,
instanced: true,
tag: `baseObj`,
object3d: baseObj
tag: `cylinderObj`,
object3d: cylinderObj,
}
});
childEntity.appendChild(childChildEntity);
parentEntity.appendChild(childEntity);
let collection = new EntityCollection({
entities: [parentEntity, cube2]
entities: [parentEntity]
});
collection.addTo(this);
this.renderer.activeCamera.set(new Vec3(0, 100, 100), new Vec3(0, 0, 0));
window.collection = collection;
this.renderer.activeCamera.set(new Vec3(-4, 11, 13), new Vec3(1, 0, 0));
this.renderer.activeCamera.update();
this.renderer.activeCamera.isOrthographic = true;
this.renderer.getDepthMinDistanceAsync().then((dist) => {
if (!dist) {
dist = this.renderer.activeCamera.eye.length();
}
this.renderer.activeCamera.focusDistance = dist;
this.renderer.activeCamera.isOrthographic = true;
});
this.renderer.events.on("rclick", (e) => {
//let dist = this.renderer.getDistanceFromPixel(e.pos);
//let dir = this.renderer.activeCamera.unproject(e.x, e.y, dist);
//console.log(dir);
})
}
}
renderer.addNodes([new scene.Axes(), new MyScene()]);
renderer.addNodes([
new scene.Axes(),
new MyScene()
]);

48
src/entity/EntityCollection.ts
View File

@ -415,7 +415,6 @@ class EntityCollection {
for (let i = 0; i < entity.childEntities.length; i++) {
entity.childEntities[i]._entityCollection = this;
entity.childEntities[i]._entityCollectionIndex = entity._entityCollectionIndex;
this._addRecursively(entity.childEntities[i]);
}
}
@ -460,6 +459,7 @@ class EntityCollection {
}
protected _removeRecursively(entity: Entity) {
entity.parent = null;
entity._entityCollection = null;
entity._entityCollectionIndex = -1;
@ -495,33 +495,37 @@ class EntityCollection {
* @param {Entity} entity - Entity to remove.
*/
public removeEntity(entity: Entity) {
this._entities.splice(entity._entityCollectionIndex, 1);
this.reindexEntitiesArray(entity._entityCollectionIndex);
// clear picking color
if (this.renderNode && this.renderNode.renderer) {
this.renderNode.renderer.clearPickingColor(entity);
entity._pickingColor.clear();
}
if (this.belongs(entity)) {
this._removeRecursively(entity);
}
if (!entity.parent) {
this._entities.splice(entity._entityCollectionIndex, 1);
this.reindexEntitiesArray(entity._entityCollectionIndex);
}
this.events.dispatch(this.events.entityremove, entity);
// clear picking color
if (this.renderNode && this.renderNode.renderer) {
this.renderNode.renderer.clearPickingColor(entity);
entity._pickingColor.clear();
}
this._removeRecursively(entity);
this.events.dispatch(this.events.entityremove, entity);
}
}
public _removeEntitySilent(entity: Entity) {
this._entities.splice(entity._entityCollectionIndex, 1);
this.reindexEntitiesArray(entity._entityCollectionIndex);
// clear picking color
if (this.renderNode && this.renderNode.renderer) {
this.renderNode.renderer.clearPickingColor(entity);
entity._pickingColor.clear();
}
if (this.belongs(entity)) {
if (!entity.parent) {
this._entities.splice(entity._entityCollectionIndex, 1);
this.reindexEntitiesArray(entity._entityCollectionIndex);
}
// clear picking color
if (this.renderNode && this.renderNode.renderer) {
this.renderNode.renderer.clearPickingColor(entity);
entity._pickingColor.clear();
}
this._removeRecursively(entity);
}
}

7
src/entity/GeoObjectHandler.ts
View File

@ -692,7 +692,12 @@ export class GeoObjectHandler {
if (tagData.numInstances === 0) {
tagData.clear();
this._instanceDataMap.delete(tag);
this._instanceDataMapValues = [];
for (let i = 0; this._instanceDataMapValues.length; i++) {
if (this._instanceDataMapValues[i].numInstances === 0) {
this._instanceDataMapValues.splice(i, 1);
break;
}
}
this._clearDataTagQueue();
isEmpty = true;
}