From 86391aff54c0b8be7f77d6b05ffe5db95de3c781 Mon Sep 17 00:00:00 2001 From: Mohsen Kamalzadeh Date: Wed, 16 Jun 2021 14:12:13 -0700 Subject: [PATCH] Added scanned truck and fixed post processing across scnes --- SynthDet/Assets/Scanned Truck.meta | 8 + .../Example-LEGO_200k Variant.prefab | 3 + .../Example-LEGO_200k Variant.prefab.meta | 7 + .../Scanned Truck/Example-LEGO_200k.fbx | 3 + .../Scanned Truck/Example-LEGO_200k.fbx.meta | 102 +++++++++++++ .../Scanned Truck/Example-LEGO_200k.png | 3 + .../Scanned Truck/Example-LEGO_200k.png.meta | 144 ++++++++++++++++++ .../WS000161-LEGO_200k_u1_v1.mat | 3 + .../WS000161-LEGO_200k_u1_v1.mat.meta | 8 + .../Main Camera Profile Bokeh Blur.asset | 3 + ...Main Camera Profile Bokeh Blur.asset.meta} | 0 .../Main Camera Profile Gaussian Blur.asset | 3 + ...in Camera Profile Gaussian Blur.asset.meta | 8 + .../Scenes/SynthDet/Main Camera Profile.asset | 3 - .../Scenes/SynthDetDatamakerSettings.unity | 4 +- .../SynthDetMyMain_Stage2.2(Iteration1).unity | 4 +- .../SynthDetMyMain_Stage2.3(Iteration2).unity | 4 +- .../UserSettings/EditorUserSettings.asset | 2 +- 18 files changed, 302 insertions(+), 10 deletions(-) create mode 100644 SynthDet/Assets/Scanned Truck.meta create mode 100644 SynthDet/Assets/Scanned Truck/Example-LEGO_200k Variant.prefab create mode 100644 SynthDet/Assets/Scanned Truck/Example-LEGO_200k Variant.prefab.meta create mode 100644 SynthDet/Assets/Scanned Truck/Example-LEGO_200k.fbx create mode 100644 SynthDet/Assets/Scanned Truck/Example-LEGO_200k.fbx.meta create mode 100644 SynthDet/Assets/Scanned Truck/Example-LEGO_200k.png create mode 100644 SynthDet/Assets/Scanned Truck/Example-LEGO_200k.png.meta create mode 100644 SynthDet/Assets/Scanned Truck/WS000161-LEGO_200k_u1_v1.mat create mode 100644 SynthDet/Assets/Scanned Truck/WS000161-LEGO_200k_u1_v1.mat.meta create mode 100644 SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Bokeh Blur.asset rename SynthDet/Assets/Scenes/SynthDet/{Main Camera Profile.asset.meta => Main Camera Profile Bokeh Blur.asset.meta} (100%) create mode 100644 SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Gaussian Blur.asset create mode 100644 SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Gaussian Blur.asset.meta delete mode 100644 SynthDet/Assets/Scenes/SynthDet/Main Camera Profile.asset diff --git a/SynthDet/Assets/Scanned Truck.meta b/SynthDet/Assets/Scanned Truck.meta new file mode 100644 index 00000000..8a0a20b5 --- /dev/null +++ b/SynthDet/Assets/Scanned Truck.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7d12050f9d38b44de8f9f84c6598c0df +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SynthDet/Assets/Scanned Truck/Example-LEGO_200k Variant.prefab b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k Variant.prefab new file mode 100644 index 00000000..56fb8341 --- /dev/null +++ b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k Variant.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59802954b9afd6b6911aad646a75e89d682360f9b7d7fdae0fae1d09779b0d5c +size 2926 diff --git a/SynthDet/Assets/Scanned Truck/Example-LEGO_200k Variant.prefab.meta b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k Variant.prefab.meta new file mode 100644 index 00000000..2b7c25d4 --- /dev/null +++ b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 65a8bd7e6424e4ca6a58c084ec0e2f76 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.fbx b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.fbx new file mode 100644 index 00000000..1dfe22e0 --- /dev/null +++ b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36520710ed9891349dc0f765ff1b19e79e11a4f440fd56e71e35e6f43cf08736 +size 5302160 diff --git a/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.fbx.meta b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.fbx.meta new file mode 100644 index 00000000..c5185fa5 --- /dev/null +++ b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.fbx.meta @@ -0,0 +1,102 @@ +fileFormatVersion: 2 +guid: 0854c7346086c4289abab707c2f0ff2c +ModelImporter: + serializedVersion: 20200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + 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: 1 + 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: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.png b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.png new file mode 100644 index 00000000..869a2123 --- /dev/null +++ b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dfe751c909f622d20debb132f72f3659a213c39fb2bb4be0e8003a56021b9bc +size 5781493 diff --git a/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.png.meta b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.png.meta new file mode 100644 index 00000000..440cf55e --- /dev/null +++ b/SynthDet/Assets/Scanned Truck/Example-LEGO_200k.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 8e777d0c11a944399b312428725c2b03 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SynthDet/Assets/Scanned Truck/WS000161-LEGO_200k_u1_v1.mat b/SynthDet/Assets/Scanned Truck/WS000161-LEGO_200k_u1_v1.mat new file mode 100644 index 00000000..46b3821c --- /dev/null +++ b/SynthDet/Assets/Scanned Truck/WS000161-LEGO_200k_u1_v1.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc588a6f4d806a7c496e7160b2c699fc3a463daf030383667f639e418db320e3 +size 3553 diff --git a/SynthDet/Assets/Scanned Truck/WS000161-LEGO_200k_u1_v1.mat.meta b/SynthDet/Assets/Scanned Truck/WS000161-LEGO_200k_u1_v1.mat.meta new file mode 100644 index 00000000..9308876e --- /dev/null +++ b/SynthDet/Assets/Scanned Truck/WS000161-LEGO_200k_u1_v1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1b86ef0c68f7427bbc16d1216f6596b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Bokeh Blur.asset b/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Bokeh Blur.asset new file mode 100644 index 00000000..69968a05 --- /dev/null +++ b/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Bokeh Blur.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22801961758952a6b4bc23888f3005185597a4313fc4b73bfdf6f98f5f28ae2e +size 2507 diff --git a/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile.asset.meta b/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Bokeh Blur.asset.meta similarity index 100% rename from SynthDet/Assets/Scenes/SynthDet/Main Camera Profile.asset.meta rename to SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Bokeh Blur.asset.meta diff --git a/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Gaussian Blur.asset b/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Gaussian Blur.asset new file mode 100644 index 00000000..33c615e2 --- /dev/null +++ b/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Gaussian Blur.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9afe45aa1ee2933b41b2ce7e245d11174ffcabd3260544f40c81227bff944c3c +size 2508 diff --git a/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Gaussian Blur.asset.meta b/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Gaussian Blur.asset.meta new file mode 100644 index 00000000..b5bc8eff --- /dev/null +++ b/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile Gaussian Blur.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9bdcab988004648658bf89115e238394 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile.asset b/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile.asset deleted file mode 100644 index 35c80831..00000000 --- a/SynthDet/Assets/Scenes/SynthDet/Main Camera Profile.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e6c53deafac6e0cac7ba7e243e56257d8fa09582403766abb68260286f3b1b3 -size 2496 diff --git a/SynthDet/Assets/Scenes/SynthDetDatamakerSettings.unity b/SynthDet/Assets/Scenes/SynthDetDatamakerSettings.unity index 0e9642cd..dbba3c33 100644 --- a/SynthDet/Assets/Scenes/SynthDetDatamakerSettings.unity +++ b/SynthDet/Assets/Scenes/SynthDetDatamakerSettings.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0531f238f62466d4e5b77c4fc23754d29fb5052b7f50915d7c6cfa98e786b41b -size 105023 +oid sha256:857ed8f304f8d027b82bf684ae96b13453daa1b3f8681fcea051e3e34e1394a2 +size 104957 diff --git a/SynthDet/Assets/Scenes/SynthDetMyMain_Stage2.2(Iteration1).unity b/SynthDet/Assets/Scenes/SynthDetMyMain_Stage2.2(Iteration1).unity index 3098c2ba..6eb48076 100644 --- a/SynthDet/Assets/Scenes/SynthDetMyMain_Stage2.2(Iteration1).unity +++ b/SynthDet/Assets/Scenes/SynthDetMyMain_Stage2.2(Iteration1).unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43d4eb75e057446aa508ddf50a3ecd8a068051877a7445184288b1eb5d16e7c8 -size 114869 +oid sha256:ff4626a28e6059a6f2192cd88313d377560ade5216a3b24fa9be493fdea7392a +size 114803 diff --git a/SynthDet/Assets/Scenes/SynthDetMyMain_Stage2.3(Iteration2).unity b/SynthDet/Assets/Scenes/SynthDetMyMain_Stage2.3(Iteration2).unity index 0e6bf3c6..17c2845e 100644 --- a/SynthDet/Assets/Scenes/SynthDetMyMain_Stage2.3(Iteration2).unity +++ b/SynthDet/Assets/Scenes/SynthDetMyMain_Stage2.3(Iteration2).unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b79a922c8d74c10d2e4cb6e348d3793c1c7f879ccad91f16e097f6529f28b7d -size 114913 +oid sha256:169a0b19f47304136168e3e23b3b29d3fb60d7e972087f5be2e8d6ceef940f4f +size 114847 diff --git a/SynthDet/UserSettings/EditorUserSettings.asset b/SynthDet/UserSettings/EditorUserSettings.asset index b02e4592..9a84f2cc 100644 --- a/SynthDet/UserSettings/EditorUserSettings.asset +++ b/SynthDet/UserSettings/EditorUserSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d79ba86bc261818b4e7fcea56362f43d4c0f2d1ec9842824c642caad6fb8a5c0 +oid sha256:b79991cca43ac951157789d14af950bd8dd06df3a6618d9bff2020f31a2b27d1 size 1619