Skip to content

Commit 2dda0c0

Browse files
committed
small updates for video
1 parent c8aa4f2 commit 2dda0c0

File tree

5 files changed

+250
-22
lines changed

5 files changed

+250
-22
lines changed

Assets/Ground.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Material:
6161
- _DetailNormalMapScale: 1
6262
- _DstBlend: 0
6363
- _GlossMapScale: 1
64-
- _Glossiness: 0.5
64+
- _Glossiness: 0.05
6565
- _GlossyReflections: 1
6666
- _Metallic: 0
6767
- _Mode: 0

Assets/Scenes/Game.unity

Lines changed: 210 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ MonoBehaviour:
225225
m_EditorClassIdentifier:
226226
terrainChunk: {fileID: 6546764858940181633, guid: 5ce7861e514decf459c0596a9a9e7c6c,
227227
type: 3}
228-
player: {fileID: 1100592808}
228+
player: {fileID: 1120727381}
229229
--- !u!4 &220957753
230230
Transform:
231231
m_ObjectHideFlags: 0
@@ -238,7 +238,7 @@ Transform:
238238
m_LocalScale: {x: 1, y: 1, z: 1}
239239
m_Children: []
240240
m_Father: {fileID: 0}
241-
m_RootOrder: 2
241+
m_RootOrder: 3
242242
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
243243
--- !u!1 &283501330
244244
GameObject:
@@ -273,9 +273,9 @@ RectTransform:
273273
m_Father: {fileID: 846005832}
274274
m_RootOrder: 0
275275
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
276-
m_AnchorMin: {x: 0, y: 0}
277-
m_AnchorMax: {x: 0, y: 0}
278-
m_AnchoredPosition: {x: 0, y: 0}
276+
m_AnchorMin: {x: 0, y: 1}
277+
m_AnchorMax: {x: 0, y: 1}
278+
m_AnchoredPosition: {x: 37.805, y: -36.805}
279279
m_SizeDelta: {x: 61.61, y: 61.61}
280280
m_Pivot: {x: 0.5, y: 0.5}
281281
--- !u!114 &283501332
@@ -378,7 +378,7 @@ Transform:
378378
m_LocalScale: {x: 1, y: 1, z: 1}
379379
m_Children: []
380380
m_Father: {fileID: 0}
381-
m_RootOrder: 4
381+
m_RootOrder: 5
382382
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
383383
--- !u!1 &423268061
384384
GameObject:
@@ -486,9 +486,9 @@ RectTransform:
486486
m_Father: {fileID: 846005832}
487487
m_RootOrder: 3
488488
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
489-
m_AnchorMin: {x: 0, y: 0}
490-
m_AnchorMax: {x: 0, y: 0}
491-
m_AnchoredPosition: {x: 0, y: 0}
489+
m_AnchorMin: {x: 0, y: 1}
490+
m_AnchorMax: {x: 0, y: 1}
491+
m_AnchoredPosition: {x: 239.03, y: -36.805}
492492
m_SizeDelta: {x: 61.61, y: 61.61}
493493
m_Pivot: {x: 0.5, y: 0.5}
494494
--- !u!114 &600948558
@@ -573,7 +573,7 @@ Transform:
573573
m_LocalScale: {x: 1, y: 1, z: 1}
574574
m_Children: []
575575
m_Father: {fileID: 0}
576-
m_RootOrder: 5
576+
m_RootOrder: 6
577577
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
578578
--- !u!1 &705507993
579579
GameObject:
@@ -665,7 +665,7 @@ Transform:
665665
m_LocalScale: {x: 1, y: 1, z: 1}
666666
m_Children: []
667667
m_Father: {fileID: 0}
668-
m_RootOrder: 1
668+
m_RootOrder: 2
669669
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
670670
--- !u!1 &711595655
671671
GameObject:
@@ -773,9 +773,9 @@ RectTransform:
773773
m_Father: {fileID: 846005832}
774774
m_RootOrder: 1
775775
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
776-
m_AnchorMin: {x: 0, y: 0}
777-
m_AnchorMax: {x: 0, y: 0}
778-
m_AnchoredPosition: {x: 0, y: 0}
776+
m_AnchorMin: {x: 0, y: 1}
777+
m_AnchorMax: {x: 0, y: 1}
778+
m_AnchoredPosition: {x: 104.88, y: -36.805}
779779
m_SizeDelta: {x: 61.61, y: 61.61}
780780
m_Pivot: {x: 0.5, y: 0.5}
781781
--- !u!114 &724188298
@@ -906,7 +906,7 @@ GameObject:
906906
m_Icon: {fileID: 0}
907907
m_NavMeshLayer: 0
908908
m_StaticEditorFlags: 0
909-
m_IsActive: 1
909+
m_IsActive: 0
910910
--- !u!224 &846005832
911911
RectTransform:
912912
m_ObjectHideFlags: 0
@@ -1316,13 +1316,13 @@ Transform:
13161316
m_PrefabAsset: {fileID: 0}
13171317
m_GameObject: {fileID: 1100592803}
13181318
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1319-
m_LocalPosition: {x: 17.6, y: 39.3, z: 37.3}
1319+
m_LocalPosition: {x: 17.6, y: 40, z: 37.3}
13201320
m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
13211321
m_Children:
13221322
- {fileID: 963194228}
13231323
- {fileID: 968069745}
13241324
m_Father: {fileID: 0}
1325-
m_RootOrder: 3
1325+
m_RootOrder: 4
13261326
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
13271327
--- !u!143 &1100592809
13281328
CharacterController:
@@ -1342,6 +1342,196 @@ CharacterController:
13421342
m_SkinWidth: 0.08
13431343
m_MinMoveDistance: 0.001
13441344
m_Center: {x: 0, y: 0, z: 0}
1345+
--- !u!1 &1120727380
1346+
GameObject:
1347+
m_ObjectHideFlags: 0
1348+
m_CorrespondingSourceObject: {fileID: 0}
1349+
m_PrefabInstance: {fileID: 0}
1350+
m_PrefabAsset: {fileID: 0}
1351+
serializedVersion: 6
1352+
m_Component:
1353+
- component: {fileID: 1120727381}
1354+
- component: {fileID: 1120727387}
1355+
- component: {fileID: 1120727386}
1356+
- component: {fileID: 1120727385}
1357+
- component: {fileID: 1120727384}
1358+
- component: {fileID: 1120727383}
1359+
- component: {fileID: 1120727382}
1360+
m_Layer: 0
1361+
m_Name: Fly Cam
1362+
m_TagString: MainCamera
1363+
m_Icon: {fileID: 0}
1364+
m_NavMeshLayer: 0
1365+
m_StaticEditorFlags: 0
1366+
m_IsActive: 0
1367+
--- !u!4 &1120727381
1368+
Transform:
1369+
m_ObjectHideFlags: 0
1370+
m_CorrespondingSourceObject: {fileID: 0}
1371+
m_PrefabInstance: {fileID: 0}
1372+
m_PrefabAsset: {fileID: 0}
1373+
m_GameObject: {fileID: 1120727380}
1374+
m_LocalRotation: {x: 0, y: 0.2164396, z: 0, w: 0.97629607}
1375+
m_LocalPosition: {x: 17.6, y: 50.761402, z: 37.166298}
1376+
m_LocalScale: {x: 1, y: 1, z: 1}
1377+
m_Children: []
1378+
m_Father: {fileID: 0}
1379+
m_RootOrder: 1
1380+
m_LocalEulerAnglesHint: {x: 0, y: 25, z: 0}
1381+
--- !u!114 &1120727382
1382+
MonoBehaviour:
1383+
m_ObjectHideFlags: 0
1384+
m_CorrespondingSourceObject: {fileID: 0}
1385+
m_PrefabInstance: {fileID: 0}
1386+
m_PrefabAsset: {fileID: 0}
1387+
m_GameObject: {fileID: 1120727380}
1388+
m_Enabled: 1
1389+
m_EditorHideFlags: 0
1390+
m_Script: {fileID: 11500000, guid: e1d99df73b6820545ab9d9fa7b6e0bfc, type: 3}
1391+
m_Name:
1392+
m_EditorClassIdentifier:
1393+
speed: 10
1394+
--- !u!114 &1120727383
1395+
MonoBehaviour:
1396+
m_ObjectHideFlags: 0
1397+
m_CorrespondingSourceObject: {fileID: 0}
1398+
m_PrefabInstance: {fileID: 0}
1399+
m_PrefabAsset: {fileID: 0}
1400+
m_GameObject: {fileID: 1120727380}
1401+
m_Enabled: 1
1402+
m_EditorHideFlags: 0
1403+
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
1404+
m_Name:
1405+
m_EditorClassIdentifier:
1406+
volumeTrigger: {fileID: 1120727381}
1407+
volumeLayer:
1408+
serializedVersion: 2
1409+
m_Bits: 512
1410+
stopNaNPropagation: 1
1411+
finalBlitToCameraTarget: 0
1412+
antialiasingMode: 0
1413+
temporalAntialiasing:
1414+
jitterSpread: 0.75
1415+
sharpness: 0.25
1416+
stationaryBlending: 0.95
1417+
motionBlending: 0.85
1418+
subpixelMorphologicalAntialiasing:
1419+
quality: 2
1420+
fastApproximateAntialiasing:
1421+
fastMode: 0
1422+
keepAlpha: 0
1423+
fog:
1424+
enabled: 1
1425+
excludeSkybox: 1
1426+
debugLayer:
1427+
lightMeter:
1428+
width: 512
1429+
height: 256
1430+
showCurves: 1
1431+
histogram:
1432+
width: 512
1433+
height: 256
1434+
channel: 3
1435+
waveform:
1436+
exposure: 0.12
1437+
height: 256
1438+
vectorscope:
1439+
size: 256
1440+
exposure: 0.12
1441+
overlaySettings:
1442+
linearDepth: 0
1443+
motionColorIntensity: 4
1444+
motionGridSize: 64
1445+
colorBlindnessType: 0
1446+
colorBlindnessStrength: 1
1447+
m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
1448+
m_ShowToolkit: 0
1449+
m_ShowCustomSorter: 0
1450+
breakBeforeColorGrading: 0
1451+
m_BeforeTransparentBundles: []
1452+
m_BeforeStackBundles: []
1453+
m_AfterStackBundles: []
1454+
--- !u!114 &1120727384
1455+
MonoBehaviour:
1456+
m_ObjectHideFlags: 0
1457+
m_CorrespondingSourceObject: {fileID: 0}
1458+
m_PrefabInstance: {fileID: 0}
1459+
m_PrefabAsset: {fileID: 0}
1460+
m_GameObject: {fileID: 1120727380}
1461+
m_Enabled: 0
1462+
m_EditorHideFlags: 0
1463+
m_Script: {fileID: 11500000, guid: 981d99fd85c97454aa0445295610ff7a, type: 3}
1464+
m_Name:
1465+
m_EditorClassIdentifier:
1466+
groundLayer:
1467+
serializedVersion: 2
1468+
m_Bits: 256
1469+
inv: {fileID: 846005836}
1470+
--- !u!114 &1120727385
1471+
MonoBehaviour:
1472+
m_ObjectHideFlags: 0
1473+
m_CorrespondingSourceObject: {fileID: 0}
1474+
m_PrefabInstance: {fileID: 0}
1475+
m_PrefabAsset: {fileID: 0}
1476+
m_GameObject: {fileID: 1120727380}
1477+
m_Enabled: 0
1478+
m_EditorHideFlags: 0
1479+
m_Script: {fileID: 11500000, guid: e940b6753c425cf47ba994799eeb313a, type: 3}
1480+
m_Name:
1481+
m_EditorClassIdentifier:
1482+
mouseSensitivity: 1
1483+
playerBody: {fileID: 1100592808}
1484+
--- !u!81 &1120727386
1485+
AudioListener:
1486+
m_ObjectHideFlags: 0
1487+
m_CorrespondingSourceObject: {fileID: 0}
1488+
m_PrefabInstance: {fileID: 0}
1489+
m_PrefabAsset: {fileID: 0}
1490+
m_GameObject: {fileID: 1120727380}
1491+
m_Enabled: 1
1492+
--- !u!20 &1120727387
1493+
Camera:
1494+
m_ObjectHideFlags: 0
1495+
m_CorrespondingSourceObject: {fileID: 0}
1496+
m_PrefabInstance: {fileID: 0}
1497+
m_PrefabAsset: {fileID: 0}
1498+
m_GameObject: {fileID: 1120727380}
1499+
m_Enabled: 1
1500+
serializedVersion: 2
1501+
m_ClearFlags: 1
1502+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
1503+
m_projectionMatrixMode: 1
1504+
m_GateFitMode: 2
1505+
m_FOVAxisMode: 0
1506+
m_SensorSize: {x: 36, y: 24}
1507+
m_LensShift: {x: 0, y: 0}
1508+
m_FocalLength: 50
1509+
m_NormalizedViewPortRect:
1510+
serializedVersion: 2
1511+
x: 0
1512+
y: 0
1513+
width: 1
1514+
height: 1
1515+
near clip plane: 0.3
1516+
far clip plane: 1000
1517+
field of view: 65
1518+
orthographic: 0
1519+
orthographic size: 5
1520+
m_Depth: -1
1521+
m_CullingMask:
1522+
serializedVersion: 2
1523+
m_Bits: 4294967295
1524+
m_RenderingPath: -1
1525+
m_TargetTexture: {fileID: 0}
1526+
m_TargetDisplay: 0
1527+
m_TargetEye: 3
1528+
m_HDR: 1
1529+
m_AllowMSAA: 1
1530+
m_AllowDynamicResolution: 0
1531+
m_ForceIntoRT: 0
1532+
m_OcclusionCulling: 1
1533+
m_StereoConvergence: 10
1534+
m_StereoSeparation: 0.022
13451535
--- !u!1 &1156745256
13461536
GameObject:
13471537
m_ObjectHideFlags: 0
@@ -1474,9 +1664,9 @@ RectTransform:
14741664
m_Father: {fileID: 846005832}
14751665
m_RootOrder: 2
14761666
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1477-
m_AnchorMin: {x: 0, y: 0}
1478-
m_AnchorMax: {x: 0, y: 0}
1479-
m_AnchoredPosition: {x: 0, y: 0}
1667+
m_AnchorMin: {x: 0, y: 1}
1668+
m_AnchorMax: {x: 0, y: 1}
1669+
m_AnchoredPosition: {x: 171.95499, y: -36.805}
14801670
m_SizeDelta: {x: 61.61, y: 61.61}
14811671
m_Pivot: {x: 0.5, y: 0.5}
14821672
--- !u!114 &1309318930

Assets/Scripts/CamFly.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
5+
public class CamFly : MonoBehaviour
6+
{
7+
8+
public float speed = 100;
9+
10+
// Start is called before the first frame update
11+
void Start()
12+
{
13+
14+
}
15+
16+
// Update is called once per frame
17+
void Update()
18+
{
19+
transform.position = transform.position + transform.forward * speed * Time.deltaTime;
20+
}
21+
}

Assets/Scripts/CamFly.cs.meta

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

Assets/Scripts/TerrainGenerator.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@ BlockType GetBlockType(int x, int y, int z)
129129
if(caveNoise1 > Mathf.Max(caveMask, .2f))
130130
blockType = BlockType.Air;
131131

132+
/*if(blockType != BlockType.Air)
133+
blockType = BlockType.Stone;*/
134+
135+
//if(blockType == BlockType.Air && noise.GetSimplex(x * 4f, y * 4f, z*4f) < 0)
136+
// blockType = BlockType.Dirt;
132137

133138
//if(Mathf.PerlinNoise(x * .1f, z * .1f) * 10 + y < TerrainChunk.chunkHeight * .5f)
134139
// return BlockType.Grass;
@@ -232,7 +237,8 @@ void GenerateTrees(BlockType[,,] blocks, int x, int z)
232237

233238
for(int j = 0; j < treeHeight; j++)
234239
{
235-
blocks[xPos, y+j, zPos] = BlockType.Trunk;
240+
if(y+j < 64)
241+
blocks[xPos, y+j, zPos] = BlockType.Trunk;
236242
}
237243

238244
int leavesWidth = 1 + (int)(rand.NextDouble() * 6);

0 commit comments

Comments
 (0)