Skip to content

Commit 12446cd

Browse files
committed
minor changes before 1.2 release
1 parent 4f16475 commit 12446cd

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

Fractals Project/Assets/Resources/Apps.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[
22
{
33
"Name": "The Project",
4-
"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.",
4+
"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.\nCertain parameters allow to be animated by right-clicking on their name in the options panel.\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.",
55
"Type": false,
66
"Size": 0,
77
"Date": ""
88
},
99
{
1010
"Name": "Mandelbrot",
11-
"Description": "The Mandelbrot fractal and its Julia Sets.\n\nUse the mouse to move around and the scroll wheel to zoom.\nRight click to display the Julia-Set of the current mouse position.\nReload the application using F5.",
11+
"Description": "The Mandelbrot fractal and its Julia Sets.\nThe colors are generated randomly. To generate a new set of colors press F5 to reload.\n\nUse the mouse to move around and the scroll wheel to zoom.\nRight click to display the Julia-Set of the current mouse position.",
1212
"Type": false,
1313
"Size": 4910,
1414
"Date": "02 FEB"
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"Name": "Menger Sponge",
53-
"Description" : "A 3D version of the Sierpinski Carpet.\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.",
53+
"Description": "A 3D version of the Sierpinski Carpet.\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.",
5454
"Type": true,
5555
"Size": 4500,
5656
"Date": "03 MAY"
@@ -78,7 +78,7 @@
7878
},
7979
{
8080
"Name": "F.R.A.X.",
81-
"Description": "Fly through infinite Menger Sponges with a space ship; An example of a game that uses fractals and ray marching.\n\nUse SHIFT and CTRL to accelerate / decelerate.\nUse W and S for pitch, A and D for yaw and Q and E for roll.",
81+
"Description": "Fly through infinite Menger Sponges with a spaceship; An example of a game that uses fractals and ray marching.\n\nUse SHIFT and CTRL to accelerate / decelerate.\nUse W and S for pitch, A and D for yaw and Q and E for roll.",
8282
"Type": true,
8383
"Size": 8340,
8484
"Date": "10 AUG"

Fractals Project/Assets/Scenes/Audio.unity

+2-2
Original file line numberDiff line numberDiff line change
@@ -604,13 +604,13 @@ Transform:
604604
m_PrefabInstance: {fileID: 0}
605605
m_PrefabAsset: {fileID: 0}
606606
m_GameObject: {fileID: 168359094}
607-
m_LocalRotation: {x: 0, y: 0.0016667427, z: 0, w: 0.9999986}
607+
m_LocalRotation: {x: 0, y: 0.00008726013, z: 0, w: 1}
608608
m_LocalPosition: {x: -0.01666537, y: 0, z: -4.999972}
609609
m_LocalScale: {x: 1, y: 1, z: 1}
610610
m_Children: []
611611
m_Father: {fileID: 0}
612612
m_RootOrder: 0
613-
m_LocalEulerAnglesHint: {x: 0, y: 0.191, z: 0}
613+
m_LocalEulerAnglesHint: {x: 0, y: 0.01, z: 0}
614614
--- !u!114 &168359101
615615
MonoBehaviour:
616616
m_ObjectHideFlags: 0

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Linq;
3-
using UnityEditor;
44
using UnityEngine;
55

66
public class AnimationController : MonoBehaviour {
@@ -15,7 +15,7 @@ private void OnEnable() {
1515

1616
public int Register(float value, float speed, float min, float max, bool osc) {
1717
value = Mathf.Clamp(value, min, max);
18-
int id = GUID.Generate().GetHashCode();
18+
int id = Guid.NewGuid().GetHashCode();
1919
if (osc) speed *= Mathf.PI;
2020
Params p = new Params(value, speed, min, max, osc, value);
2121
animations.Add(id, MapB(p));

Fractals Project/ProjectSettings/ProjectSettings.asset

+2
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ PlayerSettings:
137137
- {fileID: 0}
138138
- {fileID: 0}
139139
- {fileID: 0}
140+
- {fileID: 0}
141+
- {fileID: 0}
140142
metroInputSource: 0
141143
wsaTransparentSwapchain: 0
142144
m_HolographicPauseOnTrackingLoss: 1

0 commit comments

Comments
 (0)