fixes & improvements

Author: srpnt3

Fractals Project/Assets/Resources/Apps.json

@@ -1,7 +1,7 @@
 [
 	{
 		"Name": "The Project",
-		"Description": "This program is a collection of all the fractals, games and other little projects that I have programmed as part of my Matura Paper.\nThe name of the paper is \"Fraktale und ihre Anwendung im Game-Design\". In it I analyze different fractals, explain how I implemented them and discuss different applications.\n\nBy selecting one of the apps on the left a quick description, the controls and some additional info about the app will be displayed. An app can be loaded by clicking the LOAD button on the bottom right of the screen.\nBy pressing R inside an app the Options menu will be opened, in which the parameters and other setting of the app can be modified. The F12 button can be used to take a screenshot. To exit the app simply press ESCAPE or click the arrow on the top left of the screen.\n\nI recommend having a decent graphics card to run this program unless you enjoy stop motion fractals.\n\nThe screenshots are saved at: C:/Users/[User]/AppData/LocalLow/srpnt3/Fractals/screenshots.\n\nThe source code of \"Fractals\" is available on GitHub: https://github.com/srpnt3/Fractals.",
+		"Description": "This program is a collection of all the fractals, games and other little projects that I have programmed as part of my matriculation project (Maturaarbeit).\nThe name of the paper is \"Fraktale und ihre Anwendung im Game-Design\". In it I analyze different fractals, explain how I implemented them and discuss different applications.\n\nBy selecting one of the apps on the left a quick description, the controls and some additional info about the app will be displayed. An app can be loaded by clicking the LOAD button on the bottom right of the screen.\nBy pressing R inside an app the Options menu will be opened, in which the parameters and other setting of the app can be modified. The F12 button can be used to take a screenshot. To exit the app simply press ESCAPE or click the arrow on the top left of the screen.\n\nI recommend having a decent graphics card to run this program unless you enjoy stop motion fractals.\n\nThe screenshots are saved at: C:/Users/[User]/AppData/LocalLow/srpnt3/Fractals/screenshots.\n\nThe source code of \"Fractals\" is available on GitHub: https://github.com/srpnt3/Fractals.",
 		"Type": false,
 		"Size": 0,
 		"Date": ""
@@ -57,7 +57,7 @@
 	},
 	{
 		"Name": "Octahedron Flake",
-		"Description": "A cooler version of the Sierpinski Triangle that consists of octahedrons instead of pyramids.\n\nClick on the screen to toggle between a normal mouse and the camera controls.\nWhile in camera mode use the mouse to turn the fractal and the scroll wheel to zoom.",
+		"Description": "A cooler version of the Sierpinski Triangle that consists of octahedra instead of pyramids.\n\nClick on the screen to toggle between a normal mouse and the camera controls.\nWhile in camera mode use the mouse to turn the fractal and the scroll wheel to zoom.",
 		"Type": true,
 		"Size": 3550,
 		"Date": "05 MAY"

Fractals Project/Assets/Scripts/FRAX/FRAX.compute

@@ -115,7 +115,6 @@ float2 March(Ray ray) {
 	return float2(s / float(steps), length(eye - ray.origin));
 }
 
-// from https://answers.unity.com/questions/142958/compute-distance-from-depth-value.html
 float DecodeDepth(float d) {
 	float a = zFar / (zFar - zNear);
 	float b = zFar * zNear / (zNear - zFar);
@@ -141,11 +140,10 @@ void CSMain (uint3 id : SV_DispatchThreadID) {
 
 	float2 res = March(ray);
 	float4 ao = res.x * accent;
-	if (DecodeDepth(Source[id.xy].w) > res.y) {
+	if (DecodeDepth(Source[id.xy].w) > res.y)
 		Texture[id.xy] = background + ao;
-	} else {
+	else
 		Texture[id.xy] = Source[id.xy];
-	}
 	float a = DecodeDepth(Source[id.xy].w);
 	float b = res.y;
 

Fractals Project/Assets/Scripts/FRAX/ShipController.cs

@@ -27,13 +27,13 @@ private void Start() {
 	private void Update() {
 
 		// update values
-		position[1] = c.throttle * 10;
+		position[1] = c.throttle * 9;
 		UpdateValue(ref position, -3, 20);
-		roll[1] = c.roll * 10;
+		roll[1] = c.roll * 7;
 		UpdateValue(ref roll, -5, 5);
-		yaw[1] = c.yaw * 4;
+		yaw[1] = c.yaw * 3;
 		UpdateValue(ref yaw, -2, 2);
-		pitch[1] = c.pitch * 4;
+		pitch[1] = c.pitch * 3;
 		UpdateValue(ref pitch, -2, 2);
 
 
@@ -51,10 +51,10 @@ private void Update() {
 	private void UpdateValue(ref Vector3 v, float min, float max) { // min and max velocity
 		v[0] += v[1] * Time.deltaTime; // velocity += acceleration
 		if (v[0] < 0) { // |velocity| -= "air resistance"
-			v[0] += v[2] * Time.deltaTime;
+			if (v[1] == 0) v[0] += v[2] * Time.deltaTime;
 			v[0] = Mathf.Clamp(v[0], min, 0);
 		} else if (v[0] > 0) {
-			v[0] -= v[2] * Time.deltaTime;
+			if (v[1] == 0) v[0] -= v[2] * Time.deltaTime;
 			v[0] = Mathf.Clamp(v[0], 0, max);
 		}
 	}

Fractals Project/Assets/Scripts/Mandelbox/Mandelbox.compute

@@ -34,54 +34,45 @@ Data DataConstr(float n, float3 p) {
 
 // sphere fold from http://blog.hvidtfeldts.net/index.php/2011/11/distance-estimated-3d-fractals-vi-the-mandelbox/
 void SphereFold(inout float3 z, inout float dz) {
-
-	float fixedRadius = 1;
-	float fixedRadius2 = fixedRadius * fixedRadius;
-	float minRadius2 = 0.5 * 0.5;
-
+	float fixedRadius = 1, minRadius = 0.5;
+	float fixedRadius2 = pow(fixedRadius, 2), minRadius2 = pow(minRadius, 2);
 	float r2 = dot(z, z);
+	
 	if (fixedRadius < minRadius2) {
 		float temp = (fixedRadius2 / minRadius2);
-		z *= temp;
-		dz *= temp;
+		z *= temp, dz *= temp;
 	} else if (r2 < fixedRadius2) {
-		float temp =(fixedRadius2 / r2);
-		z *= temp;
-		dz *= temp;
+		float temp = (fixedRadius2 / r2);
+		z *= temp, dz *= temp;
 	}
 }
 
 // box fold from http://blog.hvidtfeldts.net/index.php/2011/11/distance-estimated-3d-fractals-vi-the-mandelbox/
-void BoxFold(inout float3 z, inout float dz) {
+void BoxFold(inout float3 z) {
 	float foldingLimit = 1;
 	z = clamp(z, -foldingLimit, foldingLimit) * 2.0 - z;
 }
 
 // orbit trap
-float3 Trap(float3 z, float3 trap) {
+void Trap(float3 z, inout float3 trap) {
 	if (length(z) < length(trap))
 		trap = z;
-	return trap;
 }
 
 // mandelbox distance estimator from http://blog.hvidtfeldts.net/index.php/2011/11/distance-estimated-3d-fractals-vi-the-mandelbox/
 Data DE(float3 p) {
-
-	float3 trap = p;
-	float3 z = p;
+	float3 z = p, trap = p;
 	float dr = 1.0;
-	int i = 0;
-	while (i < Iterations) {
-		BoxFold(z, dr);
-		SphereFold(z, dr);
-		
-		z *= Scale;
-		z += Julia ? C : p;
-		dr = dr * abs(Scale) + 1.0;
+	
+	for (int i = 0; i < Iterations; i++) {
+		BoxFold(z); // box fold
+		SphereFold(z, dr); // sphere fold
 
-		trap = Trap(z, trap);
+		z *= Scale; // scale
+		z += Julia ? C : p; // c
+		dr = dr * abs(Scale) + 1.0; // dr
 
-		i++;
+		Trap(z, trap); // trap
 	}
 
 	return DataConstr(length(z) / abs(dr), trap);
@@ -116,7 +107,6 @@ Data March(Ray ray) {
 		s++; // next iteration
 	}
 
-	//return float3(1 - s / float(steps), length(eye - ray.origin), d.y / 10);
 	return DataConstr(abs(1 - (s / steps)), d.p);
 }
 

Fractals Project/Assets/Scripts/Mandelbulb/Mandelbulb.compute

@@ -22,7 +22,7 @@ bool Alt;
 
 // constants
 static const int steps = 500;
-static const float epsilon = 0.00001;
+static const float epsilon = 0.00004;
 
 // structs
 struct Ray { float3 origin; float3 direction; };
@@ -42,14 +42,13 @@ Ray CreateCameraRay(float2 uv) {
     return CreateRay(origin, direction);
 }
 
+
 // mandelbulb distance estimator from http://blog.hvidtfeldts.net/index.php/2011/09/distance-estimated-3d-fractals-v-the-mandelbulb-different-de-approximations/
 float2 DE(float3 p) {
     float3 z = p;
-	float dr = 1.0;
-	float r = 0.0;
+    float r, dr = 1;
 
-	int i = 0;
-	while(i < Iterations) {
+	for(int i = 0; i < Iterations; i++) {
 		r = length(z);
 
 		if (r > 3) break;
@@ -68,12 +67,10 @@ float2 DE(float3 p) {
 		if (Alt) z = zr * float3(cos(theta) * cos(phi), cos(theta) * sin(phi), sin(theta));
 		else z = zr * float3(sin(theta) * cos(phi), sin(theta) * sin(phi), cos(theta));
 		z += Julia * C + (1 - Julia) * p;
-		
-		// next iteration
-		i++;
 	}
-    float dst = 0.5 * log(r) * r / dr;
-	return float2(dst / 2, sin(i));
+	
+    float dst = 0.1 * log(r) * r / dr;
+	return float2(dst, sin(i));
 }
 
 // cast a ray and return the result

Fractals Project/Assets/Scripts/MengerSponge/MengerSponge.compute

@@ -49,7 +49,7 @@ float DEBox2D(float2 p, float s) {
 	return length(max(d, 0.0)) + min(max(d.x, d.y), 0);
 }
 
-// cross distance estimator from https://iquilezles.org/www/articles/distfunctions/distfunctions.htm
+// cross distance estimator from https://iquilezles.org/www/articles/menger/menger.htm
 float DECross(float3 p, float s) {
 	s = s / 3;
 	float d = DEBox2D(p.xy, s);
@@ -123,6 +123,5 @@ void CSMain (uint3 id : SV_DispatchThreadID) {
 
 	float2 res = March(ray);
 	float4 ao = res.x * float4(0.3, 0.6, 0.7, 1);
-	float4 fog = 1 / (res.y + 1);
 	Texture[id.xy] = Source[id.xy] + ao;
 }

Fractals Project/Assets/Scripts/OctahedronFlake/OctahedronFlake.compute

@@ -34,22 +34,20 @@ float DEOctahedron(float3 p, float s) {
 	return length(float3(q.x, q.y - s + k, q.z - k));
 }
 
-// fold space from http://blog.hvidtfeldts.net/index.php/2011/08/distance-estimated-3d-fractals-iii-folding-space
+// plane fold from http://blog.hvidtfeldts.net/index.php/2011/08/distance-estimated-3d-fractals-iii-folding-space
 float3 Fold(float3 p, float3 n) {
 	return p - 2.0 * min(0.0, dot(p, n)) * n;
 }
 
 // distance to scene
 float DE(float3 p) {
-	int i = 0;
-	while (i < Iterations) {
+	for (int i = 0; i < Iterations; i++) {
 		p *= SizeDec;
 		p = Fold(p, normalize(float3(0, 1, 1)));
 		p = Fold(p, normalize(float3(0, 1, -1)));
 		p = Fold(p, normalize(float3(1, 1, 0)));
 		p = Fold(p, normalize(float3(-1, 1, 0)));
 		p -= float3(0, 1, 0) * Size;
-		i++;
 	}
 	return DEOctahedron(p, Size) / pow(abs(SizeDec), i);
 }

Fractals Project/Assets/Scripts/Utils/AppManager.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using Newtonsoft.Json;
 using TMPro;
 using UnityEngine;

Fractals Project/Assets/Scripts/Utils/ControlsHelper.cs

@@ -82,7 +82,7 @@ public void Update() {
 					// orbit camera controls
 					case App.CameraType.Orbit:
 						Vector3 pos = app.transform.localPosition;
-						float r = pos.magnitude - deltaZoom * Time.smoothDeltaTime * sensitivity / 30;
+						float r = pos.magnitude - deltaZoom * sensitivity / 3000;
 						Vector2 angles = app.CartesianCoordsToSphericalCoords(pos.normalized) + new Vector2(-cursor.x * Time.smoothDeltaTime * sensitivity, -cursor.y * Time.smoothDeltaTime * sensitivity);
 						Vector3 vars = ClampOrbitVars(r, angles);
 						t.localPosition = app.SphericalCoordsToCartesianCoords(vars.x, vars.y) * vars.z;

Fractals Project/Assets/Scripts/Utils/Gradients.cs

@@ -67,7 +67,7 @@ Colors.LCHColor[] LCHGradient(Colors.LCHColor a, Colors.LCHColor b, int s) {
 				deltaH = (b.H - a.H) / (s + 1f);
 			} else {
 				deltaH = -(360f - Mathf.Abs(b.H - a.H)) / (s + 1);
-				deltaH *= Mathf.Sign(b.H - a.H);  // Sign function that H will go around the right way
+				deltaH *= Mathf.Sign(b.H - a.H);  // Sign function so that H will go around the right way
 			}
 
 			// calculate and add the colors

Fractals Project/Assets/Shaders/DepthBuffer.shader

@@ -30,6 +30,8 @@
 			}
 
 			float4 frag(v2f i) : COLOR {
+			
+				// actual important lines:
 				float d = 1 - tex2D(_CameraDepthTexture, i.uv).x;
 				return float4(1, 1, 1, 0) * tex2D(_MainTex, i.uv) + float4(0, 0, 0, d);
 			}

Fractals Project/Packages/manifest.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.3.8",
+    "com.unity.collab-proxy": "1.3.9",
     "com.unity.ext.nunit": "1.0.0",
     "com.unity.ide.rider": "1.2.1",
     "com.unity.ide.visualstudio": "2.0.2",

Fractals Project/Packages/packages-lock.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.unity.collab-proxy": {
-      "version": "1.3.8",
+      "version": "1.3.9",
       "depth": 0,
       "source": "registry",
       "dependencies": {},

Fractals Project/ProjectSettings/PackageManagerSettings.asset

@@ -0,0 +1,43 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EnablePreviewPackages: 0
+  m_EnablePackageDependencies: 0
+  m_AdvancedSettingsExpanded: 1
+  m_ScopedRegistriesSettingsExpanded: 1
+  oneTimeWarningShown: 0
+  m_Registries:
+  - m_Id: main
+    m_Name: 
+    m_Url: https://packages.unity.com
+    m_Scopes: []
+    m_IsDefault: 1
+    m_Capabilities: 7
+  m_UserSelectedRegistryName: 
+  m_UserAddingNewScopedRegistry: 0
+  m_RegistryInfoDraft:
+    m_ErrorMessage: 
+    m_Original:
+      m_Id: 
+      m_Name: 
+      m_Url: 
+      m_Scopes: []
+      m_IsDefault: 0
+      m_Capabilities: 0
+    m_Modified: 0
+    m_Name: 
+    m_Url: 
+    m_Scopes:
+    - 
+    m_SelectedScopeIndex: 0

Fractals Project/ProjectSettings/ProjectSettings.asset

@@ -136,7 +136,6 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
-  - {fileID: 0}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -600,14 +599,17 @@ PlayerSettings:
   webGLDecompressionFallback: 0
   scriptingDefineSymbols:
     1: UNITY_POST_PROCESSING_STACK_V2
+    4: UNITY_POST_PROCESSING_STACK_V2
     7: UNITY_POST_PROCESSING_STACK_V2
     13: UNITY_POST_PROCESSING_STACK_V2
+    14: UNITY_POST_PROCESSING_STACK_V2
     19: UNITY_POST_PROCESSING_STACK_V2
     21: UNITY_POST_PROCESSING_STACK_V2
     25: UNITY_POST_PROCESSING_STACK_V2
     27: UNITY_POST_PROCESSING_STACK_V2
     28: UNITY_POST_PROCESSING_STACK_V2
     29: UNITY_POST_PROCESSING_STACK_V2
+    30: UNITY_POST_PROCESSING_STACK_V2
   platformArchitecture: {}
   scriptingBackend: {}
   il2cppCompilerConfiguration: {}

Fractals Project/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.1.2f1
-m_EditorVersionWithRevision: 2020.1.2f1 (7b32bc54ba47)
+m_EditorVersion: 2020.1.6f1
+m_EditorVersionWithRevision: 2020.1.6f1 (fc477ca6df10)