Merge pull request #16 from ErkMkd/main

Fix network mode

.gitignore

@@ -0,0 +1,2 @@
+/source/__pycache__
+/source/assets_compiled

README.md

@@ -102,7 +102,7 @@ The "Network" mode allows you to control the planes from a third party machine.
 | Fast speed 3 | Right Ctrl + move |
 
 ## Contributors
-* Code & design:
+* Code, design, music / sfx:
   * Eric Kernin
 * 3D graphics: 
   * Jean-Marie Lamarche

network_client_example/client_sample.py

@@ -2,7 +2,6 @@
 # Dogfight Sandbox client example
 # This script show how to use the network mode to controls aircrafts.
 # Before starts this script, Dogfight Sandbox must be running in "Network mode"
-3
 # dogfight_client.py is the library needed to communicate with DogFight sandbox
 
 import dogfight_client as df
@@ -125,9 +124,6 @@ def print_fps():
 # Renderless mode OFF
 df.set_renderless_mode(False)
 
-
-df.set_machine_custom_physics_mode(plane_id, False)
-
 # Wait while Renderless mode setting up
 f = False
 while not f:

network_client_example/client_sample_custom_physics.py

@@ -39,7 +39,7 @@
 x, y, z = plane_state["position"][0], plane_state["position"][1], plane_state["position"][2]
 
 # Put aircraft at altitude 25 m
-y = 25
+y = 45
 
 # Model matrix 3 * 4
 plane_matrix = [1, 0, 0,
@@ -54,23 +54,23 @@
 
 # Custom missile movements
 t = 0
-while not plane_state["wreck"]:
-	#plane_state = df.get_plane_state(plane_id)
+while (not plane_state["wreck"]) and t < 500 * frame_time_step:
+	time.sleep(1/60)
+	plane_state = df.get_plane_state(plane_id)
 	plane_matrix[9] = x
 	plane_matrix[10] = y
 	plane_matrix[11] = z
 	df.update_machine_kinetics(plane_id, plane_matrix, plane_speed_vector)
 	df.update_scene()
 	x = 5 * sin(t*5)
-	y = 25 + (sin(t)) * 5
+	y = 45 + (sin(t)) * 5
 	z = 60 + cos(t*1.256) * 50
 
 	# Compute speed vector
 	plane_speed_vector = [(x-plane_matrix[9]) / frame_time_step, (y - plane_matrix[10]) / frame_time_step, (z - plane_matrix[11]) / frame_time_step]
 
 	t += frame_time_step
 
-
 # Custom physics off
 df.set_machine_custom_physics_mode(plane_id, False)
 

network_client_example/client_sample_missile_custom_physics.py

@@ -68,8 +68,8 @@
 # Custom missile movements
 t = 0
 while not missile_state["wreck"]:
+	time.sleep(1/60)
 	missile_state = df.get_missile_state(missile_id)
-	print(str(y))
 	missile_matrix[9] = x
 	missile_matrix[10] = y
 	missile_matrix[11] = z

network_client_example/dogfight_client.py

@@ -23,7 +23,7 @@ def enable_log():
 def get_running():
 	socket_lib.send_message(str.encode(json.dumps({"command": "GET_RUNNING", "args": {}})))
 	return json.loads((socket_lib.get_answer()).decode())
-
+	
 
 def set_timestep(t):
 	socket_lib.send_message(str.encode(json.dumps({"command": "SET_TIMESTEP", "args": {"timestep": t}})))

source/Machines.py

@@ -1155,7 +1155,7 @@ def update_kinetics(self, dts):
 
         if self.activated:
 
-            self.update_devices(dts)  # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            self.update_devices(dts)
 
             self.life_cptr += dts