Skip to content

Commit c93ba91

Browse files
SamuelAsherRivelloSamuelAsherRivello
committed
Add Unity Input System
1 parent d9883f6 commit c93ba91

28 files changed

+1583
-38
lines changed

‎Unity/Assets/Art/Materials/FloorMaterial.mat

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: FloorMaterial
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
16+
m_LightmapFlags: 4
17+
m_EnableInstancingVariants: 0
18+
m_DoubleSidedGI: 0
19+
m_CustomRenderQueue: -1
20+
stringTagMap:
21+
RenderType: Opaque
22+
disabledShaderPasses: []
23+
m_LockedProperties:
24+
m_SavedProperties:
25+
serializedVersion: 3
26+
m_TexEnvs:
27+
- _BaseMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
31+
- _BumpMap:
32+
m_Texture: {fileID: 0}
33+
m_Scale: {x: 1, y: 1}
34+
m_Offset: {x: 0, y: 0}
35+
- _DetailAlbedoMap:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
- _DetailMask:
40+
m_Texture: {fileID: 0}
41+
m_Scale: {x: 1, y: 1}
42+
m_Offset: {x: 0, y: 0}
43+
- _DetailNormalMap:
44+
m_Texture: {fileID: 0}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
47+
- _EmissionMap:
48+
m_Texture: {fileID: 0}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _MainTex:
52+
m_Texture: {fileID: 0}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
55+
- _MetallicGlossMap:
56+
m_Texture: {fileID: 0}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
59+
- _OcclusionMap:
60+
m_Texture: {fileID: 0}
61+
m_Scale: {x: 1, y: 1}
62+
m_Offset: {x: 0, y: 0}
63+
- _ParallaxMap:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
- _SpecGlossMap:
68+
m_Texture: {fileID: 0}
69+
m_Scale: {x: 1, y: 1}
70+
m_Offset: {x: 0, y: 0}
71+
- unity_Lightmaps:
72+
m_Texture: {fileID: 0}
73+
m_Scale: {x: 1, y: 1}
74+
m_Offset: {x: 0, y: 0}
75+
- unity_LightmapsInd:
76+
m_Texture: {fileID: 0}
77+
m_Scale: {x: 1, y: 1}
78+
m_Offset: {x: 0, y: 0}
79+
- unity_ShadowMasks:
80+
m_Texture: {fileID: 0}
81+
m_Scale: {x: 1, y: 1}
82+
m_Offset: {x: 0, y: 0}
83+
m_Ints: []
84+
m_Floats:
85+
- _AlphaClip: 0
86+
- _AlphaToMask: 0
87+
- _Blend: 0
88+
- _BlendModePreserveSpecular: 1
89+
- _BumpScale: 1
90+
- _ClearCoatMask: 0
91+
- _ClearCoatSmoothness: 0
92+
- _Cull: 2
93+
- _Cutoff: 0.5
94+
- _DetailAlbedoMapScale: 1
95+
- _DetailNormalMapScale: 1
96+
- _DstBlend: 0
97+
- _DstBlendAlpha: 0
98+
- _EnvironmentReflections: 1
99+
- _GlossMapScale: 0
100+
- _Glossiness: 0
101+
- _GlossyReflections: 0
102+
- _Metallic: 0
103+
- _OcclusionStrength: 1
104+
- _Parallax: 0.005
105+
- _QueueOffset: 0
106+
- _ReceiveShadows: 1
107+
- _Smoothness: 0.5
108+
- _SmoothnessTextureChannel: 0
109+
- _SpecularHighlights: 1
110+
- _SrcBlend: 1
111+
- _SrcBlendAlpha: 1
112+
- _Surface: 0
113+
- _WorkflowMode: 1
114+
- _ZWrite: 1
115+
m_Colors:
116+
- _BaseColor: {r: 0.13725491, g: 0.35686275, b: 0.4745098, a: 1}
117+
- _Color: {r: 0.13725491, g: 0.35686275, b: 0.4745098, a: 1}
118+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
119+
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
120+
m_BuildTextureStacks: []
121+
--- !u!114 &4656055993927858532
122+
MonoBehaviour:
123+
m_ObjectHideFlags: 11
124+
m_CorrespondingSourceObject: {fileID: 0}
125+
m_PrefabInstance: {fileID: 0}
126+
m_PrefabAsset: {fileID: 0}
127+
m_GameObject: {fileID: 0}
128+
m_Enabled: 1
129+
m_EditorHideFlags: 0
130+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
131+
m_Name:
132+
m_EditorClassIdentifier:
133+
version: 7

‎Unity/Assets/Art/Materials/FloorMaterial.mat.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Unity/Assets/Art/Materials/PlayerMaterial.mat

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: PlayerMaterial
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords:
15+
- _EMISSION
16+
m_InvalidKeywords: []
17+
m_LightmapFlags: 2
18+
m_EnableInstancingVariants: 0
19+
m_DoubleSidedGI: 0
20+
m_CustomRenderQueue: -1
21+
stringTagMap:
22+
RenderType: Opaque
23+
disabledShaderPasses: []
24+
m_LockedProperties:
25+
m_SavedProperties:
26+
serializedVersion: 3
27+
m_TexEnvs:
28+
- _BaseMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
- _BumpMap:
33+
m_Texture: {fileID: 0}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
36+
- _DetailAlbedoMap:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _DetailMask:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _DetailNormalMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _EmissionMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _MainTex:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _MetallicGlossMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _OcclusionMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _ParallaxMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _SpecGlossMap:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- unity_Lightmaps:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- unity_LightmapsInd:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- unity_ShadowMasks:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
m_Ints: []
85+
m_Floats:
86+
- _AlphaClip: 0
87+
- _AlphaToMask: 0
88+
- _Blend: 0
89+
- _BlendModePreserveSpecular: 1
90+
- _BumpScale: 1
91+
- _ClearCoatMask: 0
92+
- _ClearCoatSmoothness: 0
93+
- _Cull: 2
94+
- _Cutoff: 0.5
95+
- _DetailAlbedoMapScale: 1
96+
- _DetailNormalMapScale: 1
97+
- _DstBlend: 0
98+
- _DstBlendAlpha: 0
99+
- _EnvironmentReflections: 1
100+
- _GlossMapScale: 0
101+
- _Glossiness: 0
102+
- _GlossyReflections: 0
103+
- _Metallic: 0
104+
- _OcclusionStrength: 1
105+
- _Parallax: 0.005
106+
- _QueueOffset: 0
107+
- _ReceiveShadows: 1
108+
- _Smoothness: 0.5
109+
- _SmoothnessTextureChannel: 0
110+
- _SpecularHighlights: 1
111+
- _SrcBlend: 1
112+
- _SrcBlendAlpha: 1
113+
- _Surface: 0
114+
- _WorkflowMode: 1
115+
- _ZWrite: 1
116+
m_Colors:
117+
- _BaseColor: {r: 1, g: 0.8513514, b: 0, a: 1}
118+
- _Color: {r: 1, g: 0.8513514, b: 0, a: 1}
119+
- _EmissionColor: {r: 8, g: 5.73822, b: 0, a: 1}
120+
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
121+
m_BuildTextureStacks: []
122+
--- !u!114 &4656055993927858532
123+
MonoBehaviour:
124+
m_ObjectHideFlags: 11
125+
m_CorrespondingSourceObject: {fileID: 0}
126+
m_PrefabInstance: {fileID: 0}
127+
m_PrefabAsset: {fileID: 0}
128+
m_GameObject: {fileID: 0}
129+
m_Enabled: 1
130+
m_EditorHideFlags: 0
131+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
132+
m_Name:
133+
m_EditorClassIdentifier:
134+
version: 7

‎Unity/Assets/Art/Materials/PlayerMaterial.mat.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Unity/Assets/Scenes/Scene01_Intro.unity

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ GameObject:
136136
- component: {fileID: 64991504}
137137
- component: {fileID: 64991508}
138138
m_Layer: 0
139-
m_Name: Cube
139+
m_Name: Player
140140
m_TagString: Untagged
141141
m_Icon: {fileID: 0}
142142
m_NavMeshLayer: 0
@@ -149,7 +149,7 @@ BoxCollider:
149149
m_PrefabInstance: {fileID: 0}
150150
m_PrefabAsset: {fileID: 0}
151151
m_GameObject: {fileID: 64991503}
152-
m_Material: {fileID: 0}
152+
m_Material: {fileID: 13400000, guid: eb867344092d31549b37acb5acad4651, type: 2}
153153
m_IncludeLayers:
154154
serializedVersion: 2
155155
m_Bits: 0
@@ -183,7 +183,7 @@ MeshRenderer:
183183
m_RenderingLayerMask: 1
184184
m_RendererPriority: 0
185185
m_Materials:
186-
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
186+
- {fileID: 2100000, guid: 1fa23455d092fde4c98eebf58aa37e23, type: 2}
187187
m_StaticBatchInfo:
188188
firstSubMesh: 0
189189
subMeshCount: 0
@@ -468,7 +468,7 @@ BoxCollider:
468468
m_PrefabInstance: {fileID: 0}
469469
m_PrefabAsset: {fileID: 0}
470470
m_GameObject: {fileID: 657373643}
471-
m_Material: {fileID: 0}
471+
m_Material: {fileID: 13400000, guid: d7720957a1f4a6f458281bc4d5dcfdb6, type: 2}
472472
m_IncludeLayers:
473473
serializedVersion: 2
474474
m_Bits: 0
@@ -502,7 +502,7 @@ MeshRenderer:
502502
m_RenderingLayerMask: 1
503503
m_RendererPriority: 0
504504
m_Materials:
505-
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
505+
- {fileID: 2100000, guid: 26d6a93d0492e23429de7946ba024ce3, type: 2}
506506
m_StaticBatchInfo:
507507
firstSubMesh: 0
508508
subMeshCount: 0
@@ -542,7 +542,7 @@ Transform:
542542
serializedVersion: 2
543543
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
544544
m_LocalPosition: {x: 0, y: -2, z: 0}
545-
m_LocalScale: {x: 5, y: 1, z: 5}
545+
m_LocalScale: {x: 9, y: 1, z: 5}
546546
m_ConstrainProportionsScale: 0
547547
m_Children: []
548548
m_Father: {fileID: 0}
@@ -604,6 +604,9 @@ MonoBehaviour:
604604
m_Name:
605605
m_EditorClassIdentifier:
606606
_hudUI: {fileID: 1756644691}
607+
_playerRigidBody: {fileID: 64991508}
608+
_moveSpeed: 3
609+
_jumpSpeed: 5
607610
--- !u!4 &1409149260
608611
Transform:
609612
m_ObjectHideFlags: 0

‎Unity/Assets/Scripts/Runtime/RMC/RMC.MyProject.Runtime.asmdef

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"name": "RMC.MyProject.Runtime",
33
"rootNamespace": "",
4-
"references": [],
4+
"references": [
5+
"GUID:75469ad4d38634e559750d17036d5f7c"
6+
],
57
"includePlatforms": [],
68
"excludePlatforms": [],
79
"allowUnsafeCode": false,

0 commit comments

Comments
 (0)