67d9080 · godot-marble_madness_demo

Changed files (10) +126 -21

assets/env/cam_env.tres +6 -0

…	…	@@ -19,8 +19,14 @@ tonemap_exposure = 0.85
19	19	tonemap_white = 1.9
20	20	ss_reflections_enabled = true
21	21	ssao_enabled = true
	22	ssao_intensity2 = 0.0
	23	ssao_bias = 0.001
	24	ssao_light_affect = 1.0
	25	ssao_ao_channel_affect = 1.0
22	26	dof_blur_far_distance = 27.05
23	27	dof_blur_far_transition = 2.99
24	28	dof_blur_far_amount = 0.11
	29	glow_enabled = true
	30	glow_bloom = 1.0
25	31	adjustment_brightness = 0.7
26	32	adjustment_contrast = 2.29

assets/levels/level0/grid.material +0 -0

(no content changes — binary or rename)

assets/levels/level0/grid_brown.material +0 -0

(no content changes — binary or rename)

assets/levels/level0/grid_teal.material +0 -0

(no content changes — binary or rename)

assets/levels/level0/teal.material +0 -0

(no content changes — binary or rename)

levels/scenes/level_0.tscn +4 -1

…	…	@@ -19,6 +19,9 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.178, 1.877, -3.673 )
19	19	[node name="player_ball" parent="." instance=ExtResource( 4 )]
20	20	transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.733258, 2.26544, -8.91449 )
21	21
	22	[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
	23	environment = ExtResource( 9 )
	24
22	25	[node name="player_camera" parent="." instance=ExtResource( 7 )]
23	26	pause_mode = 2
24	27	environment = ExtResource( 9 )
…	…	@@ -29,7 +32,7 @@ player_ball = NodePath("../player_ball")
29	32	transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11.446, 6.01065, -19.7949 )
30	33
31	34	[node name="DirectionalLight" type="DirectionalLight" parent="."]
32		transform = Transform( 1, -1.31134e-07, -7.57103e-08, -7.57103e-08, -0.866025, 0.5, -1.31134e-07, -0.5, -0.866025, 1.23504, 3.53473, -13.0157 )
	35	transform = Transform( 8.74228e-08, -0.5, -0.866025, 7.57103e-08, -0.866025, 0.5, -1, -1.09278e-07, -3.78552e-08, 1.23504, 3.53473, -13.0157 )
33	36	light_specular = 1.087
34	37	light_bake_mode = 0
35	38	shadow_enabled = true

player/ball/player_ball.gd +72 -17

…	…	@@ -1,21 +1,54 @@
1	1	extends RigidBody
2	2
3		var rolling_force = 10
4		var rolling_force_max : float = 50
	3	enum BallPhysicsMode {
	4	FREE_FLY,
	5	ENGINE_PHYSICS_ROLL,
	6	ENGINE_PHYSICS_LINEAR,
	7	PHYSICS_MAX
	8	}
	9
	10	var rolling_force : float = 10.0
	11	var rolling_force_max : float = 50.0
	12
	13	var linear_force : float = 2.0
	14
	15	var freefly_force : float = 3.0
	16
	17	var ball_physics_mode : int = BallPhysicsMode.ENGINE_PHYSICS_LINEAR
5	18	var bFirstPersonCamera = false
6		var bDebugPaused : bool = false
7		var ballCameraOriginalOrigin : Vector3
8	19
9	20	var lVelocity : Label
10	21	var lAngularVelocity : Label
	22	var lBallPhysicsMode : Label
	23	var sldBallFrictionSlider : Slider
11	24
12	25	func _ready():
13	26	lVelocity = get_tree().get_current_scene().get_node("DebugUI").get_node("BallVelocity_Value")
14	27	lAngularVelocity = get_tree().get_current_scene().get_node("DebugUI").get_node("BallAngularVelocity_Value")
	28	lBallPhysicsMode = get_tree().get_current_scene().get_node("DebugUI").get_node("BallPhysicsMode_Value")
	29	sldBallFrictionSlider = get_tree().get_current_scene().get_node("DebugUI").get_node("BallFrictionSlider")
	30
	31	updateBallPhysicsMode()
15	32
16	33	func _process(_delta: float) -> void:
17	34	pass
18	35
	36	func updateBallPhysicsMode() -> void:
	37	if(ball_physics_mode == BallPhysicsMode.FREE_FLY):
	38	lBallPhysicsMode.text = "Free Fly"
	39	self.angular_velocity = Vector3(0, 0, 0)
	40	self.rotation = Vector3(0, 0, 0)
	41	self.linear_velocity = Vector3(0, 0, 0)
	42	self.mode = RigidBody.MODE_STATIC
	43	elif(ball_physics_mode == BallPhysicsMode.ENGINE_PHYSICS_ROLL):
	44	lBallPhysicsMode.text = "Engine Physics (Roll)"
	45	self.physics_material_override.friction = 1.0
	46	self.mode = RigidBody.MODE_RIGID
	47	else:
	48	lBallPhysicsMode.text = "Engine Physics (Linear)"
	49	self.physics_material_override.friction = 0.035
	50	self.mode = RigidBody.MODE_RIGID
	51
19	52	func checkAngularVelocity(delta : float, angVelocity : float, bAdd : bool) -> float:
20	53	if bAdd:
21	54	angVelocity = angVelocity + rolling_force*delta
…	…	@@ -36,9 +69,6 @@ func _physics_process(delta: float) -> void:
36	69	# else:
37	70	# bFirstPersonCamera = true
38	71
39		if bDebugPaused:
40		return
41
42	72	#if false:
43	73	# ballCamera.global_transform.origin = lerp(
44	74	# ballCamera.global_transform.origin,
…	…	@@ -48,22 +78,47 @@ func _physics_process(delta: float) -> void:
48	78	# ballCamera.global_transform.origin,
49	79	# global_transform.origin, 1.0
50	80	# )
51
52	81
	82	if Input.is_action_just_pressed("ball_cycle_physics_mode"):
	83	ball_physics_mode = (ball_physics_mode + 1) % BallPhysicsMode.PHYSICS_MAX
	84	if(ball_physics_mode == BallPhysicsMode.FREE_FLY):
	85	self.mode = RigidBody.MODE_STATIC
	86	else:
	87	self.mode = RigidBody.MODE_RIGID
	88	updateBallPhysicsMode()
53	89
54		#$FloorCheck.global_transform.origin = global_transform.origin
	90
	91	#if(ball_physics_mode == BallPhysicsMode.FREE_FLY):
	92	# return
	93
55	94	if Input.is_action_pressed("ball_roll_up"):
56		# angular_velocity.x = checkAngularVelocity(delta, angular_velocity.x, false)
57		angular_velocity.x = clamp(angular_velocity.x - rolling_forcedelta, rolling_force_max -1, rolling_force_max)
	95	if(ball_physics_mode == BallPhysicsMode.ENGINE_PHYSICS_ROLL):
	96	angular_velocity.x = clamp(angular_velocity.x - rolling_forcedelta, rolling_force_max -1, rolling_force_max)
	97	elif(ball_physics_mode == BallPhysicsMode.FREE_FLY):
	98	self.translate( Vector3(0, 0, -freefly_force) * delta)
	99	else:
	100	linear_velocity.z -= (linear_force * delta);
58	101	elif Input.is_action_pressed("ball_roll_down"):
59		# angular_velocity.x = checkAngularVelocity(delta, angular_velocity.x, true)
60		angular_velocity.x = clamp(angular_velocity.x + rolling_forcedelta, rolling_force_max -1, rolling_force_max)
	102	if(ball_physics_mode == BallPhysicsMode.ENGINE_PHYSICS_ROLL):
	103	angular_velocity.x = clamp(angular_velocity.x + rolling_forcedelta, rolling_force_max -1, rolling_force_max)
	104	elif(ball_physics_mode == BallPhysicsMode.FREE_FLY):
	105	self.translate( Vector3(0, 0, freefly_force) * delta)
	106	else:
	107	linear_velocity.z += (linear_force * delta);
61	108	if Input.is_action_pressed("ball_roll_left"):
62		#angular_velocity.z = checkAngularVelocity(delta, angular_velocity.z, true)
63		angular_velocity.z = clamp(angular_velocity.z + rolling_forcedelta, rolling_force_max -1, rolling_force_max)
	109	if(ball_physics_mode == BallPhysicsMode.ENGINE_PHYSICS_ROLL):
	110	angular_velocity.z = clamp(angular_velocity.z + rolling_forcedelta, rolling_force_max -1, rolling_force_max)
	111	elif(ball_physics_mode == BallPhysicsMode.FREE_FLY):
	112	self.translate( Vector3(-freefly_force, 0, 0) * delta)
	113	else:
	114	linear_velocity.x -= (linear_force * delta);
64	115	elif Input.is_action_pressed("ball_roll_right"):
65		#angular_velocity.z = checkAngularVelocity(delta, angular_velocity.z, false)
66		angular_velocity.z = clamp(angular_velocity.z - rolling_forcedelta, rolling_force_max -1, rolling_force_max)
	116	if(ball_physics_mode == BallPhysicsMode.ENGINE_PHYSICS_ROLL):
	117	angular_velocity.z = clamp(angular_velocity.z - rolling_forcedelta, rolling_force_max -1, rolling_force_max)
	118	elif(ball_physics_mode == BallPhysicsMode.FREE_FLY):
	119	self.translate( Vector3(freefly_force, 0, 0) * delta)
	120	else:
	121	linear_velocity.x += (linear_force * delta);
67	122
68	123	#if Input.is_action_just_pressed("jump") and $FloorCheck.is_colliding():
69	124	# apply_impulse(Vector3(), Vector3.UP*1000)

player/ball/player_ball.tscn +2 -1

…	…	@@ -4,6 +4,7 @@
4	4	[ext_resource path="res://player/ball/player_ball.gd" type="Script" id=2]
5	5
6	6	[sub_resource type="PhysicsMaterial" id=2]
	7	friction = 0.0
7	8	rough = true
8	9
9	10	[sub_resource type="SphereShape" id=1]
…	…	@@ -22,4 +23,4 @@ shape = SubResource( 1 )
22	23	light_color = Color( 0, 0.717647, 1, 1 )
23	24	light_energy = 16.0
24	25	light_bake_mode = 0
25		omni_range = 0.174
	26	omni_range = 0.175

project.godot +6 -1

…	…	@@ -41,6 +41,11 @@ ball_roll_down={
41	41	"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
42	42	]
43	43	}
	44	ball_cycle_physics_mode={
	45	"deadzone": 0.5,
	46	"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":88,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
	47	]
	48	}
44	49	restart_level={
45	50	"deadzone": 0.5,
46	51	"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":82,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
…	…	@@ -69,7 +74,7 @@ camera_zoom_out={
69	74
70	75	[physics]
71	76
72		3d/physics_engine="Bullet"
	77	3d/physics_engine="GodotPhysics"
73	78	3d/active_soft_world=false
74	79
75	80	[rendering]

ui/debug/ball/ui_debug_ball.tscn +36 -1

…	…	@@ -1,4 +1,6 @@
1		[gd_scene format=2]
	1	[gd_scene load_steps=2 format=2]
	2
	3	[sub_resource type="Theme" id=1]
2	4
3	5	[node name="Control" type="Control"]
4	6	anchor_right = 1.0
…	…	@@ -40,3 +42,36 @@ margin_bottom = 91.0
40	42	__meta__ = {
41	43	"_edit_use_anchors_": false
42	44	}
	45
	46	[node name="BallPhysicsMode" type="Label" parent="."]
	47	margin_left = 39.0
	48	margin_top = 102.0
	49	margin_right = 178.0
	50	margin_bottom = 116.0
	51	text = "Ball Physics Mode :"
	52	align = 2
	53	__meta__ = {
	54	"_edit_use_anchors_": false
	55	}
	56
	57	[node name="BallPhysicsMode_Value" type="Label" parent="."]
	58	margin_left = 186.0
	59	margin_top = 102.0
	60	margin_right = 640.0
	61	margin_bottom = 116.0
	62	__meta__ = {
	63	"_edit_use_anchors_": false
	64	}
	65
	66	[node name="BallFrictionSlider" type="HSlider" parent="."]
	67	margin_left = 1347.0
	68	margin_top = 55.0
	69	margin_right = 1595.0
	70	margin_bottom = 71.0
	71	theme = SubResource( 1 )
	72	max_value = 1.0
	73	step = 0.1
	74	scrollable = false
	75	__meta__ = {
	76	"_edit_use_anchors_": false
	77	}

godot-marble_madness_demo commits / 67d9080

Changed files (10) +126 -21