Skip to content

Commit

Permalink
Add 3D demo (#191)
Browse files Browse the repository at this point in the history
  • Loading branch information
CedNaru committed Feb 13, 2024
1 parent f21d9e0 commit 228094f
Show file tree
Hide file tree
Showing 56 changed files with 1,094 additions and 343 deletions.
32 changes: 21 additions & 11 deletions demo/.godot/editor/editor_layout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,33 @@ dock_floating={}
dock_split_2=0
dock_split_3=0
dock_hsplit_1=0
dock_hsplit_2=540
dock_hsplit_3=-540
dock_hsplit_2=401
dock_hsplit_3=-270
dock_hsplit_4=0
dock_filesystem_split=0
dock_filesystem_display_mode=0
dock_filesystem_file_sort=0
dock_filesystem_file_list_display_mode=1
dock_filesystem_selected_paths=PackedStringArray("res://addons/gut/fonts/AnonymousPro-Regular.ttf")
dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://addons/", "res://addons/gut/", "res://addons/gut/fonts/")
dock_filesystem_selected_paths=PackedStringArray("res://high_level_2D/FmodNodesTest.tscn")
dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://low_level_2D/", "res://high_level_3D/", "res://high_level_3D/player/", "res://high_level_2D/", "res://addons/", "res://addons/gut/fonts/")
dock_3="Scene,Import"
dock_4="FileSystem"
dock_5="Inspector,Node,History"

[EditorNode]

open_scenes=PackedStringArray("res://low_level/FmodScriptTest.tscn")
current_scene="res://low_level/FmodScriptTest.tscn"
center_split_offset=0
open_scenes=PackedStringArray("res://low_level_2D/FmodScriptTest.tscn", "res://high_level_3D/World.tscn", "res://high_level_2D/FmodNodesTest.tscn")
current_scene="res://high_level_2D/FmodNodesTest.tscn"
center_split_offset=-360
selected_default_debugger_tab_idx=0
selected_main_editor_idx=0
selected_main_editor_idx=2
selected_bottom_panel_item=0

[ScriptEditor]

open_scripts=["res://low_level/FmodTest.gd"]
selected_script="res://low_level/FmodTest.gd"
open_help=[]
open_scripts=["res://high_level_3D/player/Camera.gd", "res://high_level_2D/Emitter.gd", "res://low_level_2D/Emitter.gd", "res://low_level_2D/FmodTest.gd", "res://high_level_3D/FPSCounter.gd", "res://high_level_3D/player/Player.gd", "res://high_level_3D/rollingball.gd", "res://high_level_3D/selfdestroy.gd", "res://high_level_3D/environment/sin_move.gd", "res://high_level_2D/sin_move.gd", "res://high_level_3D/environment/soundcollider.gd"]
selected_script="res://high_level_2D/sin_move.gd"
open_help=["FmodEventEmitter3D", "Node3D", "RigidBody3D", "Time", "Vector3"]
script_split_offset=140
list_split_offset=0

Expand All @@ -47,3 +47,13 @@ list_split_offset=0
open_shaders=[]
split_offset=0
selected_shader=""

[editor_log]

log_filter_0=true
log_filter_2=true
log_filter_1=true
log_filter_3=true
log_filter_4=true
collapse=false
show_search=true
516 changes: 267 additions & 249 deletions demo/.godot/editor/filesystem_cache8

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion demo/.godot/editor/filesystem_update4
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
res://low_level/FmodScriptTest.tscn
res://low_level_2D/FmodScriptTest.tscn
res://low_level_2D/Emitter.gd
res://high_level_3D/World.tscn
res://high_level_3D/selfdestroy.gd
res://high_level_3D/environment/sin_move.gd
res://high_level_2D/FmodNodesTest.tscn
res://high_level_2D/sin_move.gd
37 changes: 34 additions & 3 deletions demo/.godot/editor/project_metadata.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[editor_metadata]

executable_path="C:/Program Files/Godot/godot.exe"
executable_path="D:/Godot/Godot_v4.2-stable_win64.exe"
use_advanced_connections=false

[debug_options]

Expand All @@ -9,9 +10,39 @@ run_reload_scripts=true

[recent_files]

scenes=["res://low_level/FmodScriptTest.tscn"]
scripts=["res://low_level/FmodTest.gd"]
scenes=["res://high_level_2D/FmodNodesTest.tscn", "res://high_level_3D/World.tscn", "res://low_level_2D/FmodScriptTest.tscn", "res://high_level_3D/environment/Floor.tscn", "res://high_level_3D/environment/Ball.tscn", "res://high_level_3D/player/Player.tscn", "res://high_level_3D/environment/World.tscn", "res://high_level_3D/environment/box.tscn", "res://high_level_3D/environment/Wall.tscn", "res://high_level_3D/player/flashlight/Flashlight.tscn"]
scripts=["res://high_level_2D/sin_move.gd", "res://high_level_3D/environment/sin_move.gd", "Time", "res://low_level_2D/Emitter.gd", "Vector3", "RigidBody3D", "Node3D", "FmodEventEmitter3D", "res://high_level_3D/selfdestroy.gd", "res://high_level_2D/Emitter.gd"]

[linked_properties]

Node2D:scale=true
Node3D:scale=true
CharacterBody3D:scale=true
CollisionShape3D:scale=false
Camera3D:scale=true
StaticBody3D:scale=false
MeshInstance3D:scale=false
StandardMaterial3D:uv1_scale=true
StandardMaterial3D:uv2_scale=true
RigidBody3D:scale=true
Label:scale=true
DirectionalLight3D:scale=true
MultiNodeEdit:scale=true
FmodEventEmitter2D:scale=true
FmodListener2D:scale=true
FmodListener3D:scale=true
FmodEventEmitter3D:scale=true
EditorDebuggerRemoteObject:scale=true
Sprite2D:scale=true
CharacterBody2D:scale=true
Area2D:scale=true
CollisionShape2D:scale=true

[dialog_bounds]

project_settings=Rect2(1020, 258, 1125, 875)
create_new_node=Rect2(717, 282, 1125, 875)

[script_setup]

last_selected_language="GDScript"
208 changes: 207 additions & 1 deletion demo/.godot/editor/script_editor_cache.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[res://low_level/FmodTest.gd]
[res://low_level_2D/FmodTest.gd]

state={
"bookmarks": PackedInt32Array(),
Expand All @@ -11,3 +11,209 @@ state={
"selection": false,
"syntax_highlighter": "GDScript"
}

[res://high_level_3D/FPSCounter.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 5,
"scroll_position": 0.0,
"selection": true,
"selection_from_column": 0,
"selection_from_line": 5,
"selection_to_column": 58,
"selection_to_line": 6,
"syntax_highlighter": "GDScript"
}

[res://high_level_3D/player/Player.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 46,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 23,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}

[res://high_level_3D/player/Camera.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 0,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}

[res://high_level_3D/environment/soundcollider.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 12,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}

[res://high_level_3D/rollingball.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 47,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 9,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}

[res://high_level_2D/Emitter.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 13,
"scroll_position": 0.0,
"selection": true,
"selection_from_column": 0,
"selection_from_line": 13,
"selection_to_column": 19,
"selection_to_line": 14,
"syntax_highlighter": "GDScript"
}

[res://high_level_3D/selfdestroy.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 7,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}

[res://low_level_2D/Emitter.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 25,
"scroll_position": 3.0,
"selection": true,
"selection_from_column": 0,
"selection_from_line": 25,
"selection_to_column": 37,
"selection_to_line": 26,
"syntax_highlighter": "GDScript"
}

[res://high_level_3D/environment/sin_move.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 2,
"scroll_position": 0.0,
"selection": true,
"selection_from_column": 0,
"selection_from_line": 2,
"selection_to_column": 36,
"selection_to_line": 4,
"syntax_highlighter": "GDScript"
}

[res://high_level_2D/sin_move.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 28,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 5,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}

[res://low_level_2D/Emitter.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 25,
"scroll_position": 3.0,
"selection": true,
"selection_from_column": 0,
"selection_from_line": 25,
"selection_to_column": 37,
"selection_to_line": 26,
"syntax_highlighter": "GDScript"
}

[res://high_level_3D/environment/sin_move.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 2,
"scroll_position": 0.0,
"selection": true,
"selection_from_column": 0,
"selection_from_line": 2,
"selection_to_column": 36,
"selection_to_line": 4,
"syntax_highlighter": "GDScript"
}

[res://high_level_2D/sin_move.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 28,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 5,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified demo/.godot/uid_cache.bin
Binary file not shown.
19 changes: 0 additions & 19 deletions demo/high_level/Emitter.gd

This file was deleted.

File renamed without changes.
19 changes: 19 additions & 0 deletions demo/high_level_2D/Emitter.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
extends FmodEventEmitter2D

var isPlaying: bool = true

func _process(_delta):
if Input.is_action_just_pressed("space"):
isPlaying = !isPlaying
if(isPlaying):
print("Mower playing")
paused = false
else:
print("Mower paused")
paused = true
elif Input.is_action_just_pressed("kill_event"):
self.queue_free()
if Input.is_action_pressed("engine_power_up"):
self["event_parameter/RPM/value"] = self["event_parameter/RPM/value"] + 10
if Input.is_action_pressed("engine_power_down"):
self["event_parameter/RPM/value"] = self["event_parameter/RPM/value"] - 10
Loading

0 comments on commit 228094f

Please sign in to comment.