fix cam.fov / refactor for references

awaytools · May 21, 2014 · 49e71a7 · 49e71a7
1 parent eec2d7f
commit 49e71a7
Show file tree

Hide file tree

Showing 27 changed files with 673 additions and 258 deletions.
diff --git a/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWCameraModifier.mcr b/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWCameraModifier.mcr
@@ -5,20 +5,26 @@ macroScript AddAWDCameraModifier
 
 	if selection.count==0 then (
 		selected=#()
+		selectedObj=#()
 		for i in objects do(
 			if superclassof i==camera then(
 				for m in i.modifiers do(
 					if classof m as string=="AWDCamera" then(
-						appendIfUnique selected i
+						appendIfUnique selected m
+						appendIfUnique selectedObj i
 					)				
 				)
 			)	
 		)
-		if selected.count>0 then(
+		if selected.count==1 then(
+			max modify mode 
+			modPanel.setCurrentObject selected[1]
+		)
+		else if selected.count>1 then(
 			answer=queryBox ("Nothing is selected.\n\n "+selected.count  as string+" AWDCamera modifiers found in the scene.\n\n Select the Objects that are holding the modifiers ?")
 			if answer==true then(
-				select selected
-			)
+				select selectedObj
+			)			
 		)
 		else	messageBox ("No Object is selected.\n\n No AWDCamera modifiers found in the scene.\n\n To create a AWDCamera modifier, select one camera.")
 

diff --git a/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDAnimationSet.mcr b/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDAnimationSet.mcr
@@ -33,18 +33,31 @@ if meshes.count>=1 then (
 	)
 else(
 	selected=#()
+	selectedObj=#()
 	testCnter=0
 	for i in objects do(
 		for m in i.modifiers do(
 			if classof  m as string=="AWDAnimationSet" then(
-				appendIfUnique selected i
+				appendIfUnique selected m
+				appendIfUnique selectedObj i
 
 			)
 		)
 	)	
-	answer=queryBox ("Nothing is selected.\n\n Found "+testCnter as string+" AnimationClips in the scene.\n\n Select the "+selected.count as string + " Objects that are holding the AnimationClips ?")
-	if answer==true then(
-		select selected
-	)
+		if selected.count==1 then(
+			max modify mode 
+			modPanel.setCurrentObject selected[1]
+			)
+		else if selected.count>1 then(
+				answer=queryBox ("Nothing is selected.\n\n "+selected.count  as string+" AWDAnimationSets modifiers found in the scene.\n\n Select the Objects that are holding the modifiers ?")
+				if answer==true then(
+					select selectedObj
+				)
+
+		)
+		else(
+			messagebox ("Nothing is selected.\n\n No AWDAnimationSets found in scene")
+		)
+
 	)
 )
diff --git a/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDAnimator.mcr b/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDAnimator.mcr
@@ -45,32 +45,31 @@ macroScript AddAWDAnimator
 	else(
 		meshes = $*
 		selected=#()
+		selectedObj=#()
 		firstmod=undefined
 		if meshes!= undefined then (
 			for i in meshes do(
 				for oneMod in i.modifiers do(
 					if (classOf oneMod as string)=="AWDAnimator" then (
-						appendIfUnique selected i
+						appendIfUnique selected m
+						appendIfUnique selectedObj i
 					)
 				)
 			)
 		)	
-		if selected.count>1 then(
-			answer=queryBox ("Nothing is selected.\n\nScene contains "+selected.count  as string+" objects that have AWDAnimator-modifier applied.\n\nSelect the Objects ?")
-			if answer==true then(
-				select selected
-				)
-			)
-		else if selected.count==1 then(
-			answer=queryBox ("Nothing is selected.\n\n Scene contains "+selected.count  as string+" object that has AWDAnimators-modifier applied.\n\nSelect the Object ?")
+		if selected.count==1 then(
+			max modify mode 
+			modPanel.setCurrentObject selected[1]
+		)
+		else if selected.count>1 then(
+			answer=queryBox ("Nothing is selected.\n\n "+selected.count  as string+" AWDAnimators modifiers found in the scene.\n\n Select the Objects that are holding the modifiers ?")
 			if answer==true then(
-				select selected
-				)
-			)
+				select selectedObj
+			)			
+		)
 		else (
 			messagebox ("Nothing is selected.\n\n Scene contains no objects that have AWDAnimators-modifier applied.\n\n")
-
-			)
 		)
+	)
 
 )
diff --git a/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDEffectModifier.mcr b/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDEffectModifier.mcr
@@ -5,17 +5,24 @@ macroScript AddAWDEffectModifier
 
 	if selection.count==0 then (
 		selected=#()
+		selectedObj=#()
 		for i in objects do(
 				for m in i.modifiers do(
 					if classof m as string=="AWDEffectMethod" then(
-						appendIfUnique selected i
+						appendIfUnique selected m
+						appendIfUnique selectedObj i
 					)				
 				)
 			)	
-		if selected.count>0 then(
+
+		if selected.count==1 then(
+			max modify mode 
+			modPanel.setCurrentObject selected[1]
+			)
+		else if selected.count>1 then(
 			answer=queryBox ("Nothing is selected.\n\n "+selected.count  as string+" AWDEffectMethod modifiers found in the scene.\n\n Select the Objects that are holding the modifiers ?")
 			if answer==true then(
-				select selected
+				select selectedObj
 			)
 		)
 		else	messageBox ("No Object is selected.\n\n No AWDEffectMethod modifiers found in the scene.\n\n To create a AWDEffectMethod modifier, select one object.")

diff --git a/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDLightModifier.mcr b/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDLightModifier.mcr
@@ -5,20 +5,27 @@ macroScript AddAWDLightModifier
 
 	if selection.count==0 then (
 		selected=#()
+		selectedObj=#()
 		for i in objects do(
 			if superclassof i==light then(
 				for m in i.modifiers do(
 					if classof m as string=="AWDShadowMethod" then(
-						appendIfUnique selected i
+						appendIfUnique selected m
+						appendIfUnique selectedObj i 
 					)				
 				)
 			)	
 		)
-		if selected.count>0 then(
+
+		if selected.count==1 then(
+			max modify mode 
+			modPanel.setCurrentObject selected[1]
+		)
+		else if selected.count>1 then(
 			answer=queryBox ("Nothing is selected.\n\n "+selected.count  as string+" AWDShadowMethod modifiers found in the scene.\n\n Select the Objects that are holding the modifiers ?")
 			if answer==true then(
-				select selected
-			)
+				select selectedObj
+			)			
 		)
 		else	messageBox ("No Object is selected.\n\n No AWDShadowMethod modifiers found in the scene.\n\n To create a AWDShadowMethod modifier, select one light.")
 

diff --git a/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDMaterialSettings.mcr b/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDMaterialSettings.mcr
@@ -8,7 +8,7 @@ macroScript addAWDMaterialSettings
 		mtl=undefined
 		--if material mode is "Compact-Mode"
 		if MatEditor.mode ==#basic then (
-			mtl = meditMaterials[activeMeditSlot] 
+			mtl = medit.GetCurMtl()
 		)
 		--if material mode is "Slate-Mode"
 		else if MatEditor.mode ==#advanced then (

diff --git a/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDSkeleton.mcr b/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDSkeleton.mcr
@@ -34,19 +34,25 @@ else if meshes.count>1 then messagebox("AWDSkeleton Modifier can only be attache
 --if nothing is selected we check if nodes are in the scene
 else(
 		selected=#()
+		selectedObj=#()
 		for i in objects do(
 				for m in i.modifiers do(
 					if classof m as string=="AWDSkeleton" or classof m as string=="AWDSkeletonClone" then(
-						appendIfUnique selected i
+						appendIfUnique selected m
+						appendIfUnique selectedObj m
 					)				
 				)
 			)	
-		if selected.count>0 then(
-			answer=queryBox ("Nothing is selected.\n\n Found "+selected.count  as string+" AWD Skeleton modifiers found in the scene.\n\n Select the Objects that are holding the modifiers ?")
+		if selected.count==1 then(
+			max modify mode 
+			modPanel.setCurrentObject selected[1]
+		)
+		else if selected.count>1 then(
+			answer=queryBox ("Nothing is selected.\n\n "+selected.count  as string+" AWD Skeleton modifiers found in the scene.\n\n Select the Objects that are holding the modifiers ?")
 			if answer==true then(
-				select selected
-				)
-			)
+				select selectedObj
+			)			
+		)
 		else(
 			answer=messageBox ("No Object is selected.\n\n No AWD Skeleton modifiers found in the scene.\n\n To create a AWD skeleton modifier, select the root-bone of your rigg.")
 			)

diff --git a/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDTextureSettings.mcr b/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDTextureSettings.mcr
@@ -7,7 +7,7 @@ macroScript addAWDTextureSettings
 		thisTexMap=undefined
 		--if material mode is "Compact-Mode"
 		if MatEditor.mode ==#basic then (
-			thisTexMap = meditMaterials[activeMeditSlot] 
+			thisTexMap = medit.GetCurMtl()
 		)
 		--if material mode is "Slate-Mode"
 		else if MatEditor.mode ==#advanced then (

diff --git a/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDVertexAnimSource.mcr b/awayextensions3dsmax/AWDCommands/AWDCommands/AWDCommands-AddAWDVertexAnimSource.mcr
@@ -37,20 +37,26 @@ macroScript AddAWDVertexAnimSource
 	else(
 			meshes = $*
 			selected=#()
+			selectedObj=#()
 			if meshes!= undefined then (
 				for i in meshes do(
 					for m in i.modifiers do(
 						if classof m as string=="AWDVertexAnimSource" or classof m as string=="AWDVertexAnimSourceClone" then(
-							appendIfUnique selected i
-						)				
+							appendIfUnique selected m
+							appendIfUnique selectedObj i
+							)				
 					)
 				)	
-			if selected.count>0 then(
-				answer=queryBox ("Nothing is selected.\n\n "+selected.count  as string+" AWDVertexAnimSource-modifier found in the scene.\n\n Select the Objects that are holding the modifiers ?")
+			if selected.count==1 then(
+				max modify mode 
+				modPanel.setCurrentObject selected[1]
+				)
+			else if selected.count>1 then(
+				answer=queryBox ("Nothing is selected.\n\n "+selected.count  as string+" AWDVertexAnimSource modifiers found in the scene.\n\n Select the Objects that are holding the modifiers ?")
 				if answer==true then(
-					select selected
-					)
+					select selectedObj
 				)
+			)
 			else(
 				answer=messageBox ("No Object is selected.\n\n No AWDVertexAnimSource modifiers found in the scene.\n\n To create a AWD AWDVertexAnimSource modifier, select the animated mesh.")
 				)

diff --git a/awayextensions3dsmax/AWDExporter/maxawdexporter_2011_32.dle b/awayextensions3dsmax/AWDExporter/maxawdexporter_2011_32.dle
diff --git a/awayextensions3dsmax/AWDExporter/maxawdexporter_2011_64.dle b/awayextensions3dsmax/AWDExporter/maxawdexporter_2011_64.dle
diff --git a/awayextensions3dsmax/AWDExporter/maxawdexporter_2012_32.dle b/awayextensions3dsmax/AWDExporter/maxawdexporter_2012_32.dle
diff --git a/awayextensions3dsmax/AWDExporter/maxawdexporter_2012_64.dle b/awayextensions3dsmax/AWDExporter/maxawdexporter_2012_64.dle
diff --git a/awayextensions3dsmax/AWDExporter/maxawdexporter_2013_64.dle b/awayextensions3dsmax/AWDExporter/maxawdexporter_2013_64.dle
diff --git a/awayextensions3dsmax/AWDExporter/maxawdexporter_2014_64.dle b/awayextensions3dsmax/AWDExporter/maxawdexporter_2014_64.dle
diff --git a/awayextensions3dsmax/AwayExtensions3dsMax/AwayExtensions3dsMax/3dsmaxversionLocal.xml b/awayextensions3dsmax/AwayExtensions3dsMax/AwayExtensions3dsMax/3dsmaxversionLocal.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" ?>
-<AWDMAXVERSION Major="0" Message="update docs / remove inlcude manifest file from release builds" Minor="9" Revision="88"/>
+<AWDMAXVERSION Major="0" Message="several fixes / refactor for references / add AWDObjectSettings as Modifier" Minor="9" Revision="89"/>
diff --git a/...3dsmax/AwayExtensions3dsMax/AwayExtensions3dsMax/AWDCustomSettings/AWDMaterialSettings.ms b/...3dsmax/AwayExtensions3dsMax/AwayExtensions3dsMax/AWDCustomSettings/AWDMaterialSettings.ms
@@ -239,8 +239,8 @@ fn addAWDMaterialSettings thisMat = (
 					btn_removeambientenvMap.enabled=true
 				)
 				on btn_chooseambientenvMap pressed do(
-					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					mtl=undefined			
+					if MatEditor.mode ==#basic then mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -332,7 +332,7 @@ fn addAWDMaterialSettings thisMat = (
 				dropdownlist ddl_lightMapblendMode "BlendMode"  items:#("NORMAL", "LAYER", "MULTIPLY", "ADD" , "ALPHA" )  height:6  align:#left animatable:false
 				on ddl_lightMapbase selected  selectedIdx do (
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then 	mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -356,7 +356,7 @@ fn addAWDMaterialSettings thisMat = (
 				dropDownList ddl_cellDiffusebase "Base Method" items:#("BasicDiffuse", "GradientDiffuse", "WarpDiffuse") animateable:false
 				on ddl_cellDiffusebase selected  selectedIdx do (
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then 	mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -420,7 +420,7 @@ fn addAWDMaterialSettings thisMat = (
 
 				on ddl_ambient selected  selectedIdx do (	
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then 	mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -429,7 +429,7 @@ fn addAWDMaterialSettings thisMat = (
 				)
 				on ddl_diffuse selected  selectedIdx do (		
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then 	mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -438,7 +438,7 @@ fn addAWDMaterialSettings thisMat = (
 				)
 				on ddl_spec selected  selectedIdx do (
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then 	mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -447,7 +447,7 @@ fn addAWDMaterialSettings thisMat = (
 				)		
 				on ddl_normal selected  selectedIdx do (		
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then 	mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -498,7 +498,7 @@ fn addAWDMaterialSettings thisMat = (
 				)
 				on btn_add_effectMethod pressed do (
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -639,7 +639,7 @@ fn addAWDMaterialSettings thisMat = (
 					if methodenabled then 	lbl_fxMethods.enabled=true
 					else 	lbl_fxMethods.enabled=false
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -649,7 +649,7 @@ fn addAWDMaterialSettings thisMat = (
 
 				on btn_chooseshadowMod pressed do(
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -726,7 +726,7 @@ fn addAWDMaterialSettings thisMat = (
 					lbl_shading.enabled=true
 
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -774,7 +774,7 @@ fn addAWDMaterialSettings thisMat = (
 					lbl_shading.enabled=false
 
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -789,7 +789,7 @@ fn addAWDMaterialSettings thisMat = (
 						lbl_shading.enabled=false
 					)
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene
@@ -913,7 +913,7 @@ fn addAWDMaterialSettings thisMat = (
 					else 	lbl_fxMethods.enabled=false
 
 					mtl=undefined
-					if MatEditor.mode ==#basic then 	mtl = meditMaterials[activeMeditSlot] 
+					if MatEditor.mode ==#basic then mtl = medit.GetCurMtl()
 					else if MatEditor.mode ==#advanced then 	mtl=sme.GetMtlInParamEditor()		
 					if mtl!=undefined then(
 						fileIn (getDir #maxRoot + "\\plugins\\AwayExtensions3dsMax\\AWDCustomSettings\\AWDMaterialSettings.ms")--reload this file here, so the function is available after restoring the 3dsmax-scene