-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20 from gatlanit/NitinDev
Added a bunch of enhancements
- Loading branch information
Showing
16 changed files
with
171 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| [remap] | ||
|
|
||
| importer="wav" | ||
| type="AudioStreamWAV" | ||
| uid="uid://b8b52jn2l67et" | ||
| path="res://.godot/imported/lowRoar.wav-311e4226cc2fc240dcf0ec61d8028f75.sample" | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://assets/audio/lowRoar.wav" | ||
| dest_files=["res://.godot/imported/lowRoar.wav-311e4226cc2fc240dcf0ec61d8028f75.sample"] | ||
|
|
||
| [params] | ||
|
|
||
| force/8_bit=false | ||
| force/mono=false | ||
| force/max_rate=false | ||
| force/max_rate_hz=44100 | ||
| edit/trim=false | ||
| edit/normalize=false | ||
| edit/loop_mode=0 | ||
| edit/loop_begin=0 | ||
| edit/loop_end=-1 | ||
| compress/mode=0 |
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| [remap] | ||
|
|
||
| importer="texture" | ||
| type="CompressedTexture2D" | ||
| uid="uid://cqmuvnxg460uj" | ||
| path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex" | ||
| metadata={ | ||
| "vram_texture": false | ||
| } | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://icon.png" | ||
| dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"] | ||
|
|
||
| [params] | ||
|
|
||
| compress/mode=0 | ||
| compress/high_quality=false | ||
| compress/lossy_quality=0.7 | ||
| compress/hdr_compression=1 | ||
| compress/normal_map=0 | ||
| compress/channel_pack=0 | ||
| mipmaps/generate=false | ||
| mipmaps/limit=-1 | ||
| roughness/mode=0 | ||
| roughness/src_normal="" | ||
| process/fix_alpha_border=true | ||
| process/premult_alpha=false | ||
| process/normal_map_invert_y=false | ||
| process/hdr_as_srgb=false | ||
| process/hdr_clamp_exposure=false | ||
| process/size_limit=0 | ||
| detect_3d/compress_to=1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,26 @@ | ||
| [gd_scene load_steps=4 format=3 uid="uid://2ju31kvpsco2"] | ||
| [gd_scene load_steps=6 format=3 uid="uid://2ju31kvpsco2"] | ||
|
|
||
| [ext_resource type="Texture2D" uid="uid://tyyttj30dscd" path="res://assets/textures/CBMAAbuildingOBJ-150K_u1_v1-2.png" id="1_pkhsg"] | ||
| [ext_resource type="Script" path="res://scenes/scripts/museum.gd" id="1_xfjmg"] | ||
| [ext_resource type="ArrayMesh" uid="uid://c6x4k4cc5e0us" path="res://assets/musuem.obj" id="2_o3x0p"] | ||
|
|
||
| [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m0dr2"] | ||
| albedo_texture = ExtResource("1_pkhsg") | ||
| metallic_specular = 0.0 | ||
|
|
||
| [sub_resource type="BoxShape3D" id="BoxShape3D_v8rbu"] | ||
| size = Vector3(2.12674, 0.572723, 3.18872) | ||
|
|
||
| [node name="Museum" type="Node3D"] | ||
| script = ExtResource("1_xfjmg") | ||
|
|
||
| [node name="Musuem" type="MeshInstance3D" parent="."] | ||
| transform = Transform3D(0.015, 0, 0, 0, 0.015, 0, 0, 0, 0.015, 0, 0, 0) | ||
| material_override = SubResource("StandardMaterial3D_m0dr2") | ||
| mesh = ExtResource("2_o3x0p") | ||
|
|
||
| [node name="Area3D" type="Area3D" parent="."] | ||
|
|
||
| [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"] | ||
| transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0607758, 0.000457913, 0.00182438) | ||
| shape = SubResource("BoxShape3D_v8rbu") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| extends Node3D |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,26 @@ | ||
| extends XROrigin3D | ||
|
|
||
| # Do all controller specific things here | ||
| signal bButton | ||
| signal yButton | ||
|
|
||
| # Called when the node enters the scene tree for the first time. | ||
| func _ready() -> void: | ||
| pass # Replace with function body. | ||
|
|
||
|
|
||
| # Called every frame. 'delta' is the elapsed time since the previous frame. | ||
| func _process(delta: float) -> void: | ||
| pass | ||
|
|
||
| signal thumbVecL(name: String, value: Vector2) | ||
| signal thumbVecR(name: String, value: Vector2) | ||
|
|
||
| # Left buttons (click) | ||
| func _on_left_hand_button_pressed(name: String) -> void: | ||
| pass # Replace with function body. | ||
|
|
||
| if name == "ax_button": | ||
| yButton.emit() | ||
|
|
||
| # Right buttons (click) | ||
| func _on_right_hand_button_pressed(name: String) -> void: | ||
| pass # Replace with function body. | ||
| if name == "by_button": | ||
| bButton.emit() | ||
|
|
||
| # Left buttons (Vector2) | ||
| func _on_left_hand_input_vector_2_changed(name: String, value: Vector2) -> void: | ||
| thumbVecL.emit(name, value) | ||
|
|
||
| # Right buttons (Vector2) | ||
| func _on_right_hand_input_vector_2_changed(name: String, value: Vector2) -> void: | ||
| thumbVecR.emit(name, value) |