删除碰撞体菜单。

This commit is contained in:
liteng 2019-01-03 21:07:27 +08:00
parent 474b0d00cd
commit 0aa2b6dd00
10 changed files with 321 additions and 197 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -107,6 +107,12 @@ Created by iconfont
<glyph glyph-name="js" unicode="&#58952;" d="M444.713 831.336H272.179v-552.663c0-136.749-38.89-174.932-106.571-174.932-31.713 0-60.273 6.553-82.491 15.766L65.135-42.282c31.703-13.163 80.352-21.054 118.419-21.054 155.382 0 261.158 88.087 261.158 340.648V831.336h0.001z m308.965-0.863c-162.918 0-266.042-111.621-266.042-259.152 0-127.056 79.418-206.607 194.888-257.914 83.517-35.917 116.531-68.012 116.531-120.6 0-57.732-38.16-94.95-110.337-94.95-67.03 0-127.878 27-169.123 53.93v0.05L487.636-8.55c39.212-26.985 112.423-53.921 191.786-53.921 190.78 0.007 279.443 123.175 279.443 268.145 0 123.168-56.71 202.701-179.398 259.18-90.752 43.609-128.891 67.975-128.891 123.147 0 43.633 33.002 83.384 101.064 83.384 66.991 0 113.064-27.166 139.91-43.862l40.229 162.359c-42.076 22.275-98.738 40.591-178.101 40.591z" horiz-adv-x="1024" />
<glyph glyph-name="minus" unicode="&#59122;" d="M960 304H64V464h896v-160z" horiz-adv-x="1024" />
<glyph glyph-name="plus" unicode="&#59121;" d="M960 304H592v-368H432V304H64V464h368V832h160v-368h368v-160z" horiz-adv-x="1024" />
<glyph glyph-name="export" unicode="&#58967;" d="M1024.243844 582.708768c0-31.748536-25.652427-40.819546-312.94985-254.085822-40.819546-30.334238-42.672763 0-42.672762 0V469.80883c-251.842454 3.413821-315.193218-116.069915-398.295376-268.228795-25.652427 241.405915 57.93742 496.418345 398.246607 494.07744V850.937563c-0.243844-0.243844 8.680859 32.821451 37.6008 9.266085 294.466448-240.479307 319.045959-255.256275 318.070581-277.49488zM340.894413 653.179788H219.898843c-71.982855 0-91.685479-22.48245-91.685479-91.002715v-424.679335c0-77.249893 27.554413-91.002715 91.685479-91.002715h427.946849c71.007477 0 91.734248 20.580464 91.734248 91.002715V201.04357800000002c0 18.385865 21.16569 57.010811 64.131066 57.010811 44.233367 0 64.033529-38.820022 64.033529-57.157118v-181.176358c0-55.255132-45.550126-100.463876-101.244178-100.463876H101.244178A101.14664 101.14664 0 0 0 0 19.720912999999996V679.905129c0 55.255132 45.550126 100.463876 101.244178 100.463876H341.382102c28.627328 0 56.913273-28.578559 56.913274-56.474353 0-60.668476-29.84655-70.714864-57.400963-70.714864z" horiz-adv-x="1024" />

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

View File

@ -713,6 +713,12 @@ table.Table .TableBody td {
margin-top: 0;
}
/* .sidebar .Row:nth-child(1)::before {
font-family: "iconfont" !important;
content: '\e6f1';
vertical-align: center;
} */
.sidebar label {
width: 60px;
cursor: default;

View File

@ -30,126 +30,123 @@ TransformComponent.prototype.render = function () {
children: [{
xtype: 'row',
children: [{
xtype: 'row',
children: [{
xtype: 'label',
style: {
color: '#555',
fontWeight: 'bold'
},
text: '位移组件'
}]
xtype: 'label',
style: {
color: '#555',
fontWeight: 'bold'
},
text: '位移组件'
}]
}, {
xtype: 'row',
children: [{
xtype: 'label',
text: '平移'
}, {
xtype: 'row',
children: [{
xtype: 'label',
text: '平移'
}, {
xtype: 'number',
id: 'objectPositionX',
scope: this.id,
style: {
width: '40px'
},
onChange: this.onChangePosition.bind(this)
}, {
xtype: 'number',
id: 'objectPositionY',
scope: this.id,
style: {
width: '40px'
},
onChange: this.onChangePosition.bind(this)
}, {
xtype: 'number',
id: 'objectPositionZ',
scope: this.id,
style: {
width: '40px'
},
onChange: this.onChangePosition.bind(this)
}]
xtype: 'number',
id: 'objectPositionX',
scope: this.id,
style: {
width: '40px'
},
onChange: this.onChangePosition.bind(this)
}, {
xtype: 'row',
children: [{
xtype: 'label',
text: '旋转'
}, {
xtype: 'number',
id: 'objectRotationX',
scope: this.id,
step: 10,
unit: '°',
style: {
width: '40px'
},
onChange: this.onChangeRotation.bind(this)
}, {
xtype: 'number',
id: 'objectRotationY',
scope: this.id,
step: 10,
unit: '°',
style: {
width: '40px'
},
onChange: this.onChangeRotation.bind(this)
}, {
xtype: 'number',
id: 'objectRotationZ',
scope: this.id,
step: 10,
unit: '°',
style: {
width: '40px'
},
onChange: this.onChangeRotation.bind(this)
}]
xtype: 'number',
id: 'objectPositionY',
scope: this.id,
style: {
width: '40px'
},
onChange: this.onChangePosition.bind(this)
}, {
xtype: 'row',
children: [{
xtype: 'label',
text: '缩放'
}, {
xtype: 'checkbox',
id: 'objectScaleLock',
scope: this.id,
value: true,
style: {
position: 'absolute',
left: '50px'
}
}, {
xtype: 'number',
id: 'objectScaleX',
scope: this.id,
value: 1,
range: [0.01, Infinity],
style: {
width: '40px'
},
onChange: this.onChangeScale.bind(this)
}, {
xtype: 'number',
id: 'objectScaleY',
scope: this.id,
value: 1,
range: [0.01, Infinity],
style: {
width: '40px'
},
onChange: this.onChangeScale.bind(this)
}, {
xtype: 'number',
id: 'objectScaleZ',
scope: this.id,
value: 1,
range: [0.01, Infinity],
style: {
width: '40px'
},
onChange: this.onChangeScale.bind(this)
}]
xtype: 'number',
id: 'objectPositionZ',
scope: this.id,
style: {
width: '40px'
},
onChange: this.onChangePosition.bind(this)
}]
}, {
xtype: 'row',
children: [{
xtype: 'label',
text: '旋转'
}, {
xtype: 'number',
id: 'objectRotationX',
scope: this.id,
step: 10,
unit: '°',
style: {
width: '40px'
},
onChange: this.onChangeRotation.bind(this)
}, {
xtype: 'number',
id: 'objectRotationY',
scope: this.id,
step: 10,
unit: '°',
style: {
width: '40px'
},
onChange: this.onChangeRotation.bind(this)
}, {
xtype: 'number',
id: 'objectRotationZ',
scope: this.id,
step: 10,
unit: '°',
style: {
width: '40px'
},
onChange: this.onChangeRotation.bind(this)
}]
}, {
xtype: 'row',
children: [{
xtype: 'label',
text: '缩放'
}, {
xtype: 'checkbox',
id: 'objectScaleLock',
scope: this.id,
value: true,
style: {
position: 'absolute',
left: '50px'
}
}, {
xtype: 'number',
id: 'objectScaleX',
scope: this.id,
value: 1,
range: [0.01, Infinity],
style: {
width: '40px'
},
onChange: this.onChangeScale.bind(this)
}, {
xtype: 'number',
id: 'objectScaleY',
scope: this.id,
value: 1,
range: [0.01, Infinity],
style: {
width: '40px'
},
onChange: this.onChangeScale.bind(this)
}, {
xtype: 'number',
id: 'objectScaleZ',
scope: this.id,
value: 1,
range: [0.01, Infinity],
style: {
width: '40px'
},
onChange: this.onChangeScale.bind(this)
}]
}]
};

View File

@ -70,11 +70,6 @@ ComponentMenu.prototype.render = function () {
onClick: this.onAddCloth.bind(this)
}, {
xtype: 'hr'
}, {
xtype: 'div',
html: '碰撞体',
cls: 'option',
onClick: this.addCollision.bind(this)
}, {
xtype: 'div',
html: '刚体',
@ -173,12 +168,6 @@ ComponentMenu.prototype.onAddCloth = function () {
editor.execute(new AddObjectCommand(cloth));
};
// -------------------------- 添加碰撞体 -----------------------------------
ComponentMenu.prototype.addCollision = function () {
UI.msg('添加碰撞体成功!');
};
// --------------------------- 添加刚体 ------------------------------------
ComponentMenu.prototype.addRigidBody = function () {