Fixed a bug where tilda tag crashed the settings file. updated the se…

…ttings file with a colorful show

bin/data/settings.xml

@@ -1,53 +1,54 @@
 <settings>
-	<average_FPS>65</average_FPS>
-	<minimum_FPS>39.9366</minimum_FPS>
+	<average_FPS>45</average_FPS>
+	<minimum_FPS>32.0783</minimum_FPS>
 	<fullscreen__F_>0</fullscreen__F_>
 	<show_gui__G_>1</show_gui__G_>
 	<flip_camera>0</flip_camera>
-	<draw_camera__C_>0</draw_camera__C_>
+	<draw_camera__C_>1</draw_camera__C_>
 	<draw_mode>0</draw_mode>
-	<MODE>Composite      (1)</MODE>
+	<MODE>draw name</MODE>
+	<Source_mode__z_>1</Source_mode__z_>
 	<optical_flow>
-		<strength>19.898</strength>
+		<strength>2.29592</strength>
 		<offset>3</offset>
 		<lambda>0.01</lambda>
-		<threshold>0.044898</threshold>
+		<threshold>0.02</threshold>
 		<inverse_x>0</inverse_x>
 		<inverse_y>0</inverse_y>
 		<time_decay_blur>
-			<decay>0.368596</decay>
+			<do_time_blur>1</do_time_blur>
+			<decay>0.798105</decay>
 			<blur_radius>3</blur_radius>
-		<do_time_blur>0</do_time_blur>
 		</time_decay_blur>
 	</optical_flow>
 	<velocity_mask>
-		<strength>0.280612</strength>
-		<saturation>2.86224</saturation>
+		<strength>3.87755</strength>
+		<saturation>3</saturation>
 		<blur_passes>3</blur_passes>
-		<blur_radius>3.11224</blur_radius>
+		<blur_radius>5</blur_radius>
 	</velocity_mask>
 	<fluid_solver>
 		<reset>0</reset>
-		<speed>16.8367</speed>
-		<cell_size>0.591837</cell_size>
-		<iterations>9</iterations>
-		<viscosity>0.127551</viscosity>
-		<vorticity>0.596939</vorticity>
-		<dissipation>0.00260204</dissipation>
+		<speed>81.6327</speed>
+		<cell_size>0.77551</cell_size>
+		<iterations>37</iterations>
+		<viscosity>0.1</viscosity>
+		<vorticity>0.6</vorticity>
+		<dissipation>0.002</dissipation>
 		<advanced_dissipation>
-			<velocity_offset>-0.00457726</velocity_offset>
+			<velocity_offset>-0.001</velocity_offset>
 			<density_offset>0</density_offset>
 			<temperature_offset>0.005</temperature_offset>
 		</advanced_dissipation>
 		<smoke_buoyancy>
-			<sigma>0.193045</sigma>
+			<sigma>0.05</sigma>
 			<weight>0.05</weight>
 			<ambient_temperature>0</ambient_temperature>
-			<gravity>0.0288137, 0.0256262</gravity>
+			<gravity>0.01, 0</gravity>
 		</smoke_buoyancy>
 		<maximum>
-			<clampForce>0.0869846</clampForce>
-			<density>3.43815</density>
+			<clampForce>0.05</clampForce>
+			<density>2</density>
 			<velocity>4</velocity>
 			<temperature>2</temperature>
 		</maximum>
@@ -56,18 +57,18 @@
 	</fluid_solver>
 	<particle_flow>
 		<active>1</active>
-		<speed>16.8367</speed>
-		<cell_size>0.591837</cell_size>
+		<speed>81.6327</speed>
+		<cell_size>0.77551</cell_size>
 		<birth_chance>0.5</birth_chance>
 		<birth_velocity_chance>0.5</birth_velocity_chance>
-		<lifespan>5</lifespan>
-		<lifespan_spread>0.25</lifespan_spread>
+		<lifespan>1.27551</lifespan>
+		<lifespan_spread>0.270408</lifespan_spread>
 		<mass>1.3</mass>
 		<mass_spread>0.2</mass_spread>
 		<size>10</size>
 		<size_spread>0.75</size_spread>
 		<twinkle_speed>11</twinkle_speed>
-	<spawn_hue>0.719388</spawn_hue>
+		<spawn_hue>0.765306</spawn_hue>
 	</particle_flow>
 	<mouse_left_button>
 		<reset>0</reset>
@@ -83,7 +84,7 @@
 		<draw_flow_res_1>
 			<non_den_vel_tem_prs_ob>2</non_den_vel_tem_prs_ob>
 			<is_temporary>1</is_temporary>
-			<force>-0.000783697, 0, 0, 1</force>
+			<force>-0.000781249, 0, 0, 1</force>
 			<strength>1</strength>
 			<radius>0.035</radius>
 			<edge>1</edge>
@@ -113,7 +114,7 @@
 		<draw_flow_res_1>
 			<non_den_vel_tem_prs_ob>2</non_den_vel_tem_prs_ob>
 			<is_temporary>0</is_temporary>
-			<force>-0.00705329, 0.001443, 0, 1</force>
+			<force>1, 1, 0, 1</force>
 			<strength>1</strength>
 			<radius>0.035</radius>
 			<edge>1</edge>

src/ofApp.cpp

@@ -98,7 +98,7 @@ void ofApp::setupGui() {
 	gui.add(drawMode.set("draw mode", DRAW_COMPOSITE, DRAW_COMPOSITE, DRAW_MOUSE));
 	drawMode.addListener(this, &ofApp::drawModeSetName);
 	gui.add(drawName.set("MODE", "draw name"));
-	gui.add(sourceMode.set("Source mode (`)", SOURCE_KINECT_PS3EYE, SOURCE_KINECT, SOURCE_PS3EYE));
+	gui.add(sourceMode.set("Source mode (z)", SOURCE_KINECT_PS3EYE, SOURCE_KINECT, SOURCE_PS3EYE));
 
 
 	int guiColorSwitch = 0;
@@ -387,7 +387,9 @@ void ofApp::keyPressed(int key) {
 		mouseForces.reset();
 		break;
 
-	case '`': sourceMode.set((sourceMode.get() + 1) % SOURCE_COUNT);
+	case 'z':
+	case 'Z':
+		sourceMode.set((sourceMode.get() + 1) % SOURCE_COUNT);
 		break;
 
 	default: break;