Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 14:18:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add "Static Mesh" option to edit.js

Browse source
This commit is contained in:
Andrew Meadows 2016-06-14 14:59:52 -07:00
parent a519b77ae7
commit f41fb30ace
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libraries/entities/src/EntityItemProperties.cpp
View file

@ -88,8 +88,21 @@ void EntityItemProperties::setLastEdited(quint64 usecTime) {
_lastEdited = usecTime > _created ? usecTime : _created; _lastEdited = usecTime > _created ? usecTime : _created;
} }
const char* shapeTypeNames[] = {"none", "box", "sphere", "plane", "compound", "capsule-x", const char* shapeTypeNames[] = {
"capsule-y", "capsule-z", "cylinder-x", "cylinder-y", "cylinder-z"}; "none",
"box",
"sphere",
"capsule-x",
"capsule-y",
"capsule-z",
"cylinder-x",
"cylinder-y",
"cylinder-z",
"hull",
"plane",
"compound",
"static-mesh"
};
QHash<QString, ShapeType> stringToShapeTypeLookup; QHash<QString, ShapeType> stringToShapeTypeLookup;
@ -101,14 +114,16 @@ void buildStringToShapeTypeLookup() {
addShapeType(SHAPE_TYPE_NONE); addShapeType(SHAPE_TYPE_NONE);
addShapeType(SHAPE_TYPE_BOX); addShapeType(SHAPE_TYPE_BOX);
addShapeType(SHAPE_TYPE_SPHERE); addShapeType(SHAPE_TYPE_SPHERE);
addShapeType(SHAPE_TYPE_PLANE);
addShapeType(SHAPE_TYPE_COMPOUND);
addShapeType(SHAPE_TYPE_CAPSULE_X); addShapeType(SHAPE_TYPE_CAPSULE_X);
addShapeType(SHAPE_TYPE_CAPSULE_Y); addShapeType(SHAPE_TYPE_CAPSULE_Y);
addShapeType(SHAPE_TYPE_CAPSULE_Z); addShapeType(SHAPE_TYPE_CAPSULE_Z);
addShapeType(SHAPE_TYPE_CYLINDER_X); addShapeType(SHAPE_TYPE_CYLINDER_X);
addShapeType(SHAPE_TYPE_CYLINDER_Y); addShapeType(SHAPE_TYPE_CYLINDER_Y);
addShapeType(SHAPE_TYPE_CYLINDER_Z); addShapeType(SHAPE_TYPE_CYLINDER_Z);
addShapeType(SHAPE_TYPE_HULL);
addShapeType(SHAPE_TYPE_PLANE);
addShapeType(SHAPE_TYPE_COMPOUND);
addShapeType(SHAPE_TYPE_MESH);
} }
QString getCollisionGroupAsString(uint8_t group) { QString getCollisionGroupAsString(uint8_t group) {

1
scripts/system/html/entityProperties.html
View file

@ -1646,6 +1646,7 @@
<option value="box">Box</option> <option value="box">Box</option>
<option value="sphere">Sphere</option> <option value="sphere">Sphere</option>
<option value="compound">Compound</option> <option value="compound">Compound</option>
<option value="static-mesh">Static Mesh</option>
</select> </select>
</div> </div>
<div class="model-group model-section zone-section property url "> <div class="model-group model-section zone-section property url ">