archive-gh-me/ShadowEditor
1
0
Fork 0
mirror of https://github.com/tengge1/ShadowEditor.git synced 2026-02-01 16:08:17 +00:00
Code Issues Projects Releases Wiki Activity

修复无法设置环境贴图和环境贴图强度bug。

Browse Source
This commit is contained in:
tengge1 2019-11-21 21:52:08 +08:00
parent 6c343686b7
commit b4383c15a9
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -15,6 +15,7 @@ Supported Languages: 中文 / [繁體中文](README-tw.md) / [English](README-en
2. 修复模型复制多个后，保存场景后载入场景，只显示第一个的bug。
3. 机构、角色、用户、权限、系统设置、系统初始化、系统重置全部测试完成，没有任何bug。
4. 双击场景中的物体，不再跳转到这个物体的视角。
5. 修复无法设置环境贴图和环境贴图强度bug。
## v0.3.7更新

3
ShadowEditor.Web/locales/zh-CN.json
View File

@ -927,5 +927,6 @@
"Count": "数量",
"Plugins": "插件",
"The plugin is not existed.": "该插件不存在",
"Modifying admin rights is not allowed.": "不允许修改管理员权限。"
"Modifying admin rights is not allowed.": "不允许修改管理员权限。",
"EnvMapIntensity": "环境贴图强度"
}

22
ShadowEditor.Web/src/editor/component/MaterialComponent.jsx
View File

@ -145,7 +145,7 @@ class MaterialComponent extends React.Component {
showEnvMap: false,
envMap: null,
reflectivity: null,
envMapIntensity: null,
showLightMap: false,
lightMap: null,
@ -205,7 +205,7 @@ class MaterialComponent extends React.Component {
const { show, expanded, type, showProgram, showColor, color, showRoughness, roughness, showMetalness, metalness, showEmissive, emissive, showSpecular, specular, showShininess, shininess, showClearCoat, clearCoat, showClearCoatRoughness, clearCoatRoughness, showVertexColors, vertexColors, showSkinning, skinning,
showMap, map, showAlphaMap, alphaMap, showBumpMap, bumpMap, bumpScale, showNormalMap, normalMap, showDisplacementMap, displacementMap,
displacementScale, showRoughnessMap, roughnessMap, showMetalnessMap, metalnessMap, showSpecularMap, specularMap, showEnvMap, envMap,
reflectivity, showLightMap, lightMap, showAoMap, aoMap, aoScale, showEmissiveMap, emissiveMap, side, flatShading, blending, opacity, transparent,
envMapIntensity, showLightMap, lightMap, showAoMap, aoMap, aoScale, showEmissiveMap, emissiveMap, side, flatShading, blending, opacity, transparent,
alphaTest, wireframe, wireframeLinewidth } = this.state;
const { enableAuthority, authorities } = app.server;
@ -377,9 +377,9 @@ class MaterialComponent extends React.Component {
show={showEnvMap}
onChange={this.handleChange}
/>
<NumberProperty label={_t('Reflectivity')}
name={'reflectivity'}
value={reflectivity}
<NumberProperty label={_t('EnvMapIntensity')}
name={'envMapIntensity'}
value={envMapIntensity}
show={showEnvMap}
onChange={this.handleChange}
/>
@ -474,7 +474,7 @@ class MaterialComponent extends React.Component {
return;
}
if(Array.isArray(editor.selected.material)) { // 多材质模型，由多材质组件选择。
if (Array.isArray(editor.selected.material)) { // 多材质模型，由多材质组件选择。
return;
}
@ -622,8 +622,8 @@ class MaterialComponent extends React.Component {
state.showEnvMap = true;
state.envMap = material.envMap;
if (material.reflectivity !== undefined) {
state.reflectivity = material.reflectivity;
if (material.envMapIntensity !== undefined) {
state.envMapIntensity = material.envMapIntensity;
}
} else {
state.showEnvMap = false;
@ -700,7 +700,7 @@ class MaterialComponent extends React.Component {
let material = object.material;
const { type, color, roughness, metalness, emissive, specular, shininess, clearCoat, clearCoatRoughness, vertexColors, skinning, map, alphaMap,
bumpMap, bumpScale, normalMap, displacementMap, displacementScale, roughnessMap, metalnessMap, specularMap, envMap, reflectivity, lightMap,
bumpMap, bumpScale, normalMap, displacementMap, displacementScale, roughnessMap, metalnessMap, specularMap, envMap, envMapIntensity, lightMap,
aoMap, aoScale, emissiveMap, side, flatShading, blending, opacity, transparent, alphaTest, wireframe, wireframeLinewidth } = Object.assign({}, this.state, {
[name]: value
});
@ -834,8 +834,8 @@ class MaterialComponent extends React.Component {
}
}
if (name === 'reflectivity' && material.reflectivity !== undefined) {
editor.execute(new SetMaterialValueCommand(object, 'reflectivity', reflectivity));
if (name === 'envMapIntensity' && material.envMapIntensity !== undefined) {
editor.execute(new SetMaterialValueCommand(object, 'envMapIntensity', envMapIntensity));
}
if (name === 'lightMap' && material.lightMap !== undefined) {