From 5043f287f4e8a664d2b17714753e00c6e119397c Mon Sep 17 00:00:00 2001 From: Pepperball Date: Sat, 30 Jan 2021 17:01:11 +1100 Subject: [PATCH] More detailed environment models --- Assets/Scenes/Base Layout.unity | 4 +- Assets/World Assets/Materials/Conveyer.mat | 2 +- Assets/World Assets/Materials/Red.mat | 91 ++++++++++++++++ Assets/World Assets/Materials/Red.mat.meta | 8 ++ Assets/World Assets/Models/Back Wall.fbx | 3 - Assets/World Assets/Prefabs/Back Wall.fbx | 4 +- Assets/World Assets/Prefabs/Conveyer Belt.fbx | 3 + .../Prefabs/Conveyer Belt.fbx.meta | 101 ++++++++++++++++++ Assets/World Assets/Prefabs/Fence.fbx | 3 + .../Fence.fbx.meta} | 6 +- .../com.unity.probuilder/Settings.json | 12 ++- 11 files changed, 225 insertions(+), 12 deletions(-) create mode 100644 Assets/World Assets/Materials/Red.mat create mode 100644 Assets/World Assets/Materials/Red.mat.meta delete mode 100644 Assets/World Assets/Models/Back Wall.fbx create mode 100644 Assets/World Assets/Prefabs/Conveyer Belt.fbx create mode 100644 Assets/World Assets/Prefabs/Conveyer Belt.fbx.meta create mode 100644 Assets/World Assets/Prefabs/Fence.fbx rename Assets/World Assets/{Models/Back Wall.fbx.meta => Prefabs/Fence.fbx.meta} (96%) diff --git a/Assets/Scenes/Base Layout.unity b/Assets/Scenes/Base Layout.unity index 599c6af..11e0e19 100644 --- a/Assets/Scenes/Base Layout.unity +++ b/Assets/Scenes/Base Layout.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c124e72c772ef075c0d01bb651b3a8373e615f384b74117bcaf086823647d5d -size 642946 +oid sha256:8e1a50e07b8de8323c2851bb614699e7f9436307345cc10e461d5f29902a6c90 +size 637412 diff --git a/Assets/World Assets/Materials/Conveyer.mat b/Assets/World Assets/Materials/Conveyer.mat index 5b3cab0..413c43f 100644 --- a/Assets/World Assets/Materials/Conveyer.mat +++ b/Assets/World Assets/Materials/Conveyer.mat @@ -84,7 +84,7 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.6603774, g: 0.6603774, b: 0.6603774, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/Assets/World Assets/Materials/Red.mat b/Assets/World Assets/Materials/Red.mat new file mode 100644 index 0000000..fadabbd --- /dev/null +++ b/Assets/World Assets/Materials/Red.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Red + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 0.2216981, b: 0.2216981, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &6945557477375298710 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 diff --git a/Assets/World Assets/Materials/Red.mat.meta b/Assets/World Assets/Materials/Red.mat.meta new file mode 100644 index 0000000..089160f --- /dev/null +++ b/Assets/World Assets/Materials/Red.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0496129d598a9d04f983aa47954a629f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/World Assets/Models/Back Wall.fbx b/Assets/World Assets/Models/Back Wall.fbx deleted file mode 100644 index 100f015..0000000 --- a/Assets/World Assets/Models/Back Wall.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a9d40bb01cfaed5566337bc47e7b6c91898aaeac989af1374346f4e98bb1d74 -size 14540 diff --git a/Assets/World Assets/Prefabs/Back Wall.fbx b/Assets/World Assets/Prefabs/Back Wall.fbx index 100f015..43f8ef7 100644 --- a/Assets/World Assets/Prefabs/Back Wall.fbx +++ b/Assets/World Assets/Prefabs/Back Wall.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a9d40bb01cfaed5566337bc47e7b6c91898aaeac989af1374346f4e98bb1d74 -size 14540 +oid sha256:d146429a678048cafb9fe011c4f00edc8805d6e3ce6a77863e8bf71761c2cebf +size 14396 diff --git a/Assets/World Assets/Prefabs/Conveyer Belt.fbx b/Assets/World Assets/Prefabs/Conveyer Belt.fbx new file mode 100644 index 0000000..8cf000b --- /dev/null +++ b/Assets/World Assets/Prefabs/Conveyer Belt.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b843ace4e4c3f50611675062eecb97b545fd0e62d416a6d7cec7b5a7391b17d +size 15468 diff --git a/Assets/World Assets/Prefabs/Conveyer Belt.fbx.meta b/Assets/World Assets/Prefabs/Conveyer Belt.fbx.meta new file mode 100644 index 0000000..4b50fac --- /dev/null +++ b/Assets/World Assets/Prefabs/Conveyer Belt.fbx.meta @@ -0,0 +1,101 @@ +fileFormatVersion: 2 +guid: 20cac98bee24b6644b3264964af77935 +ModelImporter: + serializedVersion: 20101 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 8.5 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 8.5 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/World Assets/Prefabs/Fence.fbx b/Assets/World Assets/Prefabs/Fence.fbx new file mode 100644 index 0000000..8163258 --- /dev/null +++ b/Assets/World Assets/Prefabs/Fence.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec7c66b9cfe67edda0a4534ec4f29b61951820fca70c0414f8dd6a00022a5df4 +size 15484 diff --git a/Assets/World Assets/Models/Back Wall.fbx.meta b/Assets/World Assets/Prefabs/Fence.fbx.meta similarity index 96% rename from Assets/World Assets/Models/Back Wall.fbx.meta rename to Assets/World Assets/Prefabs/Fence.fbx.meta index 22f8edd..c807ae6 100644 --- a/Assets/World Assets/Models/Back Wall.fbx.meta +++ b/Assets/World Assets/Prefabs/Fence.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e789636a97a4e14e85e5f8e59051b0a +guid: bcce9ca1b4787574bb877cc7fad6343e ModelImporter: serializedVersion: 20101 internalIDToNameTable: [] @@ -34,7 +34,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 50 + globalScale: 6 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 50 + globalScale: 6 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 5fb0f08..d01c18f 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -93,6 +93,11 @@ "key": "FillHole.selectEntirePath", "value": "{\"m_Value\":true}" }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.extrudeEdgesAsGroup", + "value": "{\"m_Value\":true}" + }, { "type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.rectSelectModifier", @@ -106,7 +111,7 @@ { "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.selectMode", - "value": "{\"m_Value\":1}" + "value": "{\"m_Value\":4}" }, { "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", @@ -152,6 +157,11 @@ "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "uv.uvEditorGridSnapIncrement", "value": "{\"m_Value\":0.125}" + }, + { + "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "ExtrudeEdges.distance", + "value": "{\"m_Value\":0.5}" } ] }