Permalink
Browse files

group editing updated

  • Loading branch information...
1 parent ff51bbf commit 48fc53b31637a29f2f0fcd31dc0596d902fc3ba5 @keyemkey keyemkey committed Jun 23, 2013
Showing with 918 additions and 162 deletions.
  1. +4 −1 awaybuilder-core/src/awaybuilder/view/components/PropertiesPanel.mxml
  2. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/AnimationNodePropertiesEditor.mxml
  3. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/AnimationSetPropertiesEditor.mxml
  4. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/AnimatorPropertiesEditor.mxml
  5. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/CameraPropertiesEditor.mxml
  6. +4 −5 awaybuilder-core/src/awaybuilder/view/components/editors/ContainerGroupPropertiesEditor.mxml
  7. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/ContainerPropertiesEditor.mxml
  8. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/CubeTexturePropertiesEditor.mxml
  9. +4 −4 awaybuilder-core/src/awaybuilder/view/components/editors/EditorBase.as
  10. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/EffectMethodPropertyEditor.mxml
  11. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/GeometryPropertiesEditor.mxml
  12. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/LensPropertiesEditor.mxml
  13. +1 −1 awaybuilder-core/src/awaybuilder/view/components/editors/LightPickerPropertiesEditor.mxml
  14. +3 −4 awaybuilder-core/src/awaybuilder/view/components/editors/LightPropertiesEditor.mxml
  15. +730 −0 awaybuilder-core/src/awaybuilder/view/components/editors/MaterialGroupPropertiesEditor.mxml
  16. +4 −4 awaybuilder-core/src/awaybuilder/view/components/editors/MaterialPropertiesEditor.mxml
  17. +107 −86 awaybuilder-core/src/awaybuilder/view/components/editors/MeshGroupPropertiesEditor.mxml
  18. +7 −7 awaybuilder-core/src/awaybuilder/view/components/editors/MeshPropertiesEditor.mxml
  19. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/ShadingPropertyEditor.mxml
  20. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/ShadowMapperPropertyEditor.mxml
  21. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/ShadowMethodPropertyEditor.mxml
  22. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/SkeletonPropertiesEditor.mxml
  23. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/SkyBoxPropertiesEditor.mxml
  24. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/TextureProjectorPropertiesEditor.mxml
  25. +3 −3 awaybuilder-core/src/awaybuilder/view/components/editors/TexturePropertiesEditor.mxml
  26. +6 −2 awaybuilder-core/src/awaybuilder/view/mediators/PropertiesPanelMediator.as
@@ -37,6 +37,7 @@
<s:State name="meshGroup"/>
<s:State name="containerGroup"/>
+ <s:State name="materialGroup"/>
</controls:states>
<fx:Declarations>
<s:Parallel id="nextTransitionEffect">
@@ -138,7 +139,9 @@
<editors:CameraPropertiesEditor prevSelected="{prevSelected}" data="{data}" includeIn="camera,initAll"/>
<editors:LensPropertiesEditor prevSelected="{prevSelected}" data="{data}" includeIn="lens,initAll"/>
- <editors:ContainerGroupPropertiesEditor data="{data}" includeIn="containerGroup,meshGroup,initAll"/>
+ <editors:ContainerGroupPropertiesEditor data="{data}" includeIn="containerGroup,initAll"/>
+ <editors:MeshGroupPropertiesEditor data="{data}" includeIn="meshGroup,initAll"/>
+ <editors:MaterialGroupPropertiesEditor textures="{nullableTextures}" lightPickers="{lightPickers}" prevSelected="{prevSelected}" data="{data}" includeIn="materialGroup,initAll"/>
<editors:GlobalOptionPropertiesEditor data="{data}" includeIn="global,initAll" />
</s:Group>
@@ -12,10 +12,10 @@
[Bindable]
private var _asset:AnimationNodeVO;
- override protected function validate(asset:Object):void
+ override protected function validate():void
{
- if( !(asset is AnimationNodeVO) ) return;
- _asset = AnimationNodeVO(asset).clone();
+ if( !(data is AnimationNodeVO) ) return;
+ _asset = AnimationNodeVO(data).clone();
}
private function name_changeHandler( event:Event ):void
@@ -13,10 +13,10 @@
[Bindable]
private var _asset:AnimationSetVO = new AnimationSetVO();
- override protected function validate(asset:Object):void
+ override protected function validate():void
{
- if( !(asset is AnimationSetVO) ) return;
- _asset.fillFromAnimationSet(asset as AnimationSetVO);
+ if( !(data is AnimationSetVO) ) return;
+ _asset.fillFromAnimationSet(data as AnimationSetVO);
AnimationSetVO(data).animations.addEventListener(CollectionEvent.COLLECTION_CHANGE, childs_collectionChangeEvent, false, 0, true );
AnimationSetVO(data).animators.addEventListener(CollectionEvent.COLLECTION_CHANGE, childs_collectionChangeEvent, false, 0, true );
}
@@ -20,10 +20,10 @@
[Bindable]
private var _asset:AnimatorVO = new AnimatorVO();
- override protected function validate(asset:Object):void
+ override protected function validate():void
{
- if( !(asset is AnimatorVO) ) return;
- _asset.fillFromAnimator( asset as AnimatorVO );
+ if( !(data is AnimatorVO) ) return;
+ _asset.fillFromAnimator( data as AnimatorVO );
}
private function stepper_changeHandler( event:Event ):void
@@ -31,10 +31,10 @@
[Bindable]
private var _selectedLens:Object;
- override protected function validate(asset:Object):void
+ override protected function validate():void
{
- if( !(asset is CameraVO) ) return;
- _asset = CameraVO(asset).clone() as CameraVO;
+ if( !(data is CameraVO) ) return;
+ _asset = CameraVO(data).clone() as CameraVO;
var item:Object;
for each(item in lensList)
@@ -20,13 +20,12 @@
[Bindable]
private var _asset:ContainerVO = new ContainerVO();
- [Bindable]
private var _assets:Array;
- override protected function validate(items:Object):void
+ override protected function validate():void
{
- if( !(items is Array) ) return;
- _assets = items as Array;
+ if( !(data is Array) ) return;
+ _assets = data as Array;
validateGroup();
this.owner.addEventListener( "updateGroupCollection", updateGroupCollectionHandler );
}
@@ -121,7 +120,7 @@
<s:HGroup width="100%" verticalAlign="middle" paddingLeft="2" paddingRight="2" paddingTop="4" paddingBottom="4">
<s:Button id="editParentObjectButton" styleName="editParentObjectButtonStyle" visible="{prevSelected.length>0}"
width="32" height="32" click="editParentObjectButton_clickHandler(event)"/>
- <s:Label width="100%" text="Object3D[]" fontWeight="bold" fontSize="14"/>
+ <s:Label width="100%" text="Object3D [ ]" fontWeight="bold" fontSize="14"/>
</s:HGroup>
</s:Group>
@@ -17,10 +17,10 @@
[Bindable]
private var _asset:ContainerVO = new ContainerVO();
- override protected function validate(asset:Object):void
+ override protected function validate():void
{
- if( !(asset is ContainerVO) ) return;
- _asset.fillFromContainer( asset as ContainerVO );
+ if( !(data is ContainerVO) ) return;
+ _asset.fillFromContainer( data as ContainerVO );
}
private function position_commitHandler(event:Event):void
@@ -11,10 +11,10 @@
[Bindable]
private var _asset:CubeTextureVO;
- override protected function validate(asset:Object):void
+ override protected function validate():void
{
- if( !(asset is CubeTextureVO) ) return;
- _asset = CubeTextureVO(asset).clone();
+ if( !(data is CubeTextureVO) ) return;
+ _asset = CubeTextureVO(data).clone();
}
private function name_changeHandler( event:Event ):void
@@ -52,7 +52,7 @@ package awaybuilder.view.components.editors
if( value )
{
_data = value;
- validate( _data );
+ validate();
if( _data is IEventDispatcher ) IEventDispatcher(_data).addEventListener( PropertyChangeEvent.PROPERTY_CHANGE, data_propertyChangeHandler )
}
if( this.owner )
@@ -70,7 +70,7 @@ package awaybuilder.view.components.editors
private function forceUpdateHandler( event:Event ):void
{
trace( "forceUpdateHandler" );
- validate( _data );
+ validate();
}
override protected function commitProperties():void
@@ -79,7 +79,7 @@ package awaybuilder.view.components.editors
if(_propertiesChanged)
{
_propertiesChanged = false;
- validate( _data );
+ validate();
}
}
@@ -162,7 +162,7 @@ package awaybuilder.view.components.editors
_lightPickers = value;
}
- protected function validate( asset:Object ):void
+ protected function validate():void
{
throw new Error( "Abstract method" );
}
@@ -42,10 +42,10 @@
[Bindable] private var _selectedTexture:TextureVO;
- override protected function validate(asset:Object):void
+ override protected function validate():void
{
- if( !(asset is EffectMethodVO) ) return;
- _asset = EffectMethodVO(asset).clone();
+ if( !(data is EffectMethodVO) ) return;
+ _asset = EffectMethodVO(data).clone();
}
private function dropDownIconFunction(item:TextureVO):Object
@@ -22,10 +22,10 @@
[Bindable]
private var _asset:GeometryVO;
- override protected function validate(asset:Object):void
+ override protected function validate():void
{
- if( !(asset is GeometryVO) ) return;
- _asset = GeometryVO(asset).clone() as GeometryVO;
+ if( !(data is GeometryVO) ) return;
+ _asset = GeometryVO(data).clone() as GeometryVO;
}
private function stepper_changeHandler(event:Event):void {
@@ -24,10 +24,10 @@
[Bindable] private var _selectedDiffuseMethod:Object;
[Bindable] private var _selectedSpecularMethod:Object;
- override protected function validate(asset:Object):void
+ override protected function validate():void
{
- if( !(asset is LensVO) ) return;
- _asset = LensVO(asset).clone();
+ if( !(data is LensVO) ) return;
+ _asset = LensVO(data).clone();
}
private function stepper_changeHandler(event:Event):void
@@ -28,7 +28,7 @@
[Bindable]
private var _asset:LightPickerVO = new LightPickerVO();
- override protected function validate( asset:Object ):void
+ override protected function validate():void
{
if( !(data is LightPickerVO) ) return;
LightPickerVO(data).lights.addEventListener(CollectionEvent.COLLECTION_CHANGE, lights_collectionChangeEvent, false, 0, true );
@@ -69,16 +69,15 @@
{
_asset.fillFromLight( data as LightVO );
}
-
}
- override protected function validate(asset:Object):void
+ override protected function validate():void
{
- if( !(asset is LightVO) ) return;
+ if( !(data is LightVO) ) return;
LightVO(data).shadowMethods.addEventListener(CollectionEvent.COLLECTION_CHANGE, childs_collectionChangeEvent, false, 0, true );
- _asset = LightVO(asset).clone() as LightVO;
+ _asset = LightVO(data).clone() as LightVO;
var o:Object;
if( _asset.shadowMapper )
Oops, something went wrong.

0 comments on commit 48fc53b

Please sign in to comment.