Skip to content

Commit af2320c

Browse files
update Physics Samples
1 parent 71f3f07 commit af2320c

1,219 files changed

Lines changed: 66949 additions & 7218 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

PhysicsSamples/.editorconfig

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
; see http://editorconfig.org/ for docs on this file
2+
3+
root = true
4+
5+
[*]
6+
ignore_if_in_header = This code was generated by a tool|<auto-generated>
7+
indent_style = space
8+
indent_size = 4
9+
; uncomment to help with sharing files across os's (i.e. network share or through local vm)
10+
#end_of_line = lf
11+
; avoid a bom, which causes endless problems with naive text tooling
12+
charset = utf-8
13+
trim_trailing_whitespace = true
14+
insert_final_newline = true
15+
; keeping auto-format enabled helps avoid merge hell for projects without CI-based format validation
16+
disable_auto_format = false
17+
18+
[*.cs]
19+
; uncomment to enable full formatting of c# files
20+
formatters = generic, uncrustify
21+
22+
; [**/Tests/**.asmdef]
23+
; scrape_api = false
24+
25+
; [*.Tests.asmdef]
26+
; scrape_api = false
27+
28+
[*.asmdef]
29+
scrape_api = false
30+
31+
[*.md]
32+
indent_size = 2
33+
; trailing whitespace is unfortunately significant in markdown
34+
trim_trailing_whitespace = false
35+
; uncomment to enable basic formatting of markdown files
36+
#formatters = generic
37+
38+
[{Makefile,makefile}]
39+
; tab characters are part of the Makefile format
40+
indent_style = tab
41+
42+
[*.asmdef]
43+
indent_size = 4
44+
45+
[*.json]
46+
indent_size = 2
47+
48+
[*.{vcproj,bat,cmd,xaml,tt,t4,ttinclude}]
49+
end_of_line = crlf
50+
51+
; this VS-specific stuff is based on experiments to see how VS will modify a file after it has been manually edited.
52+
; the settings are meant to closely match what VS does to minimize unnecessary diffs.
53+
[*.{vcxproj,vcxproj.filters}]
54+
indent_style = space
55+
indent_size = 2
56+
end_of_line = crlf
57+
charset = utf-8-bom
58+
trim_trailing_whitespace = true
59+
insert_final_newline = false
60+
; must be broken out because of 51-char bug (https://github.com/editorconfig/editorconfig-visualstudio/issues/21)
61+
[*.{csproj,pyproj,props,targets}]
62+
indent_style = space
63+
indent_size = 2
64+
end_of_line = crlf
65+
charset = utf-8-bom
66+
trim_trailing_whitespace = true
67+
insert_final_newline = false
68+
[*.{sln,sln.template}]
69+
indent_style = tab
70+
indent_size = 4
71+
end_of_line = crlf
72+
charset = utf-8
73+
trim_trailing_whitespace = true
74+
insert_final_newline = false

UnityPhysicsSamples/Assets/Common/InputActions.cs renamed to PhysicsSamples/Assets/Common/InputActions.cs

Lines changed: 19 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
1-
//------------------------------------------------------------------------------
2-
// <auto-generated>
3-
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.3.0
5-
// from Assets/Common/InputActions.inputactions
6-
//
7-
// Changes to this file may cause incorrect behavior and will be lost if
8-
// the code is regenerated.
9-
// </auto-generated>
10-
//------------------------------------------------------------------------------
1+
// GENERATED AUTOMATICALLY FROM 'Assets/Common/InputActions.inputactions'
112

123
using System;
134
using System.Collections;
145
using System.Collections.Generic;
156
using UnityEngine.InputSystem;
167
using UnityEngine.InputSystem.Utilities;
178

18-
public partial class @InputActions : IInputActionCollection2, IDisposable
9+
public class @InputActions : IInputActionCollection, IDisposable
1910
{
2011
public InputActionAsset asset { get; }
2112
public @InputActions()
@@ -33,35 +24,31 @@ public @InputActions()
3324
""id"": ""351f2ccd-1f9f-44bf-9bec-d62ac5c5f408"",
3425
""expectedControlType"": ""Vector2"",
3526
""processors"": """",
36-
""interactions"": """",
37-
""initialStateCheck"": true
27+
""interactions"": """"
3828
},
3929
{
4030
""name"": ""Look"",
4131
""type"": ""Value"",
4232
""id"": ""6b444451-8a00-4d00-a97e-f47457f736a8"",
4333
""expectedControlType"": ""Vector2"",
4434
""processors"": """",
45-
""interactions"": """",
46-
""initialStateCheck"": true
35+
""interactions"": """"
4736
},
4837
{
4938
""name"": ""Fire"",
5039
""type"": ""Value"",
5140
""id"": ""6c2ab1b8-8984-453a-af3d-a3c78ae1679a"",
5241
""expectedControlType"": ""Button"",
5342
""processors"": """",
54-
""interactions"": """",
55-
""initialStateCheck"": true
43+
""interactions"": """"
5644
},
5745
{
5846
""name"": ""Jump"",
5947
""type"": ""Value"",
6048
""id"": ""69752feb-cc7c-4543-91d2-0ace8d69c4d5"",
6149
""expectedControlType"": """",
6250
""processors"": """",
63-
""interactions"": """",
64-
""initialStateCheck"": true
51+
""interactions"": """"
6552
}
6653
],
6754
""bindings"": [
@@ -231,71 +218,63 @@ public @InputActions()
231218
""id"": ""c95b2375-e6d9-4b88-9c4c-c5e76515df4b"",
232219
""expectedControlType"": ""Vector2"",
233220
""processors"": """",
234-
""interactions"": """",
235-
""initialStateCheck"": true
221+
""interactions"": """"
236222
},
237223
{
238224
""name"": ""Submit"",
239225
""type"": ""Value"",
240226
""id"": ""7607c7b6-cd76-4816-beef-bd0341cfe950"",
241227
""expectedControlType"": ""Button"",
242228
""processors"": """",
243-
""interactions"": """",
244-
""initialStateCheck"": true
229+
""interactions"": """"
245230
},
246231
{
247232
""name"": ""Cancel"",
248233
""type"": ""Value"",
249234
""id"": ""15cef263-9014-4fd5-94d9-4e4a6234a6ef"",
250235
""expectedControlType"": ""Button"",
251236
""processors"": """",
252-
""interactions"": """",
253-
""initialStateCheck"": true
237+
""interactions"": """"
254238
},
255239
{
256240
""name"": ""Point"",
257241
""type"": ""PassThrough"",
258242
""id"": ""32b35790-4ed0-4e9a-aa41-69ac6d629449"",
259243
""expectedControlType"": ""Vector2"",
260244
""processors"": """",
261-
""interactions"": """",
262-
""initialStateCheck"": false
245+
""interactions"": """"
263246
},
264247
{
265248
""name"": ""Click"",
266249
""type"": ""PassThrough"",
267250
""id"": ""3c7022bf-7922-4f7c-a998-c437916075ad"",
268251
""expectedControlType"": """",
269252
""processors"": """",
270-
""interactions"": """",
271-
""initialStateCheck"": false
253+
""interactions"": """"
272254
},
273255
{
274256
""name"": ""ScrollWheel"",
275257
""type"": ""PassThrough"",
276258
""id"": ""0489e84a-4833-4c40-bfae-cea84b696689"",
277259
""expectedControlType"": """",
278260
""processors"": """",
279-
""interactions"": """",
280-
""initialStateCheck"": false
261+
""interactions"": """"
281262
},
282263
{
283264
""name"": ""MiddleClick"",
284265
""type"": ""PassThrough"",
285266
""id"": ""dad70c86-b58c-4b17-88ad-f5e53adf419e"",
286267
""expectedControlType"": """",
287268
""processors"": """",
288-
""interactions"": """",
289-
""initialStateCheck"": false
269+
""interactions"": """"
290270
},
291271
{
292272
""name"": ""RightClick"",
293273
""type"": ""PassThrough"",
294274
""id"": ""44b200b1-1557-4083-816c-b22cbdf77ddf"",
295275
""expectedControlType"": """",
296276
""processors"": """",
297-
""interactions"": """",
298-
""initialStateCheck"": false
277+
""interactions"": """"
299278
}
300279
],
301280
""bindings"": [
@@ -542,44 +521,39 @@ public @InputActions()
542521
""id"": ""1d611fd2-67a0-4ee2-b7a3-96e070d338c8"",
543522
""expectedControlType"": ""Vector2"",
544523
""processors"": """",
545-
""interactions"": """",
546-
""initialStateCheck"": true
524+
""interactions"": """"
547525
},
548526
{
549527
""name"": ""Throttle"",
550528
""type"": ""Value"",
551529
""id"": ""1f2945fb-7e12-4645-a84b-bd123610202e"",
552530
""expectedControlType"": ""Axis"",
553531
""processors"": """",
554-
""interactions"": """",
555-
""initialStateCheck"": true
532+
""interactions"": """"
556533
},
557534
{
558535
""name"": ""Previous"",
559536
""type"": ""Value"",
560537
""id"": ""bec1b536-c041-4325-8ff1-34380f345179"",
561538
""expectedControlType"": """",
562539
""processors"": """",
563-
""interactions"": """",
564-
""initialStateCheck"": true
540+
""interactions"": """"
565541
},
566542
{
567543
""name"": ""Next"",
568544
""type"": ""Value"",
569545
""id"": ""4f50fbd5-6011-4b9c-9146-3be1bd7a7cd9"",
570546
""expectedControlType"": """",
571547
""processors"": """",
572-
""interactions"": """",
573-
""initialStateCheck"": true
548+
""interactions"": """"
574549
},
575550
{
576551
""name"": ""Look"",
577552
""type"": ""Value"",
578553
""id"": ""ceff8213-609d-4166-a10b-77644780add8"",
579554
""expectedControlType"": ""Vector2"",
580555
""processors"": """",
581-
""interactions"": """",
582-
""initialStateCheck"": true
556+
""interactions"": """"
583557
}
584558
],
585559
""bindings"": [
@@ -882,16 +856,6 @@ public void Disable()
882856
{
883857
asset.Disable();
884858
}
885-
public IEnumerable<InputBinding> bindings => asset.bindings;
886-
887-
public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false)
888-
{
889-
return asset.FindAction(actionNameOrId, throwIfNotFound);
890-
}
891-
public int FindBinding(InputBinding bindingMask, out InputAction action)
892-
{
893-
return asset.FindBinding(bindingMask, out action);
894-
}
895859

896860
// CharacterController
897861
private readonly InputActionMap m_CharacterController;
File renamed without changes.

UnityPhysicsSamples/Assets/Common/InputActions.inputactions renamed to PhysicsSamples/Assets/Common/InputActions.inputactions

File renamed without changes.

UnityPhysicsSamples/Assets/Common/InputActions.inputactions.meta renamed to PhysicsSamples/Assets/Common/InputActions.inputactions.meta

File renamed without changes.
File renamed without changes.

UnityPhysicsSamples/Assets/Common/Materials/Colorful.mat renamed to PhysicsSamples/Assets/Common/Materials/Colorful.mat

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Colorful
11-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
1212
m_ShaderKeywords: _SPECULARHIGHLIGHTS_OFF
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 1
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: -1
17-
stringTagMap: {}
16+
m_CustomRenderQueue: 2000
17+
stringTagMap:
18+
RenderType: Opaque
1819
disabledShaderPasses: []
1920
m_SavedProperties:
2021
serializedVersion: 3
@@ -63,12 +64,27 @@ Material:
6364
m_Texture: {fileID: 0}
6465
m_Scale: {x: 1, y: 1}
6566
m_Offset: {x: 0, y: 0}
67+
- unity_Lightmaps:
68+
m_Texture: {fileID: 0}
69+
m_Scale: {x: 1, y: 1}
70+
m_Offset: {x: 0, y: 0}
71+
- unity_LightmapsInd:
72+
m_Texture: {fileID: 0}
73+
m_Scale: {x: 1, y: 1}
74+
m_Offset: {x: 0, y: 0}
75+
- unity_ShadowMasks:
76+
m_Texture: {fileID: 0}
77+
m_Scale: {x: 1, y: 1}
78+
m_Offset: {x: 0, y: 0}
6679
m_Floats:
6780
- _AlphaClip: 0
6881
- _Blend: 0
6982
- _BumpScale: 1
83+
- _ClearCoatMask: 0
84+
- _ClearCoatSmoothness: 0
7085
- _Cull: 2
7186
- _Cutoff: 0.5
87+
- _DetailAlbedoMapScale: 1
7288
- _DetailNormalMapScale: 1
7389
- _DstBlend: 0
7490
- _EnvironmentReflections: 1
@@ -90,9 +106,11 @@ Material:
90106
- _WorkflowMode: 1
91107
- _ZWrite: 1
92108
m_Colors:
109+
- _BaseColor: {r: 1, g: 0.3940544, b: 0.38207546, a: 1}
93110
- _Color: {r: 1, g: 0.39405444, b: 0.3820755, a: 1}
94111
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
95112
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
113+
m_BuildTextureStacks: []
96114
--- !u!114 &3676710219935537556
97115
MonoBehaviour:
98116
m_ObjectHideFlags: 11
@@ -105,4 +123,4 @@ MonoBehaviour:
105123
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
106124
m_Name:
107125
m_EditorClassIdentifier:
108-
version: 1
126+
version: 4

UnityPhysicsSamples/Assets/Common/Materials/Colorful.mat.meta renamed to PhysicsSamples/Assets/Common/Materials/Colorful.mat.meta

File renamed without changes.

0 commit comments

Comments
 (0)