diff --git a/Assets/UniGLTF/Samples.meta b/Assets/UniGLTF/Samples.meta deleted file mode 100644 index fd83f1e22..000000000 --- a/Assets/UniGLTF/Samples.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0f315984294ae8e45a5f86d663b88855 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/Samples/ScreenSpace.meta b/Assets/UniGLTF_Samples/ScreenSpace.meta similarity index 77% rename from Assets/UniGLTF/Samples/ScreenSpace.meta rename to Assets/UniGLTF_Samples/ScreenSpace.meta index 72aa1b85f..d8247f7c0 100644 --- a/Assets/UniGLTF/Samples/ScreenSpace.meta +++ b/Assets/UniGLTF_Samples/ScreenSpace.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8458a1e47a62f6f4187d89d44f564117 +guid: 6c5301536f93e47bbb9ae6830c6e7e49 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/UniGLTF/Samples/ScreenSpace/ScaleOffset.cs b/Assets/UniGLTF_Samples/ScreenSpace/ScaleOffset.cs similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/ScaleOffset.cs rename to Assets/UniGLTF_Samples/ScreenSpace/ScaleOffset.cs diff --git a/Assets/UniGLTF/Samples/ScreenSpace/ScaleOffset.cs.meta b/Assets/UniGLTF_Samples/ScreenSpace/ScaleOffset.cs.meta similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/ScaleOffset.cs.meta rename to Assets/UniGLTF_Samples/ScreenSpace/ScaleOffset.cs.meta diff --git a/Assets/UniGLTF/Samples/ScreenSpace/ScreenSpace.unity b/Assets/UniGLTF_Samples/ScreenSpace/ScreenSpace.unity similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/ScreenSpace.unity rename to Assets/UniGLTF_Samples/ScreenSpace/ScreenSpace.unity diff --git a/Assets/UniGLTF/Samples/ScreenSpace/ScreenSpace.unity.meta b/Assets/UniGLTF_Samples/ScreenSpace/ScreenSpace.unity.meta similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/ScreenSpace.unity.meta rename to Assets/UniGLTF_Samples/ScreenSpace/ScreenSpace.unity.meta diff --git a/Assets/UniGLTF/Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef b/Assets/UniGLTF_Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef rename to Assets/UniGLTF_Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef diff --git a/Assets/UniGLTF/Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef.meta b/Assets/UniGLTF_Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef.meta similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef.meta rename to Assets/UniGLTF_Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef.meta diff --git a/Assets/UniGLTF/Samples/ScreenSpace/a.mat b/Assets/UniGLTF_Samples/ScreenSpace/a.mat similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/a.mat rename to Assets/UniGLTF_Samples/ScreenSpace/a.mat diff --git a/Assets/UniGLTF/Samples/ScreenSpace/a.mat.meta b/Assets/UniGLTF_Samples/ScreenSpace/a.mat.meta similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/a.mat.meta rename to Assets/UniGLTF_Samples/ScreenSpace/a.mat.meta diff --git a/Assets/UniGLTF/Samples/ScreenSpace/a.png b/Assets/UniGLTF_Samples/ScreenSpace/a.png similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/a.png rename to Assets/UniGLTF_Samples/ScreenSpace/a.png diff --git a/Assets/UniGLTF/Samples/ScreenSpace/a.png.meta b/Assets/UniGLTF_Samples/ScreenSpace/a.png.meta similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/a.png.meta rename to Assets/UniGLTF_Samples/ScreenSpace/a.png.meta diff --git a/Assets/UniGLTF/Samples/ScreenSpace/b.mat b/Assets/UniGLTF_Samples/ScreenSpace/b.mat similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/b.mat rename to Assets/UniGLTF_Samples/ScreenSpace/b.mat diff --git a/Assets/UniGLTF/Samples/ScreenSpace/b.mat.meta b/Assets/UniGLTF_Samples/ScreenSpace/b.mat.meta similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/b.mat.meta rename to Assets/UniGLTF_Samples/ScreenSpace/b.mat.meta diff --git a/Assets/UniGLTF/Samples/ScreenSpace/b.png b/Assets/UniGLTF_Samples/ScreenSpace/b.png similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/b.png rename to Assets/UniGLTF_Samples/ScreenSpace/b.png diff --git a/Assets/UniGLTF/Samples/ScreenSpace/b.png.meta b/Assets/UniGLTF_Samples/ScreenSpace/b.png.meta similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/b.png.meta rename to Assets/UniGLTF_Samples/ScreenSpace/b.png.meta diff --git a/Assets/UniGLTF/Samples/ScreenSpace/uv_color.shader b/Assets/UniGLTF_Samples/ScreenSpace/uv_color.shader similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/uv_color.shader rename to Assets/UniGLTF_Samples/ScreenSpace/uv_color.shader diff --git a/Assets/UniGLTF/Samples/ScreenSpace/uv_color.shader.meta b/Assets/UniGLTF_Samples/ScreenSpace/uv_color.shader.meta similarity index 100% rename from Assets/UniGLTF/Samples/ScreenSpace/uv_color.shader.meta rename to Assets/UniGLTF_Samples/ScreenSpace/uv_color.shader.meta diff --git a/Assets/UniGLTF/Samples/UniHumanoid.meta b/Assets/UniGLTF_Samples/UniHumanoid.meta similarity index 77% rename from Assets/UniGLTF/Samples/UniHumanoid.meta rename to Assets/UniGLTF_Samples/UniHumanoid.meta index dbc08374f..97f2975ad 100644 --- a/Assets/UniGLTF/Samples/UniHumanoid.meta +++ b/Assets/UniGLTF_Samples/UniHumanoid.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9edc7cfd64210934e817c98db16bdaea +guid: 13f6c28ad5b9a4fa98b81e5b3ea95d9a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs b/Assets/UniGLTF_Samples/UniHumanoid/HumanBuilderTest.cs similarity index 100% rename from Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs rename to Assets/UniGLTF_Samples/UniHumanoid/HumanBuilderTest.cs diff --git a/Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs.meta b/Assets/UniGLTF_Samples/UniHumanoid/HumanBuilderTest.cs.meta similarity index 100% rename from Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs.meta rename to Assets/UniGLTF_Samples/UniHumanoid/HumanBuilderTest.cs.meta diff --git a/Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity b/Assets/UniGLTF_Samples/UniHumanoid/PoseTransfer.unity similarity index 100% rename from Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity rename to Assets/UniGLTF_Samples/UniHumanoid/PoseTransfer.unity diff --git a/Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity.meta b/Assets/UniGLTF_Samples/UniHumanoid/PoseTransfer.unity.meta similarity index 100% rename from Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity.meta rename to Assets/UniGLTF_Samples/UniHumanoid/PoseTransfer.unity.meta diff --git a/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs b/Assets/UniGLTF_Samples/UniHumanoid/RuntimeBvhLoader.cs similarity index 100% rename from Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs rename to Assets/UniGLTF_Samples/UniHumanoid/RuntimeBvhLoader.cs diff --git a/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs.meta b/Assets/UniGLTF_Samples/UniHumanoid/RuntimeBvhLoader.cs.meta similarity index 100% rename from Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs.meta rename to Assets/UniGLTF_Samples/UniHumanoid/RuntimeBvhLoader.cs.meta diff --git a/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity b/Assets/UniGLTF_Samples/UniHumanoid/RuntimeBvhLoader.unity similarity index 100% rename from Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity rename to Assets/UniGLTF_Samples/UniHumanoid/RuntimeBvhLoader.unity diff --git a/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity.meta b/Assets/UniGLTF_Samples/UniHumanoid/RuntimeBvhLoader.unity.meta similarity index 100% rename from Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity.meta rename to Assets/UniGLTF_Samples/UniHumanoid/RuntimeBvhLoader.unity.meta diff --git a/Assets/UniGLTF/Samples/UniHumanoid/target.mat b/Assets/UniGLTF_Samples/UniHumanoid/target.mat similarity index 100% rename from Assets/UniGLTF/Samples/UniHumanoid/target.mat rename to Assets/UniGLTF_Samples/UniHumanoid/target.mat diff --git a/Assets/UniGLTF/Samples/UniHumanoid/target.mat.meta b/Assets/UniGLTF_Samples/UniHumanoid/target.mat.meta similarity index 100% rename from Assets/UniGLTF/Samples/UniHumanoid/target.mat.meta rename to Assets/UniGLTF_Samples/UniHumanoid/target.mat.meta diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 82821c128..ff1f47fea 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 22 productGUID: d86624fc877a00d40a0d639083a0270e AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,6 +49,8 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -66,6 +68,12 @@ PlayerSettings: androidRenderOutsideSafeArea: 0 androidUseSwappy: 0 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -117,7 +125,9 @@ PlayerSettings: stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -132,31 +142,6 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 0 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -167,8 +152,13 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} - buildNumber: {} + applicationIdentifier: + Standalone: com.DefaultCompany.UniVRM + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 @@ -185,10 +175,10 @@ PlayerSettings: StripUnusedMeshComponents: 0 VertexChannelCompressionMask: 214 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 + iOSTargetOSVersionString: 11.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 + tvOSTargetOSVersionString: 11.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -222,8 +212,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -241,10 +231,19 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: 00000000000000000000000000000000 templatePackageId: templateDefaultScene: + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 5 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: @@ -261,6 +260,10 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] @@ -306,7 +309,10 @@ PlayerSettings: m_GraphicsJobMode: 0 - m_BuildTarget: XboxOnePlayer m_GraphicsJobMode: 0 - m_BuildTargetGraphicsAPIs: [] + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 m_BuildTargetVRSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 @@ -323,6 +329,7 @@ PlayerSettings: - m_BuildTarget: PS4 m_EncodingQuality: 1 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -332,12 +339,15 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -466,8 +476,11 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -543,31 +556,6 @@ PlayerSettings: ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 - ps5ParamFilePath: - ps5VideoOutPixelFormat: 0 - ps5VideoOutInitialWidth: 1920 - ps5VideoOutOutputMode: 1 - ps5BackgroundImagePath: - ps5StartupImagePath: - ps5Pic2Path: - ps5StartupImagesFolder: - ps5IconImagesFolder: - ps5SaveDataImagePath: - ps5SdkOverride: - ps5BGMPath: - ps5ShareOverlayImagePath: - ps5NPConfigZipPath: - ps5Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ - ps5UseResolutionFallback: 0 - ps5UseAudio3dBackend: 0 - ps5ScriptOptimizationLevel: 2 - ps5Audio3dVirtualSpeakerCount: 14 - ps5UpdateReferencePackage: - ps5disableAutoHideSplash: 0 - ps5OperatingSystemCanDisableSplashScreen: 0 - ps5IncludedModules: [] - ps5SharedBinaryContentLabels: [] - ps5SharedBinarySystemFolders: [] monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} @@ -584,9 +572,10 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: 1: VRM_DEVELOP;UNITY_POST_PROCESSING_STACK_V2;ENABLE_UNITY_COLLECTIONS_CHECKS 7: UNITY_POST_PROCESSING_STACK_V2 @@ -602,6 +591,7 @@ PlayerSettings: 30: UNITY_POST_PROCESSING_STACK_V2 32: UNITY_POST_PROCESSING_STACK_V2 33: UNITY_POST_PROCESSING_STACK_V2 + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} @@ -609,6 +599,9 @@ PlayerSettings: incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + useReferenceAssemblies: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 @@ -644,6 +637,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -671,10 +665,7 @@ PlayerSettings: XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + vrEditorSettings: {} cloudServicesEnabled: {} luminIcon: m_Name: @@ -688,11 +679,12 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 1 + virtualTexturingSupportEnabled: 0 diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 000000000..dca288142 --- /dev/null +++ b/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1