Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-08 17:44:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

grid pattern

Browse source
This commit is contained in:
Thijs Wenker 2019-01-23 19:28:34 +01:00
parent 93516423bb
commit b2f1657096
2 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
scripts/system/assets/images/materials/boxgridpatterncreatezonew.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.4 KiB

49
scripts/system/modules/entityShapeVisualizer.js
View file

@ -11,7 +11,6 @@
//
var SHAPETYPE_TO_SHAPE = {
"sphere": "Sphere",
"box": "Cube",
"ellipsoid": "Sphere",
"cylinder-y": "Cylinder",
@ -23,13 +22,23 @@ function getEntityShapePropertiesForType(properties) {
if (SHAPETYPE_TO_SHAPE[properties.shapeType]) {
return {
type: "Shape",
shape: SHAPETYPE_TO_SHAPE[properties.shapeType]
}
shape: SHAPETYPE_TO_SHAPE[properties.shapeType],
localDimensions: properties.localDimensions
};
} else if (properties.shapeType === "compound") {
return {
type: "Model",
modelURL: properties.compoundShapeURL
}
modelURL: properties.compoundShapeURL,
localDimensions: properties.localDimensions
};
} else if (properties.shapeType === "sphere") {
var sphereDiameter = Math.max(properties.localDimensions.x, properties.localDimensions.y,
properties.localDimensions.z);
return {
type: "Sphere",
modelURL: properties.compoundShapeURL,
localDimensions: {x: sphereDiameter, y: sphereDiameter, z: sphereDiameter}
};
}
break;
}
@ -37,8 +46,9 @@ function getEntityShapePropertiesForType(properties) {
// Default properties
return {
type: "Shape",
shape: "Cube"
}
shape: "Cube",
localDimensions: properties.localDimensions
};
}
function getStringifiedEntityShapePropertiesForType(properties) {
@ -65,17 +75,11 @@ EntityShape.prototype = {
overlayProperties.localPosition = Vec3.ZERO;
overlayProperties.localRotation = Quat.IDENTITY;
overlayProperties.localDimensions = properties.localDimensions;
overlayProperties.canCastShadows = false;
overlayProperties.parentID = this.entityID;
overlayProperties.collisionless = true;
this.entity = Entities.addEntity(overlayProperties, "local");
console.warn("created " + this.entity);
console.warn("SHAPETYPE = " + properties.shapeType);
console.warn("SHAPE = " + Entities.getEntityProperties(this.entity, "shape").shape);
var PROJECTED_MATERIALS = false;
this.materialEntity = Entities.addEntity({
type: "Material",
localPosition: Vec3.ZERO,
@ -83,39 +87,31 @@ EntityShape.prototype = {
localDimensions: properties.localDimensions,
parentID: this.entity,
priority: 1,
materialMappingMode: PROJECTED_MATERIALS ? "projected" : "uv",
materialURL: "materialData",
materialData: JSON.stringify({
materialVersion: 1,
materials: {
albedo: [0.0, 0.0, 7.0],
unlit: true,
opacity: 0.4
opacity: 0.4,
albedoMap: Script.resolvePath("../assets/images/materials/boxgridpatterncreatezonew.png")
}
}),
}, "local");
},
update: function() {
var properties = Entities.getEntityProperties(this.entityID, REQUESTED_ENTITY_SHAPE_PROPERTIES);
var propertiesForTypeStringified = getStringifiedEntityShapePropertiesForType(properties);
if (propertiesForTypeStringified !== this.previousPropertiesForTypeStringified) {
this.previousPropertiesForTypeStringified = propertiesForTypeStringified;
console.warn("Clearing old properties");
this.clear();
this.initialize(properties, propertiesForTypeStringified);
} else {
Entities.editEntity(this.entity, {
localDimensions: properties.localDimensions,
localDimensions: JSON.parse(propertiesForTypeStringified).localDimensions,
});
}
//this.previousProperties = Entities.getEntityProperties(this.entityID, REQUESTED_ENTITY_SHAPE_PROPERTIES);
console.warn(JSON.stringify(this.previousProperties));
},
clear: function() {
Entities.deleteEntity(this.materialEntity);
@ -192,7 +188,6 @@ EntityShapeVisualizer.prototype = {
});
deleteEntries.forEach(function(entityID) {
console.warn("removing " + entityID);
this.removeEntity(entityID);
}, this);