diff --git a/Experiment Files/UV_Character_Update.png b/Experiment Files/UV_Character_Update.png new file mode 100644 index 0000000..1e65086 Binary files /dev/null and b/Experiment Files/UV_Character_Update.png differ diff --git a/unity_Project/Assets/0bjects/Textures/txtr_player_face_A.png.meta b/unity_Project/Assets/0bjects/Textures/txtr_player_face_A.png.meta index e7cd1ff..3fcc2ad 100644 --- a/unity_Project/Assets/0bjects/Textures/txtr_player_face_A.png.meta +++ b/unity_Project/Assets/0bjects/Textures/txtr_player_face_A.png.meta @@ -44,7 +44,7 @@ TextureImporter: spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 - alphaIsTransparency: 0 + alphaIsTransparency: 1 textureType: -1 buildTargetSettings: [] spriteSheet: diff --git a/unity_Project/Assets/0bjects/object_Crane_Unwrapped.fbx b/unity_Project/Assets/0bjects/object_Crane_Unwrapped.fbx new file mode 100644 index 0000000..0536db8 Binary files /dev/null and b/unity_Project/Assets/0bjects/object_Crane_Unwrapped.fbx differ diff --git a/unity_Project/Assets/0bjects/object_Crane_Unwrapped.fbx.meta b/unity_Project/Assets/0bjects/object_Crane_Unwrapped.fbx.meta new file mode 100644 index 0000000..c785d0e --- /dev/null +++ b/unity_Project/Assets/0bjects/object_Crane_Unwrapped.fbx.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 59312639edef8d74c81173452eeef988 +timeCreated: 1442800879 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: Camera + 100002: Lamp + 100004: //RootNode + 100006: pCube5 + 100008: pCube6 + 100010: pCube7 + 100012: pCylinder6 + 100014: polySurface1 + 100016: polySurface3 + 100018: transform1 + 100020: transform2 + 100022: transform3 + 100024: transform4 + 100026: transform5 + 400000: Camera + 400002: Lamp + 400004: //RootNode + 400006: pCube5 + 400008: pCube6 + 400010: pCube7 + 400012: pCylinder6 + 400014: polySurface1 + 400016: polySurface3 + 400018: transform1 + 400020: transform2 + 400022: transform3 + 400024: transform4 + 400026: transform5 + 2300000: pCube7 + 2300002: pCylinder6 + 3300000: pCube7 + 3300002: pCylinder6 + 4300000: pCube7 + 4300002: pCylinder6 + 7400000: pCube7|transform1|Take 001|BaseLayer + 7400002: pCube6|transform1|Take 001|BaseLayer + 7400004: transform5|transform1|Take 001|BaseLayer + 7400006: pCylinder6|transform1|Take 001|BaseLayer + 7400008: transform1|transform1|Take 001|BaseLayer + 7400010: polySurface3|transform1|Take 001|BaseLayer + 7400012: transform4|transform1|Take 001|BaseLayer + 7400014: polySurface1|transform1|Take 001|BaseLayer + 7400016: transform2|transform1|Take 001|BaseLayer + 7400018: pCube5|transform1|Take 001|BaseLayer + 7400020: transform3|transform1|Take 001|BaseLayer + 7400022: Lamp|transform1|Take 001|BaseLayer + 7400024: Camera|transform1|Take 001|BaseLayer + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 400 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/ArmMask.mask b/unity_Project/Assets/ArmMask.mask new file mode 100644 index 0000000..7db7eed Binary files /dev/null and b/unity_Project/Assets/ArmMask.mask differ diff --git a/unity_Project/Assets/ArmMask.mask.meta b/unity_Project/Assets/ArmMask.mask.meta new file mode 100644 index 0000000..d39e62f --- /dev/null +++ b/unity_Project/Assets/ArmMask.mask.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01b57da5a27f8524981d15bfac619e72 +timeCreated: 1442804851 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/Character/CharacterAnimations_Full_21-9.fbx b/unity_Project/Assets/Character/CharacterAnimations_Full_21-9.fbx new file mode 100644 index 0000000..a2bc744 Binary files /dev/null and b/unity_Project/Assets/Character/CharacterAnimations_Full_21-9.fbx differ diff --git a/unity_Project/Assets/Character/CharacterAnimations_Full_21-9.fbx.meta b/unity_Project/Assets/Character/CharacterAnimations_Full_21-9.fbx.meta new file mode 100644 index 0000000..1d38f74 --- /dev/null +++ b/unity_Project/Assets/Character/CharacterAnimations_Full_21-9.fbx.meta @@ -0,0 +1,331 @@ +fileFormatVersion: 2 +guid: d8fc66059a17ffb4ab450884d6994f8b +timeCreated: 1442805884 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: Character_Advanced_01_0004:Backpack + 100002: Character_Advanced_01_0004:Character_new_06:Character_new_06:polySurface50 + 100004: Character_Advanced_01_0004:Character_new_06:ikHandle10 + 100006: Character_Advanced_01_0004:Character_new_06:ikHandle11 + 100008: Character_Advanced_01_0004:Character_new_06:ikHandle5 + 100010: Character_Advanced_01_0004:Character_new_06:ikHandle6 + 100012: Character_Advanced_01_0004:Character_new_06:ikHandle7 + 100014: Character_Advanced_01_0004:Character_new_06:ikHandle9 + 100016: Character_Advanced_01_0004:Character_new_06:transform30 + 100018: Character_Advanced_01_0004:Face + 100020: Character_Advanced_01_0004:face_Controller + 100022: Character_Advanced_01_0004:Feet_Controller + 100024: Character_Advanced_01_0004:Hand_Controllers + 100026: Character_Advanced_01_0004:Head + 100028: Character_Advanced_01_0004:Head_Controller + 100030: Character_Advanced_01_0004:head_Locator + 100032: Character_Advanced_01_0004:head_upNode + 100034: Character_Advanced_01_0004:Hip + 100036: Character_Advanced_01_0004:Hip_Controller + 100038: Character_Advanced_01_0004:l_Elbow + 100040: Character_Advanced_01_0004:l_Fist_Controller + 100042: Character_Advanced_01_0004:l_Foot_Controller + 100044: Character_Advanced_01_0004:l_Hand + 100046: Character_Advanced_01_0004:l_Hand_Controls + 100048: Character_Advanced_01_0004:l_Heel + 100050: Character_Advanced_01_0004:l_Hip + 100052: Character_Advanced_01_0004:l_Index_1 + 100054: Character_Advanced_01_0004:l_Index_2 + 100056: Character_Advanced_01_0004:l_Index_3 + 100058: Character_Advanced_01_0004:l_Index_4 + 100060: Character_Advanced_01_0004:l_Index_Controller + 100062: Character_Advanced_01_0004:l_Knee + 100064: Character_Advanced_01_0004:l_Middle_1 + 100066: Character_Advanced_01_0004:l_Middle_2 + 100068: Character_Advanced_01_0004:l_Middle_3 + 100070: Character_Advanced_01_0004:l_Middle_4 + 100072: Character_Advanced_01_0004:l_Middle_Controller + 100074: Character_Advanced_01_0004:l_Pinky_1 + 100076: Character_Advanced_01_0004:l_Pinky_2 + 100078: Character_Advanced_01_0004:l_Pinky_3 + 100080: Character_Advanced_01_0004:l_Pinky_4 + 100082: Character_Advanced_01_0004:l_Pinky_Controller + 100084: Character_Advanced_01_0004:l_Ring_1 + 100086: Character_Advanced_01_0004:l_Ring_2 + 100088: Character_Advanced_01_0004:l_Ring_3 + 100090: Character_Advanced_01_0004:l_Ring_4 + 100092: Character_Advanced_01_0004:l_Ring_Controller + 100094: Character_Advanced_01_0004:l_Shoulder + 100096: Character_Advanced_01_0004:l_Thumb_1 + 100098: Character_Advanced_01_0004:l_Thumb_2 + 100100: Character_Advanced_01_0004:l_Thumb_Controller + 100102: Character_Advanced_01_0004:l_Toe + 100104: Character_Advanced_01_0004:l_Toe_Controller + 100106: Character_Advanced_01_0004:l_Wrist_Controller + 100108: Character_Advanced_01_0004:Master + 100110: Character_Advanced_01_0004:MASTER_CONTROLLER + 100112: Character_Advanced_01_0004:Mid_Controller + 100114: Character_Advanced_01_0004:Neck + 100116: Character_Advanced_01_0004:Neck_Controller + 100118: Character_Advanced_01_0004:r_Elbow + 100120: Character_Advanced_01_0004:r_Fist_Controller + 100122: Character_Advanced_01_0004:r_Foot_Controller + 100124: Character_Advanced_01_0004:r_Hand + 100126: Character_Advanced_01_0004:r_Hand_Controls + 100128: Character_Advanced_01_0004:r_Heel + 100130: Character_Advanced_01_0004:r_Hip + 100132: Character_Advanced_01_0004:r_Index_1 + 100134: Character_Advanced_01_0004:r_Index_2 + 100136: Character_Advanced_01_0004:r_Index_3 + 100138: Character_Advanced_01_0004:r_Index_4 + 100140: Character_Advanced_01_0004:r_Index_Controller + 100142: Character_Advanced_01_0004:r_Knee + 100144: Character_Advanced_01_0004:r_Middle_1 + 100146: Character_Advanced_01_0004:r_Middle_2 + 100148: Character_Advanced_01_0004:r_Middle_3 + 100150: Character_Advanced_01_0004:r_Middle_4 + 100152: Character_Advanced_01_0004:r_Middle_Controller + 100154: Character_Advanced_01_0004:r_Pinky_1 + 100156: Character_Advanced_01_0004:r_Pinky_2 + 100158: Character_Advanced_01_0004:r_Pinky_3 + 100160: Character_Advanced_01_0004:r_Pinky_4 + 100162: Character_Advanced_01_0004:r_Pinky_Controller + 100164: Character_Advanced_01_0004:r_Ring_1 + 100166: Character_Advanced_01_0004:r_Ring_2 + 100168: Character_Advanced_01_0004:r_Ring_3 + 100170: Character_Advanced_01_0004:r_Ring_4 + 100172: Character_Advanced_01_0004:r_Ring_Controller + 100174: Character_Advanced_01_0004:r_Shoulder + 100176: Character_Advanced_01_0004:r_Thumb_1 + 100178: Character_Advanced_01_0004:r_Thumb_2 + 100180: Character_Advanced_01_0004:r_Thumb_Controller + 100182: Character_Advanced_01_0004:r_Toe + 100184: Character_Advanced_01_0004:r_Toe_Controller + 100186: Character_Advanced_01_0004:r_Wrist_Controller + 100188: Character_Advanced_01_0004:Spine_Bot + 100190: Character_Advanced_01_0004:Spine_Mid + 100192: Character_Advanced_01_0004:Spine_Top + 100194: Character_Advanced_01_0004:Staff1 + 100196: Character_Advanced_01_0005:Feet_Controller + 100198: Character_Advanced_01_0005:MASTER_CONTROLLER + 100200: Character_Advanced_01_0005:r_Foot_Controller + 100202: Character_Advanced_01_0006:Feet_Controller + 100204: Character_Advanced_01_0006:MASTER_CONTROLLER + 100206: Character_Advanced_01_0006:r_Foot_Controller + 100208: Character_Advanced_02:Character_Advanced_01_0004:Character_new_06:Character_new_06:polySurface50 + 100210: Character_Advanced_02:Character_Advanced_01_0004:Character_new_06:transform30 + 100212: Character_Advanced_02:Character_Advanced_01_0004:Hand_Controllers + 100214: Character_Advanced_02:Character_Advanced_01_0004:l_Hand_Controls + 100216: Character_Advanced_02:Character_Advanced_01_0004:r_Hand_Controls + 100218: //RootNode + 100220: curve1 + 100222: group + 100224: group1 + 100226: imagePlane1 + 100228: joint3 + 100230: locator1 + 100232: locator2 + 100234: nurbsCircle1 + 100236: nurbsCircle2 + 100238: nurbsCircle3 + 100240: nurbsCircle4 + 100242: nurbsCircle5 + 100244: nurbsSquare1 + 100246: nurbsSquare2 + 100248: nurbsSquare3 + 100250: polySurface1 + 100252: staff_bot + 100254: staff_top + 400000: Character_Advanced_01_0004:Backpack + 400002: Character_Advanced_01_0004:Character_new_06:Character_new_06:polySurface50 + 400004: Character_Advanced_01_0004:Character_new_06:ikHandle10 + 400006: Character_Advanced_01_0004:Character_new_06:ikHandle11 + 400008: Character_Advanced_01_0004:Character_new_06:ikHandle5 + 400010: Character_Advanced_01_0004:Character_new_06:ikHandle6 + 400012: Character_Advanced_01_0004:Character_new_06:ikHandle7 + 400014: Character_Advanced_01_0004:Character_new_06:ikHandle9 + 400016: Character_Advanced_01_0004:Character_new_06:transform30 + 400018: Character_Advanced_01_0004:Face + 400020: Character_Advanced_01_0004:face_Controller + 400022: Character_Advanced_01_0004:Feet_Controller + 400024: Character_Advanced_01_0004:Hand_Controllers + 400026: Character_Advanced_01_0004:Head + 400028: Character_Advanced_01_0004:Head_Controller + 400030: Character_Advanced_01_0004:head_Locator + 400032: Character_Advanced_01_0004:head_upNode + 400034: Character_Advanced_01_0004:Hip + 400036: Character_Advanced_01_0004:Hip_Controller + 400038: Character_Advanced_01_0004:l_Elbow + 400040: Character_Advanced_01_0004:l_Fist_Controller + 400042: Character_Advanced_01_0004:l_Foot_Controller + 400044: Character_Advanced_01_0004:l_Hand + 400046: Character_Advanced_01_0004:l_Hand_Controls + 400048: Character_Advanced_01_0004:l_Heel + 400050: Character_Advanced_01_0004:l_Hip + 400052: Character_Advanced_01_0004:l_Index_1 + 400054: Character_Advanced_01_0004:l_Index_2 + 400056: Character_Advanced_01_0004:l_Index_3 + 400058: Character_Advanced_01_0004:l_Index_4 + 400060: Character_Advanced_01_0004:l_Index_Controller + 400062: Character_Advanced_01_0004:l_Knee + 400064: Character_Advanced_01_0004:l_Middle_1 + 400066: Character_Advanced_01_0004:l_Middle_2 + 400068: Character_Advanced_01_0004:l_Middle_3 + 400070: Character_Advanced_01_0004:l_Middle_4 + 400072: Character_Advanced_01_0004:l_Middle_Controller + 400074: Character_Advanced_01_0004:l_Pinky_1 + 400076: Character_Advanced_01_0004:l_Pinky_2 + 400078: Character_Advanced_01_0004:l_Pinky_3 + 400080: Character_Advanced_01_0004:l_Pinky_4 + 400082: Character_Advanced_01_0004:l_Pinky_Controller + 400084: Character_Advanced_01_0004:l_Ring_1 + 400086: Character_Advanced_01_0004:l_Ring_2 + 400088: Character_Advanced_01_0004:l_Ring_3 + 400090: Character_Advanced_01_0004:l_Ring_4 + 400092: Character_Advanced_01_0004:l_Ring_Controller + 400094: Character_Advanced_01_0004:l_Shoulder + 400096: Character_Advanced_01_0004:l_Thumb_1 + 400098: Character_Advanced_01_0004:l_Thumb_2 + 400100: Character_Advanced_01_0004:l_Thumb_Controller + 400102: Character_Advanced_01_0004:l_Toe + 400104: Character_Advanced_01_0004:l_Toe_Controller + 400106: Character_Advanced_01_0004:l_Wrist_Controller + 400108: Character_Advanced_01_0004:Master + 400110: Character_Advanced_01_0004:MASTER_CONTROLLER + 400112: Character_Advanced_01_0004:Mid_Controller + 400114: Character_Advanced_01_0004:Neck + 400116: Character_Advanced_01_0004:Neck_Controller + 400118: Character_Advanced_01_0004:r_Elbow + 400120: Character_Advanced_01_0004:r_Fist_Controller + 400122: Character_Advanced_01_0004:r_Foot_Controller + 400124: Character_Advanced_01_0004:r_Hand + 400126: Character_Advanced_01_0004:r_Hand_Controls + 400128: Character_Advanced_01_0004:r_Heel + 400130: Character_Advanced_01_0004:r_Hip + 400132: Character_Advanced_01_0004:r_Index_1 + 400134: Character_Advanced_01_0004:r_Index_2 + 400136: Character_Advanced_01_0004:r_Index_3 + 400138: Character_Advanced_01_0004:r_Index_4 + 400140: Character_Advanced_01_0004:r_Index_Controller + 400142: Character_Advanced_01_0004:r_Knee + 400144: Character_Advanced_01_0004:r_Middle_1 + 400146: Character_Advanced_01_0004:r_Middle_2 + 400148: Character_Advanced_01_0004:r_Middle_3 + 400150: Character_Advanced_01_0004:r_Middle_4 + 400152: Character_Advanced_01_0004:r_Middle_Controller + 400154: Character_Advanced_01_0004:r_Pinky_1 + 400156: Character_Advanced_01_0004:r_Pinky_2 + 400158: Character_Advanced_01_0004:r_Pinky_3 + 400160: Character_Advanced_01_0004:r_Pinky_4 + 400162: Character_Advanced_01_0004:r_Pinky_Controller + 400164: Character_Advanced_01_0004:r_Ring_1 + 400166: Character_Advanced_01_0004:r_Ring_2 + 400168: Character_Advanced_01_0004:r_Ring_3 + 400170: Character_Advanced_01_0004:r_Ring_4 + 400172: Character_Advanced_01_0004:r_Ring_Controller + 400174: Character_Advanced_01_0004:r_Shoulder + 400176: Character_Advanced_01_0004:r_Thumb_1 + 400178: Character_Advanced_01_0004:r_Thumb_2 + 400180: Character_Advanced_01_0004:r_Thumb_Controller + 400182: Character_Advanced_01_0004:r_Toe + 400184: Character_Advanced_01_0004:r_Toe_Controller + 400186: Character_Advanced_01_0004:r_Wrist_Controller + 400188: Character_Advanced_01_0004:Spine_Bot + 400190: Character_Advanced_01_0004:Spine_Mid + 400192: Character_Advanced_01_0004:Spine_Top + 400194: Character_Advanced_01_0004:Staff1 + 400196: Character_Advanced_01_0005:Feet_Controller + 400198: Character_Advanced_01_0005:MASTER_CONTROLLER + 400200: Character_Advanced_01_0005:r_Foot_Controller + 400202: Character_Advanced_01_0006:Feet_Controller + 400204: Character_Advanced_01_0006:MASTER_CONTROLLER + 400206: Character_Advanced_01_0006:r_Foot_Controller + 400208: Character_Advanced_02:Character_Advanced_01_0004:Character_new_06:Character_new_06:polySurface50 + 400210: Character_Advanced_02:Character_Advanced_01_0004:Character_new_06:transform30 + 400212: Character_Advanced_02:Character_Advanced_01_0004:Hand_Controllers + 400214: Character_Advanced_02:Character_Advanced_01_0004:l_Hand_Controls + 400216: Character_Advanced_02:Character_Advanced_01_0004:r_Hand_Controls + 400218: //RootNode + 400220: curve1 + 400222: group + 400224: group1 + 400226: imagePlane1 + 400228: joint3 + 400230: locator1 + 400232: locator2 + 400234: nurbsCircle1 + 400236: nurbsCircle2 + 400238: nurbsCircle3 + 400240: nurbsCircle4 + 400242: nurbsCircle5 + 400244: nurbsSquare1 + 400246: nurbsSquare2 + 400248: nurbsSquare3 + 400250: polySurface1 + 400252: staff_bot + 400254: staff_top + 4300000: Character_Advanced_01_0004:Staff1 + 4300002: polySurface1 + 7400000: Take 001 + 9500000: //RootNode + 13700000: Character_Advanced_01_0004:Staff1 + 13700002: polySurface1 + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/Character/Character_Animation.controller b/unity_Project/Assets/Character/Character_Animation.controller index c38cdff..9cdac48 100644 Binary files a/unity_Project/Assets/Character/Character_Animation.controller and b/unity_Project/Assets/Character/Character_Animation.controller differ diff --git a/unity_Project/Assets/Materials/Crane.mat b/unity_Project/Assets/Materials/Crane.mat new file mode 100644 index 0000000..533a7db Binary files /dev/null and b/unity_Project/Assets/Materials/Crane.mat differ diff --git a/unity_Project/Assets/Materials/Crane.mat.meta b/unity_Project/Assets/Materials/Crane.mat.meta new file mode 100644 index 0000000..9f114ed --- /dev/null +++ b/unity_Project/Assets/Materials/Crane.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ceda70d53452ad94d8689650daa1eedc +timeCreated: 1442800559 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/Scripts/magnetGun.cs b/unity_Project/Assets/Scripts/magnetGun.cs index 5707b43..9d3b9dc 100644 --- a/unity_Project/Assets/Scripts/magnetGun.cs +++ b/unity_Project/Assets/Scripts/magnetGun.cs @@ -7,6 +7,7 @@ public class magnetGun : MonoBehaviour { public Camera camera; public GameObject crossHair; public thirdPersonController playerController; + public magnetGun otherPlayer; public string L_TRIGGER_INPUT; public string R_TRIGGER_INPUT; @@ -18,7 +19,7 @@ public class magnetGun : MonoBehaviour { private float playerScreen = 2; public GameObject gravityWell; - private Collider GravityTarget; + public Collider GravityTarget; private Vector3 rayHitPoint; private Vector3 targetOffset; @@ -32,6 +33,9 @@ public class magnetGun : MonoBehaviour { private RigidbodyConstraints originalConstrants; private bool originalGravity; + private bool axisDown = false; + + private float normGrip; private Renderer lastTargetRenderer; private Color lastTargetColour; @@ -69,9 +73,20 @@ public class magnetGun : MonoBehaviour { updateColors (target); + if (getAxisDown(L_TRIGGER_INPUT)){ + Debug.Log ("axis down"); + //Debug.Log (GravityTarget.name); + + if (GravityTarget != null){ + dropItem (GravityTarget); + Debug.Log("dropping item"); + }else{ + pickUpItem (target); + } + } - if (triggerL > 0) { + /* (triggerL > 0) { if (!L_Trigger_Down) { pickUpItem (target); L_Trigger_Down = true; @@ -80,7 +95,7 @@ public class magnetGun : MonoBehaviour { L_Trigger_Down = false; dropItem(GravityTarget); } - + */ impulsePush (target); moveItem (GravityTarget); pullItem (triggerR); @@ -117,6 +132,12 @@ public class magnetGun : MonoBehaviour { private void pickUpItem(Collider item){ if (item != null) { + + if (item == otherPlayer.GravityTarget){ + otherPlayer.dropItem(item); + } + + if (item.tag == "moveable"){ originalConstrants = item.attachedRigidbody.constraints; originalGravity = item.attachedRigidbody.useGravity; @@ -255,5 +276,22 @@ public class magnetGun : MonoBehaviour { } + + private bool getAxisDown (string axis){ + + if( Input.GetAxisRaw(axis) != 0) + { + if(axisDown == false) + { + axisDown = true; + return true; + } + } + if( Input.GetAxisRaw(axis) == 0) + { + axisDown = false; + } + return false; + } } diff --git a/unity_Project/Assets/_Scenes/MainLevel.unity b/unity_Project/Assets/_Scenes/MainLevel.unity index 5ba5aac..32b55d2 100644 Binary files a/unity_Project/Assets/_Scenes/MainLevel.unity and b/unity_Project/Assets/_Scenes/MainLevel.unity differ diff --git a/unity_Project/ProjectSettings/ProjectSettings.asset b/unity_Project/ProjectSettings/ProjectSettings.asset index 6773321..37266c8 100644 Binary files a/unity_Project/ProjectSettings/ProjectSettings.asset and b/unity_Project/ProjectSettings/ProjectSettings.asset differ diff --git a/unity_Project/ProjectSettings/ProjectVersion.txt b/unity_Project/ProjectSettings/ProjectVersion.txt index e040c5c..8c353d8 100644 --- a/unity_Project/ProjectSettings/ProjectVersion.txt +++ b/unity_Project/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.0f3 +m_EditorVersion: 5.1.2f1 m_StandardAssetsVersion: 0