Skip to content

Commit f9e5365

Browse files
author
flyingrub
committed
update
1 parent f77fd6b commit f9e5365

File tree

15 files changed

+46
-15
lines changed

15 files changed

+46
-15
lines changed

Assets/CC.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ MonoBehaviour:
100100
m_Enabled: 1
101101
m_Settings:
102102
bloom:
103-
intensity: 1
103+
intensity: 0.5
104104
threshold: 1
105105
softKnee: 0.5
106106
radius: 4
@@ -109,7 +109,7 @@ MonoBehaviour:
109109
texture: {fileID: 0}
110110
intensity: 0
111111
colorGrading:
112-
m_Enabled: 1
112+
m_Enabled: 0
113113
m_Settings:
114114
tonemapping:
115115
tonemapper: 1

Assets/HandHandler.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,19 @@ public void OnFrame(object sender, FrameEventArgs args)
3535
float pitch = direction.Pitch * 180.0f / (float)Math.PI;
3636
float roll = normal.Roll * 180.0f / (float)Math.PI;
3737
float yaw = direction.Yaw * 180.0f / (float)Math.PI;
38-
//Debug.Log(handPosition + "||" + newPosition + "||" + roll + "||" + handSpeed);
38+
Debug.Log(pitch + "||" + roll + "||" + yaw + "||" + hand.PinchStrength);
39+
if (hand.PinchStrength > 0.98)
40+
{
41+
timeSinceLastCall = System.DateTime.Now;
42+
Instanciate.singleton.pinch(hand.PinchStrength);
43+
Debug.Log("pinch");
44+
}
3945
if (-60 < roll && roll < 60 && handSpeed.z < - 500)
4046
{
4147
timeSinceLastCall = System.DateTime.Now;
4248
Debug.Log("Hand Up");
4349
Instanciate.singleton.gravityOff();
44-
} else if (-120 < roll && roll > 120 && handSpeed.z > 400)
50+
} else if (-120 < roll && roll > 70 && handSpeed.z > 500)
4551
{
4652
timeSinceLastCall = System.DateTime.Now;
4753
Debug.Log("Hand down");

Assets/Instanciate.cs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ void Update()
126126
c.hueRotate();
127127
}
128128
}
129+
if (Input.GetKeyDown("v"))
130+
{
131+
ScreenCapture.CaptureScreenshot(System.DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss") + ".png");
132+
}
129133
if (dsps.Count > 0)
130134
{
131135
addRandomCube();
@@ -307,9 +311,14 @@ public void addRandomCube()
307311
{
308312
return;
309313
}
310-
Debug.Log("randomCube");
311-
Vector3 pos = Random.onUnitSphere * Random.Range(10, randomRadius) +transform.position;
314+
double x, z, angle;
315+
angle = Random.Range(0.0f, 2f*(float)Math.PI);
316+
x = Math.Cos(angle);
317+
z = Math.Sin(angle);
318+
Vector3 pos = new Vector3((float)x, 0f, (float)z) * Random.Range(15, 15 + randomRadius) + transform.position;
312319
pos.y = 15;
320+
321+
Debug.Log("randomCube" + pos);
313322
Transform randomC = Instantiate(cube, pos , Random.rotation);
314323
randomC.GetComponent<CubeData>().addRandomTorque();
315324
for (int i = 0; i< Random.Range(10,randomSize); i++)
@@ -322,6 +331,11 @@ public void toggleGlobal()
322331
{
323332
isGlobal = !isGlobal;
324333
}
334+
335+
public void pinch(float pinch)
336+
{
337+
toggleGlobal();
338+
}
325339

326340
private void IncreaseTerrain()
327341
{

Assets/RemoveCube.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System.Collections;
2-
using System.Collections.Generic;
1+

32
using UnityEngine;
43

54
public class RemoveCube : MonoBehaviour {

Assets/Scenes/Main.unity

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5370,7 +5370,7 @@ MonoBehaviour:
53705370
maxTorque: 10
53715371
maxForce: 20
53725372
randomRadius: 40
5373-
randomSize: 1000
5373+
randomSize: 500
53745374
currentTime: 0
53755375
PlayerStateEvent: event:/QUALIA
53765376
--- !u!1 &1052342181
@@ -5672,11 +5672,11 @@ MonoBehaviour:
56725672
m_Name:
56735673
m_EditorClassIdentifier:
56745674
m_IsWalking: 0
5675-
m_WalkSpeed: 5
5676-
m_RunSpeed: 10
5675+
m_WalkSpeed: 6
5676+
m_RunSpeed: 8
56775677
m_RunstepLenghten: 0.7
5678-
m_JumpSpeed: 5
5679-
m_StickToGroundForce: 10
5678+
m_JumpSpeed: 7
5679+
m_StickToGroundForce: 6
56805680
m_GravityMultiplier: 2
56815681
m_MouseLook:
56825682
XSensitivity: 2

ProjectSettings/QualitySettings.asset

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ QualitySettings:
191191
blendWeights: 4
192192
textureQuality: 0
193193
anisotropicTextures: 2
194-
antiAliasing: 4
194+
antiAliasing: 0
195195
softParticles: 1
196196
softVegetation: 1
197-
realtimeReflectionProbes: 1
197+
realtimeReflectionProbes: 0
198198
billboardsFaceCameraPosition: 1
199199
vSyncCount: 1
200200
lodBias: 2
@@ -211,4 +211,6 @@ QualitySettings:
211211
resolutionScalingFixedDPIFactor: 1
212212
excludedTargetPlatforms: []
213213
m_PerPlatformDefaultQuality:
214+
Android: 0
214215
Standalone: 0
216+
WebGL: 0

Readme.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Qualia
2+
This project uses Unity, FMod Studio and the Leapmotion.
3+
The soundtrack is also created by me and is (CC BY-SA 2.0)
4+
5+
All cubes represent one audio track in FmodStudio and it's property are modified by the current volume of the track.
6+
7+
![](https://raw.githubusercontent.com/flyingrub/Qualia/master/screens/screen4.png)
8+
![](https://raw.githubusercontent.com/flyingrub/Qualia/master/screens/screen5.png)
9+
![](https://raw.githubusercontent.com/flyingrub/Qualia/master/screens/screen6.png)
10+
![](https://raw.githubusercontent.com/flyingrub/Qualia/master/screens/screen3.png)

screens/screen1.png

1.62 MB
Loading

screens/screen2.png

731 KB
Loading

screens/screen3.png

1.57 MB
Loading

0 commit comments

Comments
 (0)