diff --git a/Assets/IMG/Aseprite/LakeSecondary1.aseprite b/Assets/IMG/Aseprite/LakeSecondary1.aseprite new file mode 100644 index 0000000..17ac2c1 Binary files /dev/null and b/Assets/IMG/Aseprite/LakeSecondary1.aseprite differ diff --git a/Assets/IMG/Aseprite/LakeSecondary1.aseprite.meta b/Assets/IMG/Aseprite/LakeSecondary1.aseprite.meta new file mode 100644 index 0000000..001c582 --- /dev/null +++ b/Assets/IMG/Aseprite/LakeSecondary1.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a8c2533944bdbba47bb1fc6720148705 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/LakeSecondary2.aseprite b/Assets/IMG/Aseprite/LakeSecondary2.aseprite new file mode 100644 index 0000000..4ad815c Binary files /dev/null and b/Assets/IMG/Aseprite/LakeSecondary2.aseprite differ diff --git a/Assets/IMG/Aseprite/LakeSecondary2.aseprite.meta b/Assets/IMG/Aseprite/LakeSecondary2.aseprite.meta new file mode 100644 index 0000000..8b21aef --- /dev/null +++ b/Assets/IMG/Aseprite/LakeSecondary2.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 47bfc8c656696f94a9a73a2d46250672 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/LakeSecondary3.aseprite b/Assets/IMG/Aseprite/LakeSecondary3.aseprite new file mode 100644 index 0000000..4ad815c Binary files /dev/null and b/Assets/IMG/Aseprite/LakeSecondary3.aseprite differ diff --git a/Assets/IMG/Aseprite/LakeSecondary3.aseprite.meta b/Assets/IMG/Aseprite/LakeSecondary3.aseprite.meta new file mode 100644 index 0000000..b43c4de --- /dev/null +++ b/Assets/IMG/Aseprite/LakeSecondary3.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 564a9d81eb6ab76448600829d6eb254c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/RiverSecondary1.aseprite b/Assets/IMG/Aseprite/RiverSecondary1.aseprite new file mode 100644 index 0000000..4ad815c Binary files /dev/null and b/Assets/IMG/Aseprite/RiverSecondary1.aseprite differ diff --git a/Assets/IMG/Aseprite/RiverSecondary1.aseprite.meta b/Assets/IMG/Aseprite/RiverSecondary1.aseprite.meta new file mode 100644 index 0000000..92e50c9 --- /dev/null +++ b/Assets/IMG/Aseprite/RiverSecondary1.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 10738605f6c2016489f9e08bd5f22922 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/RiverSecondary2.aseprite b/Assets/IMG/Aseprite/RiverSecondary2.aseprite new file mode 100644 index 0000000..4ad815c Binary files /dev/null and b/Assets/IMG/Aseprite/RiverSecondary2.aseprite differ diff --git a/Assets/IMG/Aseprite/RiverSecondary2.aseprite.meta b/Assets/IMG/Aseprite/RiverSecondary2.aseprite.meta new file mode 100644 index 0000000..2292e98 --- /dev/null +++ b/Assets/IMG/Aseprite/RiverSecondary2.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b5051524e1572874d8a946e2642f3491 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/RiverSecondary3.aseprite b/Assets/IMG/Aseprite/RiverSecondary3.aseprite new file mode 100644 index 0000000..4ad815c Binary files /dev/null and b/Assets/IMG/Aseprite/RiverSecondary3.aseprite differ diff --git a/Assets/IMG/Aseprite/RiverSecondary3.aseprite.meta b/Assets/IMG/Aseprite/RiverSecondary3.aseprite.meta new file mode 100644 index 0000000..d1a9060 --- /dev/null +++ b/Assets/IMG/Aseprite/RiverSecondary3.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 35b8c1d1d1df32a469095c551336caac +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/TileFrame.aseprite b/Assets/IMG/Aseprite/TileFrame.aseprite new file mode 100644 index 0000000..5b81ecb Binary files /dev/null and b/Assets/IMG/Aseprite/TileFrame.aseprite differ diff --git a/Assets/IMG/Aseprite/TileFrame.aseprite.meta b/Assets/IMG/Aseprite/TileFrame.aseprite.meta new file mode 100644 index 0000000..ca9b4c4 --- /dev/null +++ b/Assets/IMG/Aseprite/TileFrame.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b5f9df49092af65458006cbdd71218c9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/TileMain.aseprite b/Assets/IMG/Aseprite/TileMain.aseprite new file mode 100644 index 0000000..dd9ccb8 Binary files /dev/null and b/Assets/IMG/Aseprite/TileMain.aseprite differ diff --git a/Assets/IMG/Aseprite/TileMain.aseprite.meta b/Assets/IMG/Aseprite/TileMain.aseprite.meta new file mode 100644 index 0000000..7da3f3f --- /dev/null +++ b/Assets/IMG/Aseprite/TileMain.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f36ff50231ea9334490f6a8cbbf4e9a3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/LakeSecondary1.png b/Assets/IMG/LakeSecondary1.png new file mode 100644 index 0000000..52fd1f1 Binary files /dev/null and b/Assets/IMG/LakeSecondary1.png differ diff --git a/Assets/IMG/LakeSecondary1.png.meta b/Assets/IMG/LakeSecondary1.png.meta new file mode 100644 index 0000000..2185ae1 --- /dev/null +++ b/Assets/IMG/LakeSecondary1.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 3f8dab3af8e013346a7db1dd2b144446 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/TileFrame.png b/Assets/IMG/TileFrame.png new file mode 100644 index 0000000..c2771cd Binary files /dev/null and b/Assets/IMG/TileFrame.png differ diff --git a/Assets/IMG/TileFrame.png.meta b/Assets/IMG/TileFrame.png.meta new file mode 100644 index 0000000..a66149b --- /dev/null +++ b/Assets/IMG/TileFrame.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 18480a45caa3ef44baa79e8f13eac878 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/TileMain.png b/Assets/IMG/TileMain.png new file mode 100644 index 0000000..387e73f Binary files /dev/null and b/Assets/IMG/TileMain.png differ diff --git a/Assets/IMG/TileMain.png.meta b/Assets/IMG/TileMain.png.meta new file mode 100644 index 0000000..f2ac571 --- /dev/null +++ b/Assets/IMG/TileMain.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 42a12f98324a60845944b16ffaf6db0a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NoiseGenerator.cs b/Assets/Scripts/NoiseGenerator.cs index 5170309..19d8da1 100644 --- a/Assets/Scripts/NoiseGenerator.cs +++ b/Assets/Scripts/NoiseGenerator.cs @@ -8,7 +8,7 @@ public class NoiseGenerator { Mesh mesh = tile.GetComponent().mesh; Vector3[] vertices = mesh.vertices; - float[] samples = calculateSamples(tile); + float[] samples = calculateSamples(tile, 0.5f); for (int i = 0; i < samples.Length; i++) { vertices[i].y = samples[i] * 5; @@ -20,7 +20,7 @@ public class NoiseGenerator { Mesh mesh = tile.GetComponent().mesh; Vector3[] vertices = mesh.vertices; - float[] samples = calculateSamples(tile); + float[] samples = calculateSamples(tile, 0.5f); for (int i = 0; i < samples.Length; i++) { vertices[i].y = samples[i] * 10; @@ -32,7 +32,7 @@ public class NoiseGenerator { Mesh mesh = tile.GetComponent().mesh; Vector3[] vertices = mesh.vertices; - float[] samples = calculateSamples(tile); + float[] samples = calculateSamples(tile, 0.5f); for (int i = 0; i < samples.Length; i++) { vertices[i].y = samples[i] * 7.5f; @@ -44,7 +44,7 @@ public class NoiseGenerator { Mesh mesh = tile.GetComponent().mesh; Vector3[] vertices = mesh.vertices; - float[] samples = calculateSamples(tile); + float[] samples = calculateSamples(tile, 0.5f); for (int i = 0; i < samples.Length; i++) { vertices[i].y = samples[i] * 7.5f; @@ -56,10 +56,10 @@ public class NoiseGenerator { Mesh mesh = tile.GetComponent().mesh; Vector3[] vertices = mesh.vertices; - float[] samples = calculateSamples(tile); + float[] samples = calculateSamples(tile, 1.5f); for (int i = 0; i < samples.Length; i++) { - vertices[i].y = samples[i] * 7.5f; + vertices[i].y = samples[i] * 2; } applyMesh(tile, vertices, mesh); } @@ -69,7 +69,7 @@ public class NoiseGenerator //Currently no noise. (Objects floating) } - private float[] calculateSamples(GameObject tile) + private float[] calculateSamples(GameObject tile, float modifier) { Mesh mesh = tile.GetComponent().mesh; Vector3[] vertices = mesh.vertices; @@ -80,7 +80,7 @@ public class NoiseGenerator { float xCord = tile.GetComponent().getPosition().x + vertices[i].x / (vertices.Length - 1) * 10; float yCord = tile.GetComponent().getPosition().z + vertices[i].z / (vertices.Length - 1) * 10; - float sample = Mathf.PerlinNoise(xCord, yCord) - 0.5f; + float sample = Mathf.PerlinNoise(xCord, yCord) - modifier; samples[i] = sample; } }