Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:02:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed Compound Collision type

Browse source
This commit is contained in:
utkarshgautamnyu 2017-07-26 10:20:17 -07:00
parent 24f4468fd5
commit 71ddf1e7c1
4 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/resources/qml/AssetServer.qml
View file

@ -153,8 +153,6 @@ ScrollingWindow {
var SHAPE_TYPE_STATIC_MESH = 3; var SHAPE_TYPE_STATIC_MESH = 3;
var SHAPE_TYPE_BOX = 4; var SHAPE_TYPE_BOX = 4;
var SHAPE_TYPE_SPHERE = 5; var SHAPE_TYPE_SPHERE = 5;
var SHAPE_TYPE_COMPOUND = 6;
var SHAPE_TYPES = []; var SHAPE_TYPES = [];
SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision"; SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
@ -163,8 +161,6 @@ ScrollingWindow {
SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons"; SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box"; SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere"; SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
SHAPE_TYPES[SHAPE_TYPE_COMPOUND] = "Compound";
var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH; var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
var DYNAMIC_DEFAULT = false; var DYNAMIC_DEFAULT = false;
@ -210,9 +206,6 @@ ScrollingWindow {
case SHAPE_TYPE_SPHERE: case SHAPE_TYPE_SPHERE:
shapeType = "sphere"; shapeType = "sphere";
break; break;
case SHAPE_TYPE_COMPOUND:
shapeType = "compound";
break;
default: default:
shapeType = "none"; shapeType = "none";
} }

6
interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
View file

@ -154,8 +154,6 @@ Rectangle {
var SHAPE_TYPE_STATIC_MESH = 3; var SHAPE_TYPE_STATIC_MESH = 3;
var SHAPE_TYPE_BOX = 4; var SHAPE_TYPE_BOX = 4;
var SHAPE_TYPE_SPHERE = 5; var SHAPE_TYPE_SPHERE = 5;
var SHAPE_TYPE_COMPOUND = 6;
var SHAPE_TYPES = []; var SHAPE_TYPES = [];
SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision"; SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
@ -164,7 +162,6 @@ Rectangle {
SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons"; SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box"; SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere"; SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
SHAPE_TYPES[SHAPE_TYPE_COMPOUND] = "Compound";
var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH; var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
var DYNAMIC_DEFAULT = false; var DYNAMIC_DEFAULT = false;
@ -210,9 +207,6 @@ Rectangle {
case SHAPE_TYPE_SPHERE: case SHAPE_TYPE_SPHERE:
shapeType = "sphere"; shapeType = "sphere";
break; break;
case SHAPE_TYPE_COMPOUND:
shapeType = "compound";
break;
default: default:
shapeType = "none"; shapeType = "none";
} }

3
interface/resources/qml/hifi/tablet/NewModelDialog.qml
View file

@ -147,8 +147,7 @@ Rectangle {
"Good - Sub-meshes", "Good - Sub-meshes",
"Exact - All polygons", "Exact - All polygons",
"Box", "Box",
"Sphere", "Sphere"]
"Compound"]
} }
Row { Row {

5
scripts/system/edit.js
View file

@ -339,7 +339,6 @@ var toolBar = (function () {
var SHAPE_TYPE_STATIC_MESH = 3; var SHAPE_TYPE_STATIC_MESH = 3;
var SHAPE_TYPE_BOX = 4; var SHAPE_TYPE_BOX = 4;
var SHAPE_TYPE_SPHERE = 5; var SHAPE_TYPE_SPHERE = 5;
var SHAPE_TYPE_COMPOUND = 6;
var DYNAMIC_DEFAULT = false; var DYNAMIC_DEFAULT = false;
function handleNewModelDialogResult(result) { function handleNewModelDialogResult(result) {
@ -362,9 +361,6 @@ var toolBar = (function () {
case SHAPE_TYPE_SPHERE: case SHAPE_TYPE_SPHERE:
shapeType = "sphere"; shapeType = "sphere";
break; break;
case SHAPE_TYPE_COMPOUND:
shapeType = "compound";
break;
default: default:
shapeType = "none"; shapeType = "none";
} }
@ -464,7 +460,6 @@ var toolBar = (function () {
SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons"; SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box"; SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere"; SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
SHAPE_TYPES[SHAPE_TYPE_COMPOUND] = "Compound";
var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH; var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
// tablet version of new-model dialog // tablet version of new-model dialog