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

enable shapeType=ellipsoid and expose zone shapeType to UI

Browse source
This commit is contained in:
Andrew Meadows 2018-11-27 08:44:40 -08:00
parent a656ea723e
commit a642af23b7
5 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,6 +117,7 @@ void buildStringToShapeTypeLookup() {
addShapeType(SHAPE_TYPE_SIMPLE_HULL); addShapeType(SHAPE_TYPE_SIMPLE_HULL);
addShapeType(SHAPE_TYPE_SIMPLE_COMPOUND); addShapeType(SHAPE_TYPE_SIMPLE_COMPOUND);
addShapeType(SHAPE_TYPE_STATIC_MESH); addShapeType(SHAPE_TYPE_STATIC_MESH);
addShapeType(SHAPE_TYPE_ELLIPSOID);
} }
QHash<QString, MaterialMappingMode> stringToMaterialMappingModeLookup; QHash<QString, MaterialMappingMode> stringToMaterialMappingModeLookup;

1
libraries/entities/src/ZoneEntityItem.cpp
View file

@ -278,7 +278,6 @@ void ZoneEntityItem::debugDump() const {
} }
void ZoneEntityItem::setShapeType(ShapeType type) { void ZoneEntityItem::setShapeType(ShapeType type) {
//ShapeType typeArgument = type;
ShapeType oldShapeType = _shapeType; ShapeType oldShapeType = _shapeType;
switch(type) { switch(type) {
case SHAPE_TYPE_NONE: case SHAPE_TYPE_NONE:

3
libraries/shared/src/ShapeInfo.cpp
View file

@ -58,7 +58,8 @@ const char* shapeTypeNames[] = {
"compound", "compound",
"simple-hull", "simple-hull",
"simple-compound", "simple-compound",
"static-mesh" "static-mesh",
"ellipsoid"
}; };
static const size_t SHAPETYPE_NAME_COUNT = (sizeof(shapeTypeNames) / sizeof((shapeTypeNames)[0])); static const size_t SHAPETYPE_NAME_COUNT = (sizeof(shapeTypeNames) / sizeof((shapeTypeNames)[0]));

1
scripts/system/edit.js
View file

@ -372,6 +372,7 @@ const DEFAULT_ENTITY_PROPERTIES = {
blue: 179 blue: 179
}, },
}, },
shapeType: "box",
bloomMode: "inherit" bloomMode: "inherit"
}, },
Model: { Model: {

20
scripts/system/html/js/entityProperties.js
View file

@ -1288,6 +1288,24 @@ const GROUPS = [
}, },
] ]
}, },
{
id: "zone_shape",
label: "ZONE SHAPE",
properties: [
{
label: "Shape Type",
type: "dropdown",
options: { "box": "Box", "sphere": "Sphere", "ellipsoid": "Ellipsoid",
"cylinder-y": "Cylinder", "compound": "Use Compound Shape URL" },
propertyID: "shapeType",
},
{
label: "Compound Shape URL",
type: "string",
propertyID: "compoundShapeURL",
},
]
},
{ {
id: "physics", id: "physics",
label: "PHYSICS", label: "PHYSICS",
@ -1384,7 +1402,7 @@ const GROUPS_PER_TYPE = {
None: [ 'base', 'spatial', 'behavior', 'collision', 'physics' ], None: [ 'base', 'spatial', 'behavior', 'collision', 'physics' ],
Shape: [ 'base', 'shape', 'spatial', 'behavior', 'collision', 'physics' ], Shape: [ 'base', 'shape', 'spatial', 'behavior', 'collision', 'physics' ],
Text: [ 'base', 'text', 'spatial', 'behavior', 'collision', 'physics' ], Text: [ 'base', 'text', 'spatial', 'behavior', 'collision', 'physics' ],
Zone: [ 'base', 'zone', 'spatial', 'behavior', 'collision', 'physics' ], Zone: [ 'base', 'zone', 'spatial', 'behavior', 'zone_shape', 'physics' ],
Model: [ 'base', 'model', 'spatial', 'behavior', 'collision', 'physics' ], Model: [ 'base', 'model', 'spatial', 'behavior', 'collision', 'physics' ],
Image: [ 'base', 'image', 'spatial', 'behavior', 'collision', 'physics' ], Image: [ 'base', 'image', 'spatial', 'behavior', 'collision', 'physics' ],
Web: [ 'base', 'web', 'spatial', 'behavior', 'collision', 'physics' ], Web: [ 'base', 'web', 'spatial', 'behavior', 'collision', 'physics' ],