From a8d721d4bf98da5af5374b190acf2f325bf6d989 Mon Sep 17 00:00:00 2001 From: TheMejmun Date: Sun, 22 Jan 2017 12:20:10 +0100 Subject: [PATCH] Camera bounds and more MainScene --- .../Material/SpawnParticleTrailMaterial.mat | Bin 5056 -> 5056 bytes .../SpawnSplashParticleTrailMaterial.mat | Bin 5056 -> 5060 bytes .../BuildingBlocks/Building_Extractor.prefab | Bin 9184 -> 11936 bytes GGJ17/Assets/Scene/MainScene.unity | Bin 146420 -> 145604 bytes GGJ17/Assets/Script/IsoCamera.cs | 37 +++++++++++++----- GGJ17/Assets/Script/WorldControl.meta | 9 ----- 6 files changed, 28 insertions(+), 18 deletions(-) delete mode 100644 GGJ17/Assets/Script/WorldControl.meta diff --git a/GGJ17/Assets/Material/SpawnParticleTrailMaterial.mat b/GGJ17/Assets/Material/SpawnParticleTrailMaterial.mat index 748137589978611735d4bdfc8baac0179f25a971..1559d83c9f619547ae06a8feca952f94a978783e 100644 GIT binary patch delta 43 ycmX@0en5SLjDVaJ0|P^FL1KAcKw?ozW^ztyNKs;Dj&EW~YEfol&SootHf8`iat_e| delta 43 ycmX@0en5SLjDVaZ0|SFkVrEf5Vo^zEa!zVUQDSC}Z(>PmQD$Ne!)7aiHf8`c)ecVp diff --git a/GGJ17/Assets/Material/SpawnSplashParticleTrailMaterial.mat b/GGJ17/Assets/Material/SpawnSplashParticleTrailMaterial.mat index 748137589978611735d4bdfc8baac0179f25a971..2372b5a9184bfe6561e4e8ebdb129bcd14cb0e98 100644 GIT binary patch delta 66 zcmX@0eng#vfq~-y1B399jT{{uj7K(4y}$xO~k4Jk^@%<)Yu RNiE7u%mK=6b`WS`1^`XK69@nR diff --git a/GGJ17/Assets/Prefab/BuildingBlocks/Building_Extractor.prefab b/GGJ17/Assets/Prefab/BuildingBlocks/Building_Extractor.prefab index ebef92ba5517bdcf98d1ff9bb28b444e8f53734a..62a53f18b7796ad44f38377837985c664df4d516 100644 GIT binary patch delta 1892 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 Mqx~uQkKVQa1>JIGK>z>% delta 12990 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 h5gcjHdK4=JGPriuSX&J*aceq>UkIa{(); Vector3 globalCamForwardDir = transform.forward; Vector3 downProjectedCamForward = Vector3.Project(transform.TransformVector(Vector3.forward), Vector3.down); float m = (transform.position.y - camFocusHeight) / downProjectedCamForward.magnitude; focusPoint = transform.position + globalCamForwardDir * m; } - - // Update is called once per frame - void Update () { + + // Update is called once per frame + void Update() + { #region pan Vector3 localMove = new Vector3(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"), 0); Vector3 groundMove = Vector3.ProjectOnPlane(transform.TransformVector(localMove), Vector3.up); @@ -29,8 +33,8 @@ void Update () { focusPoint += translation; #endregion // poll the mouse - if (Input.GetMouseButton(1)) #region rotate + if (Input.GetMouseButton(1)) { Vector2 rotation = new Vector2(Input.GetAxis("Mouse X"), Input.GetAxis("Mouse Y")); rotation *= rotateSpeed * Time.deltaTime; @@ -42,7 +46,22 @@ void Update () { } #endregion #region zoom - camera.orthographicSize += Input.mouseScrollDelta.y * zoomSpeed * Time.deltaTime; + // reset if out of bounds + if (camera.orthographicSize < zoomMin) + { + camera.orthographicSize = zoomMin; + } + else if (camera.orthographicSize > zoomMax) + { + camera.orthographicSize = zoomMax; + } + // only move if target position is within bounds + float targetZoom = camera.orthographicSize + Input.mouseScrollDelta.y * zoomSpeed * Time.deltaTime; + if ((targetZoom >= zoomMin) && + (targetZoom <= zoomMax)) + { + camera.orthographicSize = targetZoom; + } #endregion } diff --git a/GGJ17/Assets/Script/WorldControl.meta b/GGJ17/Assets/Script/WorldControl.meta deleted file mode 100644 index a651a32..0000000 --- a/GGJ17/Assets/Script/WorldControl.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 026ecd435f5e8484da51e65011b7b01b -folderAsset: yes -timeCreated: 1485043945 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: