From d59da42adfb0c5dd29155dfda0241505d4d6feba Mon Sep 17 00:00:00 2001 From: Matt Schoen Date: Wed, 29 Nov 2017 23:15:26 -0800 Subject: [PATCH] Remove unused Vive controller materials --- Models/Vive/Materials/ViveController.mat | 4 ++-- Models/Vive/Models/body.mtl | 15 --------------- Models/Vive/Models/body.mtl.meta | 8 -------- Models/Vive/Models/body.obj.meta | 17 +++++++++++++++-- Models/Vive/Models/button.mtl | 15 --------------- Models/Vive/Models/button.mtl.meta | 8 -------- Models/Vive/Models/button.obj.meta | 17 +++++++++++++++-- Models/Vive/Models/l_grip.mtl | 15 --------------- Models/Vive/Models/l_grip.mtl.meta | 8 -------- Models/Vive/Models/l_grip.obj.meta | 17 +++++++++++++++-- Models/Vive/Models/led.mtl | 15 --------------- Models/Vive/Models/led.mtl.meta | 8 -------- Models/Vive/Models/led.obj.meta | 17 +++++++++++++++-- Models/Vive/Models/r_grip.mtl | 15 --------------- Models/Vive/Models/r_grip.mtl.meta | 8 -------- Models/Vive/Models/r_grip.obj.meta | 17 +++++++++++++++-- Models/Vive/Models/scroll_wheel.mtl | 15 --------------- Models/Vive/Models/scroll_wheel.mtl.meta | 8 -------- Models/Vive/Models/scroll_wheel.obj.meta | 17 +++++++++++++++-- Models/Vive/Models/status.mtl | 9 --------- Models/Vive/Models/status.mtl.meta | 8 -------- Models/Vive/Models/status.obj.meta | 17 +++++++++++++++-- Models/Vive/Models/sys_button.mtl | 15 --------------- Models/Vive/Models/sys_button.mtl.meta | 8 -------- Models/Vive/Models/sys_button.obj.meta | 17 +++++++++++++++-- Models/Vive/Models/trackpad.mtl | 15 --------------- Models/Vive/Models/trackpad.mtl.meta | 8 -------- Models/Vive/Models/trackpad.obj.meta | 17 +++++++++++++++-- Models/Vive/Models/trackpad_scroll_cut.mtl | 15 --------------- Models/Vive/Models/trackpad_scroll_cut.mtl.meta | 8 -------- Models/Vive/Models/trackpad_scroll_cut.obj.meta | 17 +++++++++++++++-- Models/Vive/Models/trackpad_touch.mtl | 15 --------------- Models/Vive/Models/trackpad_touch.mtl.meta | 8 -------- Models/Vive/Models/trackpad_touch.obj.meta | 17 +++++++++++++++-- Models/Vive/Models/trigger.mtl | 15 --------------- Models/Vive/Models/trigger.mtl.meta | 8 -------- Models/Vive/Models/trigger.obj.meta | 17 +++++++++++++++-- 37 files changed, 182 insertions(+), 296 deletions(-) delete mode 100644 Models/Vive/Models/body.mtl delete mode 100644 Models/Vive/Models/body.mtl.meta delete mode 100644 Models/Vive/Models/button.mtl delete mode 100644 Models/Vive/Models/button.mtl.meta delete mode 100644 Models/Vive/Models/l_grip.mtl delete mode 100644 Models/Vive/Models/l_grip.mtl.meta delete mode 100644 Models/Vive/Models/led.mtl delete mode 100644 Models/Vive/Models/led.mtl.meta delete mode 100644 Models/Vive/Models/r_grip.mtl delete mode 100644 Models/Vive/Models/r_grip.mtl.meta delete mode 100644 Models/Vive/Models/scroll_wheel.mtl delete mode 100644 Models/Vive/Models/scroll_wheel.mtl.meta delete mode 100644 Models/Vive/Models/status.mtl delete mode 100644 Models/Vive/Models/status.mtl.meta delete mode 100644 Models/Vive/Models/sys_button.mtl delete mode 100644 Models/Vive/Models/sys_button.mtl.meta delete mode 100644 Models/Vive/Models/trackpad.mtl delete mode 100644 Models/Vive/Models/trackpad.mtl.meta delete mode 100644 Models/Vive/Models/trackpad_scroll_cut.mtl delete mode 100644 Models/Vive/Models/trackpad_scroll_cut.mtl.meta delete mode 100644 Models/Vive/Models/trackpad_touch.mtl delete mode 100644 Models/Vive/Models/trackpad_touch.mtl.meta delete mode 100644 Models/Vive/Models/trigger.mtl delete mode 100644 Models/Vive/Models/trigger.mtl.meta diff --git a/Models/Vive/Materials/ViveController.mat b/Models/Vive/Materials/ViveController.mat index df8727dc9..d1e045a5a 100644 --- a/Models/Vive/Materials/ViveController.mat +++ b/Models/Vive/Materials/ViveController.mat @@ -12,7 +12,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: [] @@ -75,7 +75,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 5 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Models/Vive/Models/body.mtl b/Models/Vive/Models/body.mtl deleted file mode 100644 index 5a6f15abf..000000000 --- a/Models/Vive/Models/body.mtl +++ /dev/null @@ -1,15 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.50 0.50 0.50 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -Ni 1.00 -newmtl lambert4SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd onepointfive_texture.png -Ni 1.00 -Ks 0.00 0.00 0.00 -map_Ks onepointfive_spec.png diff --git a/Models/Vive/Models/body.mtl.meta b/Models/Vive/Models/body.mtl.meta deleted file mode 100644 index 96e6bffb1..000000000 --- a/Models/Vive/Models/body.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7a2d4a15a7c7a1148ac269365748a334 -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/body.obj.meta b/Models/Vive/Models/body.obj.meta index 9a58639ef..d3d2b2288 100644 --- a/Models/Vive/Models/body.obj.meta +++ b/Models/Vive/Models/body.obj.meta @@ -3,7 +3,7 @@ guid: 91923fcf53844be47a1ad1b01dc5b4d5 timeCreated: 1507075390 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 100002: body_group1 @@ -12,10 +12,17 @@ ModelImporter: 2300000: body_group1 3300000: body_group1 4300000: body_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert4SG + second: {fileID: 2100000, guid: 4a51798d5e95de54488eac1b012f2607, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Models/Vive/Models/button.mtl b/Models/Vive/Models/button.mtl deleted file mode 100644 index 5a6f15abf..000000000 --- a/Models/Vive/Models/button.mtl +++ /dev/null @@ -1,15 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.50 0.50 0.50 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -Ni 1.00 -newmtl lambert4SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd onepointfive_texture.png -Ni 1.00 -Ks 0.00 0.00 0.00 -map_Ks onepointfive_spec.png diff --git a/Models/Vive/Models/button.mtl.meta b/Models/Vive/Models/button.mtl.meta deleted file mode 100644 index 30da8fc25..000000000 --- a/Models/Vive/Models/button.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 539e42079f414614786f29d31d92a2b6 -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/button.obj.meta b/Models/Vive/Models/button.obj.meta index f34aa26f3..77c391987 100644 --- a/Models/Vive/Models/button.obj.meta +++ b/Models/Vive/Models/button.obj.meta @@ -3,7 +3,7 @@ guid: cbd31b89c0bde684db82ff8056d3cc8e timeCreated: 1507075390 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 100002: menu_but_group1 @@ -12,10 +12,17 @@ ModelImporter: 2300000: menu_but_group1 3300000: menu_but_group1 4300000: menu_but_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert4SG + second: {fileID: 2100000, guid: 4a51798d5e95de54488eac1b012f2607, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Models/Vive/Models/l_grip.mtl b/Models/Vive/Models/l_grip.mtl deleted file mode 100644 index 5a6f15abf..000000000 --- a/Models/Vive/Models/l_grip.mtl +++ /dev/null @@ -1,15 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.50 0.50 0.50 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -Ni 1.00 -newmtl lambert4SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd onepointfive_texture.png -Ni 1.00 -Ks 0.00 0.00 0.00 -map_Ks onepointfive_spec.png diff --git a/Models/Vive/Models/l_grip.mtl.meta b/Models/Vive/Models/l_grip.mtl.meta deleted file mode 100644 index fd9e15ebb..000000000 --- a/Models/Vive/Models/l_grip.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c02966373ee087e4b87648a95a463b28 -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/l_grip.obj.meta b/Models/Vive/Models/l_grip.obj.meta index 577b7c1d5..924fe0a05 100644 --- a/Models/Vive/Models/l_grip.obj.meta +++ b/Models/Vive/Models/l_grip.obj.meta @@ -3,7 +3,7 @@ guid: b32f6f3f786b1b8449a3494a98f2b6b2 timeCreated: 1507075390 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 100002: l_gripper_group1 @@ -12,10 +12,17 @@ ModelImporter: 2300000: l_gripper_group1 3300000: l_gripper_group1 4300000: l_gripper_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert4SG + second: {fileID: 2100000, guid: 4a51798d5e95de54488eac1b012f2607, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Models/Vive/Models/led.mtl b/Models/Vive/Models/led.mtl deleted file mode 100644 index 5a6f15abf..000000000 --- a/Models/Vive/Models/led.mtl +++ /dev/null @@ -1,15 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.50 0.50 0.50 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -Ni 1.00 -newmtl lambert4SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd onepointfive_texture.png -Ni 1.00 -Ks 0.00 0.00 0.00 -map_Ks onepointfive_spec.png diff --git a/Models/Vive/Models/led.mtl.meta b/Models/Vive/Models/led.mtl.meta deleted file mode 100644 index 45374f3ff..000000000 --- a/Models/Vive/Models/led.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e0da3db3a4fb87c4685dcc2ea06495e4 -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/led.obj.meta b/Models/Vive/Models/led.obj.meta index e134296c1..1c93949a5 100644 --- a/Models/Vive/Models/led.obj.meta +++ b/Models/Vive/Models/led.obj.meta @@ -3,7 +3,7 @@ guid: 76a8658f8856237409616e713d02cd80 timeCreated: 1507075390 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 100002: LED_group1 @@ -12,10 +12,17 @@ ModelImporter: 2300000: LED_group1 3300000: LED_group1 4300000: LED_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert4SG + second: {fileID: 2100000, guid: 4a51798d5e95de54488eac1b012f2607, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Models/Vive/Models/r_grip.mtl b/Models/Vive/Models/r_grip.mtl deleted file mode 100644 index 5a6f15abf..000000000 --- a/Models/Vive/Models/r_grip.mtl +++ /dev/null @@ -1,15 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.50 0.50 0.50 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -Ni 1.00 -newmtl lambert4SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd onepointfive_texture.png -Ni 1.00 -Ks 0.00 0.00 0.00 -map_Ks onepointfive_spec.png diff --git a/Models/Vive/Models/r_grip.mtl.meta b/Models/Vive/Models/r_grip.mtl.meta deleted file mode 100644 index ae8bf5114..000000000 --- a/Models/Vive/Models/r_grip.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a0f36f63db2126d408275047b6da8d3c -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/r_grip.obj.meta b/Models/Vive/Models/r_grip.obj.meta index a5b63bc36..3b855c8c0 100644 --- a/Models/Vive/Models/r_grip.obj.meta +++ b/Models/Vive/Models/r_grip.obj.meta @@ -3,7 +3,7 @@ guid: 56f79c509c890b74e906e8a5caee40ae timeCreated: 1507075390 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 100002: r_gripper_group1 @@ -12,10 +12,17 @@ ModelImporter: 2300000: r_gripper_group1 3300000: r_gripper_group1 4300000: r_gripper_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert4SG + second: {fileID: 2100000, guid: 4a51798d5e95de54488eac1b012f2607, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Models/Vive/Models/scroll_wheel.mtl b/Models/Vive/Models/scroll_wheel.mtl deleted file mode 100644 index 5a6f15abf..000000000 --- a/Models/Vive/Models/scroll_wheel.mtl +++ /dev/null @@ -1,15 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.50 0.50 0.50 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -Ni 1.00 -newmtl lambert4SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd onepointfive_texture.png -Ni 1.00 -Ks 0.00 0.00 0.00 -map_Ks onepointfive_spec.png diff --git a/Models/Vive/Models/scroll_wheel.mtl.meta b/Models/Vive/Models/scroll_wheel.mtl.meta deleted file mode 100644 index 25a6657d1..000000000 --- a/Models/Vive/Models/scroll_wheel.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c32eae4586d18f4f967987138bee9fe -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/scroll_wheel.obj.meta b/Models/Vive/Models/scroll_wheel.obj.meta index 3a3b59ac3..7bd1d2a0c 100644 --- a/Models/Vive/Models/scroll_wheel.obj.meta +++ b/Models/Vive/Models/scroll_wheel.obj.meta @@ -3,7 +3,7 @@ guid: 0470cc75e5d4adc4ea095278a47a03b4 timeCreated: 1507075389 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 100002: scroll_wheel_group1 @@ -12,10 +12,17 @@ ModelImporter: 2300000: scroll_wheel_group1 3300000: scroll_wheel_group1 4300000: scroll_wheel_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert4SG + second: {fileID: 2100000, guid: 4a51798d5e95de54488eac1b012f2607, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Models/Vive/Models/status.mtl b/Models/Vive/Models/status.mtl deleted file mode 100644 index a4ff1f153..000000000 --- a/Models/Vive/Models/status.mtl +++ /dev/null @@ -1,9 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd status.png -Ni 1.00 -newmtl lambert4SG - diff --git a/Models/Vive/Models/status.mtl.meta b/Models/Vive/Models/status.mtl.meta deleted file mode 100644 index aea121834..000000000 --- a/Models/Vive/Models/status.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df66281bcb5dc5048b756f26b3497de1 -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/status.obj.meta b/Models/Vive/Models/status.obj.meta index fea8bd553..6d50ba778 100644 --- a/Models/Vive/Models/status.obj.meta +++ b/Models/Vive/Models/status.obj.meta @@ -3,7 +3,7 @@ guid: 4be9d36f561eb7c4baf693cb4a3afac0 timeCreated: 1507075389 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 100002: status_group1 @@ -12,10 +12,17 @@ ModelImporter: 2300000: status_group1 3300000: status_group1 4300000: status_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: initialShadingGroup + second: {fileID: 2100000, guid: 382a130523b88ba4fb85bf066031e25c, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Models/Vive/Models/sys_button.mtl b/Models/Vive/Models/sys_button.mtl deleted file mode 100644 index 5a6f15abf..000000000 --- a/Models/Vive/Models/sys_button.mtl +++ /dev/null @@ -1,15 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.50 0.50 0.50 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -Ni 1.00 -newmtl lambert4SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd onepointfive_texture.png -Ni 1.00 -Ks 0.00 0.00 0.00 -map_Ks onepointfive_spec.png diff --git a/Models/Vive/Models/sys_button.mtl.meta b/Models/Vive/Models/sys_button.mtl.meta deleted file mode 100644 index 5f64fe41c..000000000 --- a/Models/Vive/Models/sys_button.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9ceb230d2af4588408c5af49aa715713 -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/sys_button.obj.meta b/Models/Vive/Models/sys_button.obj.meta index 5e3be2e4d..2f7dc2ba7 100644 --- a/Models/Vive/Models/sys_button.obj.meta +++ b/Models/Vive/Models/sys_button.obj.meta @@ -3,7 +3,7 @@ guid: a522de35d424c4547bce18694eac5aea timeCreated: 1507075390 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: sys_but_group1 100002: //RootNode @@ -12,10 +12,17 @@ ModelImporter: 2300000: sys_but_group1 3300000: sys_but_group1 4300000: sys_but_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert4SG + second: {fileID: 2100000, guid: 4a51798d5e95de54488eac1b012f2607, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Models/Vive/Models/trackpad.mtl b/Models/Vive/Models/trackpad.mtl deleted file mode 100644 index 5a6f15abf..000000000 --- a/Models/Vive/Models/trackpad.mtl +++ /dev/null @@ -1,15 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.50 0.50 0.50 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -Ni 1.00 -newmtl lambert4SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd onepointfive_texture.png -Ni 1.00 -Ks 0.00 0.00 0.00 -map_Ks onepointfive_spec.png diff --git a/Models/Vive/Models/trackpad.mtl.meta b/Models/Vive/Models/trackpad.mtl.meta deleted file mode 100644 index f00b5a19e..000000000 --- a/Models/Vive/Models/trackpad.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: db4994de10138db49bd9d2b21a814120 -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/trackpad.obj.meta b/Models/Vive/Models/trackpad.obj.meta index 4701e9c6c..f589b767a 100644 --- a/Models/Vive/Models/trackpad.obj.meta +++ b/Models/Vive/Models/trackpad.obj.meta @@ -3,7 +3,7 @@ guid: 1eb55c31fec770a4d97118edb282d8c8 timeCreated: 1507075389 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 100002: trackpad_group1 @@ -12,10 +12,17 @@ ModelImporter: 2300000: trackpad_group1 3300000: trackpad_group1 4300000: trackpad_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert4SG + second: {fileID: 2100000, guid: 4a51798d5e95de54488eac1b012f2607, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Models/Vive/Models/trackpad_scroll_cut.mtl b/Models/Vive/Models/trackpad_scroll_cut.mtl deleted file mode 100644 index 5a6f15abf..000000000 --- a/Models/Vive/Models/trackpad_scroll_cut.mtl +++ /dev/null @@ -1,15 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.50 0.50 0.50 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -Ni 1.00 -newmtl lambert4SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd onepointfive_texture.png -Ni 1.00 -Ks 0.00 0.00 0.00 -map_Ks onepointfive_spec.png diff --git a/Models/Vive/Models/trackpad_scroll_cut.mtl.meta b/Models/Vive/Models/trackpad_scroll_cut.mtl.meta deleted file mode 100644 index 68eb4de82..000000000 --- a/Models/Vive/Models/trackpad_scroll_cut.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ba1f24fecc5ff924da77dc464c5a1fbb -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/trackpad_scroll_cut.obj.meta b/Models/Vive/Models/trackpad_scroll_cut.obj.meta index f2a85f0f0..85221cc3d 100644 --- a/Models/Vive/Models/trackpad_scroll_cut.obj.meta +++ b/Models/Vive/Models/trackpad_scroll_cut.obj.meta @@ -3,7 +3,7 @@ guid: 918f5dcc9e64cfa47ad3a7aa35fb70f2 timeCreated: 1507075390 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: track_pad_scrollcut_group1 100002: //RootNode @@ -12,10 +12,17 @@ ModelImporter: 2300000: track_pad_scrollcut_group1 3300000: track_pad_scrollcut_group1 4300000: track_pad_scrollcut_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert4SG + second: {fileID: 2100000, guid: 4a51798d5e95de54488eac1b012f2607, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Models/Vive/Models/trackpad_touch.mtl b/Models/Vive/Models/trackpad_touch.mtl deleted file mode 100644 index 5a6f15abf..000000000 --- a/Models/Vive/Models/trackpad_touch.mtl +++ /dev/null @@ -1,15 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.50 0.50 0.50 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -Ni 1.00 -newmtl lambert4SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd onepointfive_texture.png -Ni 1.00 -Ks 0.00 0.00 0.00 -map_Ks onepointfive_spec.png diff --git a/Models/Vive/Models/trackpad_touch.mtl.meta b/Models/Vive/Models/trackpad_touch.mtl.meta deleted file mode 100644 index bbf8f926a..000000000 --- a/Models/Vive/Models/trackpad_touch.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bb8fc38bd9541d24794cdaebcf96ac4b -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/trackpad_touch.obj.meta b/Models/Vive/Models/trackpad_touch.obj.meta index 94ab2097b..4f35780f5 100644 --- a/Models/Vive/Models/trackpad_touch.obj.meta +++ b/Models/Vive/Models/trackpad_touch.obj.meta @@ -3,7 +3,7 @@ guid: 8fca69da58fb5a44ba6d838685744c73 timeCreated: 1507075390 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: track_pip_group1 100002: //RootNode @@ -12,10 +12,17 @@ ModelImporter: 2300000: track_pip_group1 3300000: track_pip_group1 4300000: track_pip_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert4SG + second: {fileID: 2100000, guid: 4a51798d5e95de54488eac1b012f2607, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Models/Vive/Models/trigger.mtl b/Models/Vive/Models/trigger.mtl deleted file mode 100644 index 5a6f15abf..000000000 --- a/Models/Vive/Models/trigger.mtl +++ /dev/null @@ -1,15 +0,0 @@ -newmtl initialShadingGroup -illum 4 -Kd 0.50 0.50 0.50 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -Ni 1.00 -newmtl lambert4SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd onepointfive_texture.png -Ni 1.00 -Ks 0.00 0.00 0.00 -map_Ks onepointfive_spec.png diff --git a/Models/Vive/Models/trigger.mtl.meta b/Models/Vive/Models/trigger.mtl.meta deleted file mode 100644 index 31025628e..000000000 --- a/Models/Vive/Models/trigger.mtl.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4112f44848fa1544d84b5465857ce524 -timeCreated: 1507075387 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Models/Vive/Models/trigger.obj.meta b/Models/Vive/Models/trigger.obj.meta index 39a45e475..2f99f592c 100644 --- a/Models/Vive/Models/trigger.obj.meta +++ b/Models/Vive/Models/trigger.obj.meta @@ -3,7 +3,7 @@ guid: 11be60732cf8ba74ab65779a6c6d62f2 timeCreated: 1507075389 licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 100002: trigger_group1 @@ -12,10 +12,17 @@ ModelImporter: 2300000: trigger_group1 3300000: trigger_group1 4300000: trigger_group1 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert4SG + second: {fileID: 2100000, guid: 4a51798d5e95de54488eac1b012f2607, type: 2} materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +35,14 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,7 +50,10 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: