Skip to content

Commit 7e0cd7f

Browse files
committed
Update Windows OpenCV linkage.
1 parent 8370a5b commit 7e0cd7f

File tree

5 files changed

+30
-9
lines changed

5 files changed

+30
-9
lines changed

Source/Package/Packages/manifest.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"com.unity.analytics": "3.6.12",
55
"com.unity.ide.visualstudio": "2.0.17",
66
"com.unity.ide.vscode": "1.2.5",
7-
"com.unity.test-framework": "1.1.31",
87
"com.unity.textmeshpro": "3.0.6",
98
"com.unity.timeline": "1.6.4",
109
"com.unity.ugui": "1.0.0",

Source/Package/Packages/packages-lock.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"com.unity.ext.nunit": {
1919
"version": "1.0.6",
20-
"depth": 1,
20+
"depth": 2,
2121
"source": "registry",
2222
"dependencies": {},
2323
"url": "https://packages.unity.com"
@@ -40,7 +40,7 @@
4040
},
4141
"com.unity.test-framework": {
4242
"version": "1.1.31",
43-
"depth": 0,
43+
"depth": 1,
4444
"source": "registry",
4545
"dependencies": {
4646
"com.unity.ext.nunit": "1.0.6",

Source/Package/ProjectSettings/ProjectSettings.asset

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!129 &1
44
PlayerSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 23
6+
serializedVersion: 24
77
productGUID: d36fc35b76c1446deb0a38da78624aca
88
AndroidProfiler: 0
99
AndroidFilterTouchesWhenObscured: 0
@@ -134,7 +134,7 @@ PlayerSettings:
134134
16:10: 1
135135
16:9: 1
136136
Others: 1
137-
bundleVersion: 1.1.3
137+
bundleVersion: 1.1.4
138138
preloadedAssets: []
139139
metroInputSource: 0
140140
wsaTransparentSwapchain: 0
@@ -151,6 +151,7 @@ PlayerSettings:
151151
m_ColorGamuts: 00000000
152152
targetPixelDensity: 30
153153
resolutionScalingMode: 0
154+
resetResolutionOnWindowResize: 0
154155
androidSupportedAspectRatio: 1
155156
androidMaxAspectRatio: 2.1
156157
applicationIdentifier:
@@ -460,6 +461,7 @@ PlayerSettings:
460461
m_Kind: 0
461462
m_SubKind:
462463
m_BuildTargetBatching: []
464+
m_BuildTargetShaderSettings: []
463465
m_BuildTargetGraphicsJobs:
464466
- m_BuildTarget: WindowsStandaloneSupport
465467
m_GraphicsJobs: 0
@@ -510,6 +512,8 @@ PlayerSettings:
510512
m_APIs: 0b00000008000000
511513
m_Automatic: 0
512514
m_BuildTargetVRSettings: []
515+
m_DefaultShaderChunkSizeInMB: 16
516+
m_DefaultShaderChunkCount: 0
513517
openGLRequireES31: 0
514518
openGLRequireES31AEP: 0
515519
openGLRequireES32: 0
@@ -616,7 +620,6 @@ PlayerSettings:
616620
switchReleaseVersion: 0
617621
switchDisplayVersion: 1.0.0
618622
switchStartupUserAccount: 0
619-
switchTouchScreenUsage: 0
620623
switchSupportedLanguagesMask: 0
621624
switchLogoType: 0
622625
switchApplicationErrorCodeCategory:
@@ -658,6 +661,7 @@ PlayerSettings:
658661
switchNativeFsCacheSize: 32
659662
switchIsHoldTypeHorizontal: 0
660663
switchSupportedNpadCount: 8
664+
switchEnableTouchScreen: 1
661665
switchSocketConfigEnabled: 0
662666
switchTcpInitialSendBufferSize: 32
663667
switchTcpInitialReceiveBufferSize: 64
@@ -670,6 +674,7 @@ PlayerSettings:
670674
switchNetworkInterfaceManagerInitializeEnabled: 1
671675
switchPlayerConnectionEnabled: 1
672676
switchUseNewStyleFilepaths: 0
677+
switchUseLegacyFmodPriorities: 1
673678
switchUseMicroSleepForYield: 1
674679
switchEnableRamDiskSupport: 0
675680
switchMicroSleepForYieldTime: 25
@@ -744,6 +749,7 @@ PlayerSettings:
744749
ps4videoRecordingFeaturesUsed: 0
745750
ps4contentSearchFeaturesUsed: 0
746751
ps4CompatibilityPS5: 0
752+
ps4AllowPS5Detection: 0
747753
ps4GPU800MHz: 1
748754
ps4attribEyeToEyeDistanceSettingVR: 0
749755
ps4IncludedModules: []
@@ -768,17 +774,32 @@ PlayerSettings:
768774
webGLLinkerTarget: 0
769775
webGLThreadsSupport: 0
770776
webGLDecompressionFallback: 0
777+
webGLPowerPreference: 2
771778
scriptingDefineSymbols: {}
772779
additionalCompilerArguments: {}
773780
platformArchitecture: {}
774781
scriptingBackend: {}
775782
il2cppCompilerConfiguration: {}
776-
managedStrippingLevel: {}
783+
managedStrippingLevel:
784+
EmbeddedLinux: 1
785+
GameCoreScarlett: 1
786+
GameCoreXboxOne: 1
787+
Lumin: 1
788+
Nintendo Switch: 1
789+
PS4: 1
790+
PS5: 1
791+
Stadia: 1
792+
WebGL: 1
793+
Windows Store Apps: 1
794+
XboxOne: 1
795+
iPhone: 1
796+
tvOS: 1
777797
incrementalIl2cppBuild: {}
778798
suppressCommonWarnings: 1
779799
allowUnsafeCode: 0
780800
useDeterministicCompilation: 1
781801
enableRoslynAnalyzers: 1
802+
selectedPlatform: 0
782803
additionalIl2CppArgs:
783804
scriptingRuntimeVersion: 1
784805
gcIncremental: 1
@@ -857,6 +878,7 @@ PlayerSettings:
857878
m_VersionName:
858879
apiCompatibilityLevel: 6
859880
activeInputHandler: 0
881+
windowsGamepadBackendHint: 0
860882
cloudProjectId:
861883
framebufferDepthMemorylessMode: 0
862884
qualitySettingsNames: []

artoolkitx-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.3
1+
1.1.4

0 commit comments

Comments
 (0)