Skip to content

Commit 269e28d

Browse files
samhogansamhogan
committed
trees, water chunks, other stuff
1 parent d62b3a2 commit 269e28d

23 files changed

+3369
-35
lines changed

‎Assets/Ground.mat‎

Lines changed: 1 addition & 1 deletion
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: 2800000, guid: 75f47115d7e4f104ebb17357e48d0372, type: 3}
43+
m_Texture: {fileID: 2800000, guid: 00f6b130afb68ec42adace01c949bc80, type: 3}
4444
m_Scale: {x: 1, y: 1}
4545
m_Offset: {x: 0, y: 0}
4646
- _MetallicGlossMap:

‎Assets/Prefabs/Terrain Chunk.prefab‎

Lines changed: 95 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ GameObject:
1414
- component: {fileID: 6546764858940181632}
1515
- component: {fileID: 8747925763076863679}
1616
m_Layer: 8
17-
m_Name: Terrain Chunk
17+
m_Name: Terrain Chunk 1
1818
m_TagString: Untagged
1919
m_Icon: {fileID: 0}
2020
m_NavMeshLayer: 0
@@ -30,7 +30,8 @@ Transform:
3030
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3131
m_LocalPosition: {x: 0, y: 0, z: 0}
3232
m_LocalScale: {x: 1, y: 1, z: 1}
33-
m_Children: []
33+
m_Children:
34+
- {fileID: 5473639230016415418}
3435
m_Father: {fileID: 0}
3536
m_RootOrder: 0
3637
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -107,3 +108,95 @@ MeshCollider:
107108
m_Convex: 0
108109
m_CookingOptions: 30
109110
m_Mesh: {fileID: 0}
111+
--- !u!1 &7134014928305338917
112+
GameObject:
113+
m_ObjectHideFlags: 0
114+
m_CorrespondingSourceObject: {fileID: 0}
115+
m_PrefabInstance: {fileID: 0}
116+
m_PrefabAsset: {fileID: 0}
117+
serializedVersion: 6
118+
m_Component:
119+
- component: {fileID: 5473639230016415418}
120+
- component: {fileID: 2469628709058414621}
121+
- component: {fileID: 299887314897536619}
122+
- component: {fileID: 1130011408861238954}
123+
m_Layer: 8
124+
m_Name: WaterChunk
125+
m_TagString: Untagged
126+
m_Icon: {fileID: 0}
127+
m_NavMeshLayer: 0
128+
m_StaticEditorFlags: 0
129+
m_IsActive: 1
130+
--- !u!4 &5473639230016415418
131+
Transform:
132+
m_ObjectHideFlags: 0
133+
m_CorrespondingSourceObject: {fileID: 0}
134+
m_PrefabInstance: {fileID: 0}
135+
m_PrefabAsset: {fileID: 0}
136+
m_GameObject: {fileID: 7134014928305338917}
137+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
138+
m_LocalPosition: {x: 0, y: 0, z: 0}
139+
m_LocalScale: {x: 1, y: 1, z: 1}
140+
m_Children: []
141+
m_Father: {fileID: 6546764858940181637}
142+
m_RootOrder: 0
143+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
144+
--- !u!33 &2469628709058414621
145+
MeshFilter:
146+
m_ObjectHideFlags: 0
147+
m_CorrespondingSourceObject: {fileID: 0}
148+
m_PrefabInstance: {fileID: 0}
149+
m_PrefabAsset: {fileID: 0}
150+
m_GameObject: {fileID: 7134014928305338917}
151+
m_Mesh: {fileID: 0}
152+
--- !u!23 &299887314897536619
153+
MeshRenderer:
154+
m_ObjectHideFlags: 0
155+
m_CorrespondingSourceObject: {fileID: 0}
156+
m_PrefabInstance: {fileID: 0}
157+
m_PrefabAsset: {fileID: 0}
158+
m_GameObject: {fileID: 7134014928305338917}
159+
m_Enabled: 1
160+
m_CastShadows: 1
161+
m_ReceiveShadows: 1
162+
m_DynamicOccludee: 1
163+
m_MotionVectors: 1
164+
m_LightProbeUsage: 1
165+
m_ReflectionProbeUsage: 1
166+
m_RayTracingMode: 2
167+
m_RenderingLayerMask: 1
168+
m_RendererPriority: 0
169+
m_Materials:
170+
- {fileID: 2100000, guid: 27e363ffb29c033429ecae94c32b315f, type: 2}
171+
m_StaticBatchInfo:
172+
firstSubMesh: 0
173+
subMeshCount: 0
174+
m_StaticBatchRoot: {fileID: 0}
175+
m_ProbeAnchor: {fileID: 0}
176+
m_LightProbeVolumeOverride: {fileID: 0}
177+
m_ScaleInLightmap: 1
178+
m_ReceiveGI: 1
179+
m_PreserveUVs: 0
180+
m_IgnoreNormalsForChartDetection: 0
181+
m_ImportantGI: 0
182+
m_StitchLightmapSeams: 1
183+
m_SelectedEditorRenderState: 3
184+
m_MinimumChartSize: 4
185+
m_AutoUVMaxDistance: 0.5
186+
m_AutoUVMaxAngle: 89
187+
m_LightmapParameters: {fileID: 0}
188+
m_SortingLayerID: 0
189+
m_SortingLayer: 0
190+
m_SortingOrder: 0
191+
--- !u!114 &1130011408861238954
192+
MonoBehaviour:
193+
m_ObjectHideFlags: 0
194+
m_CorrespondingSourceObject: {fileID: 0}
195+
m_PrefabInstance: {fileID: 0}
196+
m_PrefabAsset: {fileID: 0}
197+
m_GameObject: {fileID: 7134014928305338917}
198+
m_Enabled: 1
199+
m_EditorHideFlags: 0
200+
m_Script: {fileID: 11500000, guid: 9e0b4e5c263b16e45b119bf468388ffc, type: 3}
201+
m_Name:
202+
m_EditorClassIdentifier:

‎Assets/Prefabs/Terrain Chunk.prefab.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Prefabs/Water Chunk.prefab‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &6546764858940181633
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 6546764858940181637}
12+
- component: {fileID: 6546764858940181638}
13+
- component: {fileID: 6546764858940181639}
14+
- component: {fileID: 6546764858940181632}
15+
- component: {fileID: 8747925763076863679}
16+
m_Layer: 8
17+
m_Name: Water Chunk
18+
m_TagString: Untagged
19+
m_Icon: {fileID: 0}
20+
m_NavMeshLayer: 0
21+
m_StaticEditorFlags: 0
22+
m_IsActive: 1
23+
--- !u!4 &6546764858940181637
24+
Transform:
25+
m_ObjectHideFlags: 0
26+
m_CorrespondingSourceObject: {fileID: 0}
27+
m_PrefabInstance: {fileID: 0}
28+
m_PrefabAsset: {fileID: 0}
29+
m_GameObject: {fileID: 6546764858940181633}
30+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
31+
m_LocalPosition: {x: 0, y: 0, z: 0}
32+
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_Children: []
34+
m_Father: {fileID: 0}
35+
m_RootOrder: 0
36+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37+
--- !u!33 &6546764858940181638
38+
MeshFilter:
39+
m_ObjectHideFlags: 0
40+
m_CorrespondingSourceObject: {fileID: 0}
41+
m_PrefabInstance: {fileID: 0}
42+
m_PrefabAsset: {fileID: 0}
43+
m_GameObject: {fileID: 6546764858940181633}
44+
m_Mesh: {fileID: 0}
45+
--- !u!23 &6546764858940181639
46+
MeshRenderer:
47+
m_ObjectHideFlags: 0
48+
m_CorrespondingSourceObject: {fileID: 0}
49+
m_PrefabInstance: {fileID: 0}
50+
m_PrefabAsset: {fileID: 0}
51+
m_GameObject: {fileID: 6546764858940181633}
52+
m_Enabled: 1
53+
m_CastShadows: 1
54+
m_ReceiveShadows: 1
55+
m_DynamicOccludee: 1
56+
m_MotionVectors: 1
57+
m_LightProbeUsage: 1
58+
m_ReflectionProbeUsage: 1
59+
m_RayTracingMode: 2
60+
m_RenderingLayerMask: 1
61+
m_RendererPriority: 0
62+
m_Materials:
63+
- {fileID: 2100000, guid: 27e363ffb29c033429ecae94c32b315f, type: 2}
64+
m_StaticBatchInfo:
65+
firstSubMesh: 0
66+
subMeshCount: 0
67+
m_StaticBatchRoot: {fileID: 0}
68+
m_ProbeAnchor: {fileID: 0}
69+
m_LightProbeVolumeOverride: {fileID: 0}
70+
m_ScaleInLightmap: 1
71+
m_ReceiveGI: 1
72+
m_PreserveUVs: 0
73+
m_IgnoreNormalsForChartDetection: 0
74+
m_ImportantGI: 0
75+
m_StitchLightmapSeams: 1
76+
m_SelectedEditorRenderState: 3
77+
m_MinimumChartSize: 4
78+
m_AutoUVMaxDistance: 0.5
79+
m_AutoUVMaxAngle: 89
80+
m_LightmapParameters: {fileID: 0}
81+
m_SortingLayerID: 0
82+
m_SortingLayer: 0
83+
m_SortingOrder: 0
84+
--- !u!114 &6546764858940181632
85+
MonoBehaviour:
86+
m_ObjectHideFlags: 0
87+
m_CorrespondingSourceObject: {fileID: 0}
88+
m_PrefabInstance: {fileID: 0}
89+
m_PrefabAsset: {fileID: 0}
90+
m_GameObject: {fileID: 6546764858940181633}
91+
m_Enabled: 1
92+
m_EditorHideFlags: 0
93+
m_Script: {fileID: 11500000, guid: d3340f3af547c93449467da52ccf2641, type: 3}
94+
m_Name:
95+
m_EditorClassIdentifier:
96+
--- !u!64 &8747925763076863679
97+
MeshCollider:
98+
m_ObjectHideFlags: 0
99+
m_CorrespondingSourceObject: {fileID: 0}
100+
m_PrefabInstance: {fileID: 0}
101+
m_PrefabAsset: {fileID: 0}
102+
m_GameObject: {fileID: 6546764858940181633}
103+
m_Material: {fileID: 0}
104+
m_IsTrigger: 0
105+
m_Enabled: 1
106+
serializedVersion: 3
107+
m_Convex: 0
108+
m_CookingOptions: 30
109+
m_Mesh: {fileID: 0}

‎Assets/Prefabs/Water Chunk.prefab.meta‎

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

‎Assets/Scenes/Game.unity‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ MonoBehaviour:
150150
m_Script: {fileID: 11500000, guid: 547c052d182ba2245a6d8707a82ebe70, type: 3}
151151
m_Name:
152152
m_EditorClassIdentifier:
153-
terrainChunk: {fileID: 6546764858940181633, guid: 0d14f999684cd324db391db25e67d1a4,
153+
terrainChunk: {fileID: 6546764858940181633, guid: 5ce7861e514decf459c0596a9a9e7c6c,
154154
type: 3}
155155
player: {fileID: 1100592808}
156156
--- !u!4 &220957753
@@ -338,8 +338,8 @@ Transform:
338338
m_PrefabAsset: {fileID: 0}
339339
m_GameObject: {fileID: 963194225}
340340
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
341-
m_LocalPosition: {x: 0, y: 0.846, z: -0.191}
342-
m_LocalScale: {x: 1.4285715, y: 1.1111112, z: 1.4285715}
341+
m_LocalPosition: {x: 0, y: 0.9517503, z: -0.19100189}
342+
m_LocalScale: {x: 1.4285715, y: 1.25, z: 1.4285715}
343343
m_Children: []
344344
m_Father: {fileID: 1100592808}
345345
m_RootOrder: 0
@@ -397,8 +397,8 @@ Transform:
397397
m_PrefabAsset: {fileID: 0}
398398
m_GameObject: {fileID: 968069744}
399399
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
400-
m_LocalPosition: {x: 0, y: -1.108888, z: 0}
401-
m_LocalScale: {x: 1.4285715, y: 1.1111112, z: 1.4285715}
400+
m_LocalPosition: {x: 0, y: -1.247499, z: 0}
401+
m_LocalScale: {x: 1.4285715, y: 1.25, z: 1.4285715}
402402
m_Children: []
403403
m_Father: {fileID: 1100592808}
404404
m_RootOrder: 1
@@ -514,8 +514,8 @@ Transform:
514514
m_PrefabAsset: {fileID: 0}
515515
m_GameObject: {fileID: 1100592803}
516516
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
517-
m_LocalPosition: {x: 17.6, y: 31, z: 37.3}
518-
m_LocalScale: {x: 0.7, y: 0.9, z: 0.7}
517+
m_LocalPosition: {x: 17.6, y: 39.3, z: 37.3}
518+
m_LocalScale: {x: 0.7, y: 0.8, z: 0.7}
519519
m_Children:
520520
- {fileID: 963194228}
521521
- {fileID: 968069745}
@@ -536,7 +536,7 @@ CharacterController:
536536
m_Height: 2
537537
m_Radius: 0.5
538538
m_SlopeLimit: 45
539-
m_StepOffset: 0.3
539+
m_StepOffset: 1.1
540540
m_SkinWidth: 0.08
541541
m_MinMoveDistance: 0.001
542542
m_Center: {x: 0, y: 0, z: 0}

‎Assets/Scripts/Block.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ void GetPositions()
3333
public static Dictionary<BlockType, Block> blocks = new Dictionary<BlockType, Block>(){
3434
{BlockType.Grass, new Block(Tile.Grass, Tile.GrassSide, Tile.Dirt)},
3535
{BlockType.Dirt, new Block(Tile.Dirt)},
36+
{BlockType.Stone, new Block(Tile.Stone)},
37+
{BlockType.Trunk, new Block(Tile.TreeCX, Tile.TreeSide, Tile.TreeCX)},
38+
{BlockType.Leaves, new Block(Tile.Leaves)},
3639
};
3740
}
3841

39-
public enum BlockType {Air, Dirt, Grass}
42+
public enum BlockType {Air, Dirt, Grass, Stone, Trunk, Leaves}

0 commit comments

Comments
 (0)