Skip to content

Commit bd101c9

Browse files
committed
VRCSDK2
1 parent 3b28e64 commit bd101c9

12 files changed

+139
-239
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Skinner.unitypackage
1010
/Assets/AssetStoreTools*
1111
/Assets/VRCSDK*
1212
/Assets/Plugins/VRCSDK*
13+
/Assets/VRChat*
1314

1415
# Autogenerated VS/MD solution and project files
1516
ExportedObj/

Assets/Chess/BoardBuffer.mat

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Material:
4040
m_Scale: {x: 1, y: 1}
4141
m_Offset: {x: 0, y: 0}
4242
- _MainTex:
43-
m_Texture: {fileID: 8400000, guid: fdfbe7d98b8700543ac33702fcffc0d4, type: 2}
43+
m_Texture: {fileID: 2800000, guid: 0f78ff14e6fa55248a8b42a0db0ddb1d, type: 3}
4444
m_Scale: {x: 1, y: 1}
4545
m_Offset: {x: 0, y: 0}
4646
- _MetallicGlossMap:

Assets/Chess/Shaders/BoardGen.shader

+1-2
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,11 @@
270270
int2 dest = 0;
271271
doMoveParams(parentBoard, px.x, turn.x,
272272
srcPieceID, src, dest);
273+
if (all(px == uint2(0, 0))) buffer[0] = float4(parentBoard[2]);
273274
uint4 o = doMove(parentBoard, uint(singleUV_ID.z),
274275
srcPieceID, src, dest);
275276

276277
}
277-
278-
//buffer[0] = findParentBoard(2).xyxy;
279278

280279
return col;
281280
}

Assets/Chess/Shaders/Buffer.shader

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
Tags { "RenderType"="Opaque" }
1111
Cull Off
12-
12+
Lighting Off
13+
1314
Pass
1415
{
1516
CGPROGRAM
Binary file not shown.

Assets/Chess/Textures/BoardsGenerated.renderTexture.png.meta

-88
This file was deleted.

Assets/Chessbot.unity

+7-7
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ RenderSettings:
3737
m_ReflectionBounces: 1
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
40-
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
40+
m_Sun: {fileID: 1251413840}
41+
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
4545
m_ObjectHideFlags: 0
4646
serializedVersion: 11
47-
m_GIWorkflowMode: 0
47+
m_GIWorkflowMode: 1
4848
m_GISettings:
4949
serializedVersion: 2
5050
m_BounceScale: 1
@@ -137,7 +137,7 @@ Transform:
137137
m_PrefabAsset: {fileID: 0}
138138
m_GameObject: {fileID: 136967408}
139139
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
140-
m_LocalPosition: {x: 0, y: 0, z: 0}
140+
m_LocalPosition: {x: 0, y: 0, z: -0.5}
141141
m_LocalScale: {x: 1, y: 1, z: 1}
142142
m_Children: []
143143
m_Father: {fileID: 253824772}
@@ -290,7 +290,7 @@ Light:
290290
m_Enabled: 1
291291
serializedVersion: 8
292292
m_Type: 1
293-
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
293+
m_Color: {r: 1, g: 1, b: 1, a: 1}
294294
m_Intensity: 1
295295
m_Range: 10
296296
m_SpotAngle: 30
@@ -423,7 +423,7 @@ MonoBehaviour:
423423
m_Script: {fileID: 11500000, guid: c5525b01a131cd247a10195e02cb959b, type: 3}
424424
m_Name:
425425
m_EditorClassIdentifier:
426-
target: {fileID: 1323191302}
426+
target: {fileID: 2009600864}
427427
--- !u!1 &1343444030
428428
GameObject:
429429
m_ObjectHideFlags: 0
@@ -540,7 +540,7 @@ Transform:
540540
m_PrefabAsset: {fileID: 0}
541541
m_GameObject: {fileID: 1592782417}
542542
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
543-
m_LocalPosition: {x: 0, y: 0, z: 0}
543+
m_LocalPosition: {x: 0, y: 0, z: -0.5}
544544
m_LocalScale: {x: 1, y: 1, z: 1}
545545
m_Children: []
546546
m_Father: {fileID: 2009600868}

Packages/manifest.json

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"com.unity.package-manager-ui": "2.0.8",
77
"com.unity.purchasing": "2.0.3",
88
"com.unity.textmeshpro": "1.4.1",
9+
"com.unity.xr.oculus.standalone": "1.38.4",
10+
"com.unity.xr.openvr.standalone": "1.0.5",
911
"com.unity.modules.ai": "1.0.0",
1012
"com.unity.modules.animation": "1.0.0",
1113
"com.unity.modules.assetbundle": "1.0.0",

ProjectSettings/DynamicsManager.asset

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!55 &1
44
PhysicsManager:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 7
6+
serializedVersion: 10
77
m_Gravity: {x: 0, y: -9.81, z: 0}
88
m_DefaultMaterial: {fileID: 0}
99
m_BounceThreshold: 2
@@ -17,13 +17,17 @@ PhysicsManager:
1717
m_ClothInterCollisionDistance: 0
1818
m_ClothInterCollisionStiffness: 0
1919
m_ContactsGeneration: 1
20-
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
20+
m_LayerCollisionMatrix: dfafffffdfafffffdfafffffffffffffdfafffffc800c0ffffffffffffffffffdfafffffdf09fcffdf09fcffdfafffffc800c0ffdfe9c3ffc820c0ffdfa9ffffdfa9ffffdfa9ffffdf8fffffdf8fffffdf8fffffdf8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
2121
m_AutoSimulation: 1
2222
m_AutoSyncTransforms: 1
23+
m_ReuseCollisionCallbacks: 0
2324
m_ClothInterCollisionSettingsToggle: 0
2425
m_ContactPairsMode: 0
2526
m_BroadphaseType: 0
2627
m_WorldBounds:
2728
m_Center: {x: 0, y: 0, z: 0}
2829
m_Extent: {x: 250, y: 250, z: 250}
2930
m_WorldSubdivisions: 8
31+
m_FrictionType: 0
32+
m_EnableEnhancedDeterminism: 0
33+
m_EnableUnifiedHeightmaps: 1

ProjectSettings/GraphicsSettings.asset

+3-2
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,6 @@ GraphicsSettings:
5757
m_FogKeepExp: 1
5858
m_FogKeepExp2: 1
5959
m_AlbedoSwatchInfos: []
60-
m_LightsUseLinearIntensity: 0
61-
m_LightsUseColorTemperature: 0
60+
m_LightsUseLinearIntensity: 1
61+
m_LightsUseColorTemperature: 1
62+
m_LogWhenShaderIsCompiled: 0

0 commit comments

Comments
 (0)