Permalink
Browse files

fixed #182

  • Loading branch information...
1 parent 50e217d commit 291b5b05bfe996ab1cc72c47d30efb92e7cfae57 @keyemkey keyemkey committed Jun 30, 2013
View
4 awaybuilder-core/src/awaybuilder/model/AssetsModel.as
@@ -39,7 +39,6 @@ package awaybuilder.model
import away3d.materials.methods.CelSpecularMethod;
import away3d.materials.methods.ColorMatrixMethod;
import away3d.materials.methods.ColorTransformMethod;
- import away3d.materials.methods.DepthDiffuseMethod;
import away3d.materials.methods.DitheredShadowMapMethod;
import away3d.materials.methods.EffectMethodBase;
import away3d.materials.methods.EnvMapAmbientMethod;
@@ -447,9 +446,6 @@ package awaybuilder.model
case "BasicDiffuseMethod":
method = new BasicDiffuseMethod();
break;
- case "DepthDiffuseMethod":
- method = new DepthDiffuseMethod();
- break;
case "GradientDiffuseMethod":
method = new GradientDiffuseMethod(GetObject(defaultTexture) as Texture2DBase);
break;
View
3 awaybuilder-core/src/awaybuilder/utils/encoders/AWDEncoder.as
@@ -1164,9 +1164,6 @@ package awaybuilder.utils.encoders
case "WrapDiffuseMethod":
materialMethods.push(new AWDmethod(53, [101], [diffuseMethVO.value], [0.5], [_propNrType]));
break;
- case "DepthDiffuseMethod":
- materialMethods.push(new AWDmethod(51, [], [], [], []));
- break;
case "GradientDiffuseMethod":
texID=_getBlockIDorEncodeAsset(diffuseMethVO.texture);
materialMethods.push(new AWDmethod(52, [1], [texID], [0], [BADDR]));
View
1 awaybuilder-core/src/awaybuilder/view/components/editors/MaterialGroupPropertiesEditor.mxml
@@ -17,7 +17,6 @@
</s:ArrayCollection>
<s:ArrayCollection id="diffuseList">
<fx:Object label="BasicDiffuseMethod" value="BasicDiffuseMethod"/>
- <fx:Object label="DepthDiffuseMethod" value="DepthDiffuseMethod"/>
<fx:Object label="GradientDiffuseMethod" value="GradientDiffuseMethod"/>
<fx:Object label="WrapDiffuseMethod" value="WrapDiffuseMethod"/>
<fx:Object label="LightMapDiffuseMethod" value="LightMapDiffuseMethod"/>
View
1 awaybuilder-core/src/awaybuilder/view/components/editors/MaterialPropertiesEditor.mxml
@@ -16,7 +16,6 @@
</s:ArrayCollection>
<s:ArrayCollection id="diffuseList">
<fx:Object label="BasicDiffuseMethod" value="BasicDiffuseMethod"/>
- <fx:Object label="DepthDiffuseMethod" value="DepthDiffuseMethod"/>
<fx:Object label="GradientDiffuseMethod" value="GradientDiffuseMethod"/>
<fx:Object label="WrapDiffuseMethod" value="WrapDiffuseMethod"/>
<fx:Object label="LightMapDiffuseMethod" value="LightMapDiffuseMethod"/>
View
2 awaybuilder-core/src/awaybuilder/view/components/editors/ShadingPropertyEditor.mxml
@@ -10,7 +10,6 @@
<fx:Declarations>
<s:ArrayCollection id="diffuseList">
<fx:Object label="BasicDiffuseMethod" value="BasicDiffuseMethod"/>
- <fx:Object label="DepthDiffuseMethod" value="DepthDiffuseMethod"/>
<fx:Object label="GradientDiffuseMethod" value="GradientDiffuseMethod"/>
<fx:Object label="WrapDiffuseMethod" value="WrapDiffuseMethod"/>
</s:ArrayCollection>
@@ -24,7 +23,6 @@
<s:State name="BasicAmbientMethod"/>
<s:State name="EnvMapAmbientMethod"/>
<s:State name="BasicDiffuseMethod"/>
- <s:State name="DepthDiffuseMethod"/>
<s:State name="GradientDiffuseMethod"/>
<s:State name="WrapDiffuseMethod"/>
<s:State name="LightMapDiffuseMethod"/>
View
10 awaybuilder-core/src/awaybuilder/view/mediators/PropertiesPanelMediator.as
@@ -307,20 +307,10 @@ package awaybuilder.view.mediators
private function view_materialDiffuseMethodHandler(event:PropertyEditorEvent):void
{
var newMaterial:MaterialVO = MaterialVO(view.data).clone() as MaterialVO;
- if( event.data == "DepthDiffuseMethod" && !newMaterial.diffuseTexture )
- {
- view.callLater( depthDiffuseWarningCalledLater );
- return;
- }
var method:ShadingMethodVO = assets.CreateShadingMethod( event.data.toString() );
newMaterial.diffuseMethod = method;
this.dispatch(new SceneEvent(SceneEvent.CHANGE_MATERIAL,[view.data], newMaterial));
}
- private function depthDiffuseWarningCalledLater():void
- {
- Alert.show( "You cannot assign DepthDiffuseMethod to ColorMaterial","DepthDiffuseMethod requires texture!");
- view.forceUpdate();
- }
private function view_materialNormalMethodHandler(event:PropertyEditorEvent):void
{
var newMaterial:MaterialVO = MaterialVO(view.data).clone() as MaterialVO;

0 comments on commit 291b5b0

Please sign in to comment.