8000 Gpumenu by ksjfhor · Pull Request #158 · Phazorknight/Cogito · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Gpumenu #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Gpumenu #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1c98ee
enhanced the menu
ksjfhor Apr 8, 2024
85fdd2d
Removed my test light
ksjfhor Apr 8, 2024
62b5239
Delete COGITO/Theme/Cogito_Theme_A.tres
ksjfhor Apr 8, 2024
2578967
Restore the theme
ksjfhor Apr 8, 2024
e2ef150
Further improvments
ksjfhor Apr 14, 2024
a4369b6
see comment
ksjfhor Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 11 additions & 39 deletions COGITO/DemoScenes/COGITO_04_Demo_Lobby.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene load_steps=358 format=3 uid="uid://e31n36p8i6an"]
[gd_scene load_steps=354 format=3 uid="uid://e31n36p8i6an"]

[ext_resource type="Script" path="res://COGITO/SceneManagement/cogito_scene.gd" id="1_dracg"]
[ext_resource type="Texture2D" uid="uid://sdcljx8f5dhj" path="res://COGITO/Assets/hdris/kloofendal_48d_partly_cloudy_puresky_2k.hdr" id="2_a8imk"]
[ext_resource type="Environment" uid="uid://bfqf441f3213a" path="res://COGITO/SceneManagement/WorldEnviroment.tres" id="2_fxdef"]
[ext_resource type="PackedScene" uid="uid://kicjwmh02uwf" path="res://COGITO/PrefabScenes/player.tscn" id="3_mgle8"]
[ext_resource type="Script" path="res://COGITO/InventoryPD/InventoryPD.gd" id="4_0kggm"]
[ext_resource type="PackedScene" uid="uid://0c32kepv0ahx" path="res://COGITO/PrefabScenes/Player_HUD.tscn" id="5_to5tg"]
Expand Down Expand Up @@ -87,41 +87,14 @@
[ext_resource type="PackedScene" uid="uid://bqwcopwwk2x6s" path="res://COGITO/DemoScenes/DemoPrefabs/ksi_steps_single.tscn" id="88_u6glq"]
[ext_resource type="PackedScene" uid="uid://dueiqjrnnwseq" path="res://COGITO/Assets/Models/Kenney/SpaceInterior/GLTF format/KSI_ledge_corner_outer.glb" id="89_ifcfc"]
[ext_resource type="PackedScene" uid="uid://dqw7n4i3g4b7g" path="res://COGITO/Assets/Models/Kenney/SpaceInterior/GLTF format/KSI_ledge_painted.glb" id="90_0bo26"]
[ext_resource type="PackedScene" uid="uid://cwd3g16ep0idw" path="res://COGITO/PrefabScenes/Pickups/pickup_flashlight.tscn" id="91_fk2yu"]
[ext_resource type="PackedScene" uid="uid://c0yox8yh1bexx" path="res://COGITO/PrefabScenes/Pickups/ripped_page_a_pickup.tscn" id="91_qq2p0"]
[ext_resource type="PackedScene" uid="uid://uoru03g0vtp" path="res://COGITO/PrefabScenes/Pickups/ripped_page_b_pickup.tscn" id="92_11u5w"]

[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_wjbty"]
panorama = ExtResource("2_a8imk")

[sub_resource type="Sky" id="Sky_h3ipr"]
sky_material = SubResource("PanoramaSkyMaterial_wjbty")

[sub_resource type="Environment" id="Environment_obnk3"]
background_mode = 2
sky = SubResource("Sky_h3ipr")
sky_rotation = Vector3(0, 1.74533, 0.174533)
ambient_light_sky_contribution = 0.1
ambient_light_energy = 0.2
tonemap_mode = 1
ssao_enabled = true
ssil_enabled = true
glow_enabled = true
glow_intensity = 2.5
glow_strength = 0.37
glow_bloom = 0.2
glow_blend_mode = 0
volumetric_fog_enabled = true
volumetric_fog_density = 0.0
volumetric_fog_ambient_inject = 0.1
volumetric_fog_sky_affect = 0.1
volumetric_fog_temporal_reprojection_amount = 0.85

[sub_resource type="FogMaterial" id="FogMaterial_4avjx"]
density = 0.04
albedo = Color(0.694118, 0.694118, 0.694118, 1)

[sub_resource type="Resource" id="Resource_277ed"]
[sub_resource type="Resource" id="Resource_amq3w"]
resource_local_to_scene = true
script = ExtResource("4_0kggm")
inventory_slots = Array[Resource("res://COGITO/InventoryPD/CustomResources/InventorySlotPD.gd")]([null, null, null, null, null, null, null, null])
Expand Down Expand Up @@ -820,7 +793,7 @@ shadow_mesh = SubResource("ArrayMesh_70jo1")
points = PackedVector3Array(10, 0.05, 17.5, 10, -0.05, 17.5, 10, 0.05, -17.5, -10, 0.05, 17.5, -10, -0.05, 17.5, 10, -0.05, -17.5, -10, 0.05, -17.5, -10, -0.05, -17.5)

[sub_resource type="BoxMesh" id="BoxMesh_wtwgn"]
size = Vector3(20, 0.1, 35)
size = Vector3(20, 2, 35)

[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fjvk2"]
resource_name = "glass"
Expand Down Expand Up @@ -3247,14 +3220,14 @@ emission_enabled = true
script = ExtResource("1_dracg")
connectors = [NodePath("MAIN_LOBBY/LAB_CONNECTOR/ConnectorFromLab")]

[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(0.5, -0.224144, 0.836516, -1.13133e-08, 0.965926, 0.258819, -0.866025, -0.12941, 0.482963, 0, 2, 0)
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="." groups=["DirectionalLight"]]
transform = Transform3D(0.5, -0.224144, 0.836516, -1.13133e-08, 0.965926, 0.258819, -0.866025, -0.12941, 0.482963, 31.1428, 19.9889, 15.0093)
light_color = Color(1, 0.929167, 0.75, 1)
shadow_enabled = true
shadow_opacity = 0.8

[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_obnk3")
environment = ExtResource("2_fxdef")

[node name="FogVolume" type="FogVolume" parent="."]
transform = Transform3D(0.957077, -0.289834, 0, 0.289834, 0.957077, 0, 0, 0, 1, 4.89011, 2.29206, -7.93362)
Expand All @@ -3270,7 +3243,7 @@ material = SubResource("FogMaterial_4avjx")
transform = Transform3D(-1, 0, 7.45058e-07, 0, 1, 0, -7.45058e-07, 0, -1, 3.03073, 0.905039, -17.9321)
pause_menu = NodePath("../PauseMenu")
player_hud = NodePath("../Player_HUD")
inventory_data = SubResource("Resource_277ed")
inventory_data = SubResource("Resource_amq3w")
step_height_camera_lerp = 1.5

[node name="Player_HUD" parent="." node_paths=PackedStringArray("player") instance=ExtResource("5_to5tg")]
Expand Down Expand Up @@ -5694,7 +5667,7 @@ transform = Transform3D(0.996195, -0.0871558, 0, 0.0871558, 0.996195, 0, 0, 0, 1
shape = SubResource("ConvexPolygonShape3D_x27rs")

[node name="MainCeiling" type="MeshInstance3D" parent="MAIN_LOBBY/StaticBody3D"]
transform = Transform3D(0.996195, -0.0871558, 0, 0.0871558, 0.996195, 0, 0, 0, 1, 0, 5.55, 0)
transform = Transform3D(0.996195, -0.0871558, 0, 0.0871558, 0.996195, 0, 0, 0, 1, 0, 6.40211, 0)
mesh = SubResource("BoxMesh_wtwgn")
skeleton = NodePath("../../..")

Expand Down Expand Up @@ -5855,6 +5828,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.126438, 2.68542, -8.09135)

[node name="window" type="MeshInstance3D" parent="MAIN_LOBBY/RailingA"]
transform = Transform3D(2.10175e-15, 4.37114e-08, -1, 1.1, -4.37114e-08, 0, -4.80825e-08, -1, -4.37114e-08, 1.04308e-07, 0.0500004, -0.0499992)
cast_shadow = 2
mesh = SubResource("ArrayMesh_yswb2")
skeleton = NodePath("")

Expand Down Expand Up @@ -6351,6 +6325,7 @@ skeleton = NodePath("")
[node name="SpotLight3D" type="SpotLight3D" parent="LIGHTS_CEILING_WALL/lampWall"]
transform = Transform3D(1, 4.37114e-08, -4.37114e-08, -4.37114e-08, -4.37114e-08, -1, -4.37114e-08, 1, -4.37114e-08, 2.96907e-09, -0.00929523, 0.0679183)
shadow_enabled = true
spot_range = 4.0

[node name="loungeSofaCorner2" parent="." instance=ExtResource("28_jqaqs")]
transform = Transform3D(-1, 0, -8.19564e-08, 0, 1, 0, 8.19564e-08, 0, -1, -5.89628, 2.7, -5.98518)
Expand Down Expand Up @@ -7701,9 +7676,6 @@ skeleton = NodePath("")
surface_material_override/0 = SubResource("StandardMaterial3D_hqhpt")
surface_material_override/1 = SubResource("StandardMaterial3D_30jej")

[node name="Pickup_Flashlight" parent="." instance=ExtResource("91_fk2yu")]
transform = Transform3D(-0.379472, 0, -0.925203, 0, 1, 0, 0.925203, 0, -0.379472, 4.70889, 1.33737, -0.00629956)

[node name="RippedPageA_pickup" parent="." instance=ExtResource("91_qq2p0")]
transform = Transform3D(-2.63806e-09, 0.998177, -0.0603517, 4.36317e-08, 0.0603517, 0.998177, 1, 0, -4.37114e-08, 5.13684, 0.51698, -11.7774)

Expand Down
34 changes: 4 additions & 30 deletions COGITO/DemoScenes/COGITO_05_Demo_Laboratory.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[gd_scene load_steps=102 format=3 uid="uid://6hh7o77unixk"]
[gd_scene load_steps=99 format=3 uid="uid://6hh7o77unixk"]

[ext_resource type="Script" path="res://COGITO/SceneManagement/cogito_scene.gd" id="1_4dqq6"]
[ext_resource type="Texture2D" uid="uid://sdcljx8f5dhj" path="res://COGITO/Assets/hdris/kloofendal_48d_partly_cloudy_puresky_2k.hdr" id="1_ponqc"]
[ext_resource type="PackedScene" uid="uid://kicjwmh02uwf" path="res://COGITO/PrefabScenes/player.tscn" id="2_7qwrr"]
[ext_resource type="Environment" uid="uid://bfqf441f3213a" path="res://COGITO/SceneManagement/WorldEnviroment.tres" id="2_537sm"]
[ext_resource type="PackedScene" uid="uid://0c32kepv0ahx" path="res://COGITO/PrefabScenes/Player_HUD.tscn" id="3_0c7yw"]
[ext_resource type="PackedScene" uid="uid://dkie3md1cmsip" path="res://COGITO/EasyMenus/Scenes/PauseMenu.tscn" id="4_vc32u"]
[ext_resource type="PackedScene" uid="uid://p3f16jxrcxdt" path="res://COGITO/Assets/Models/Kenney/Furniture/GLTF format/floorFull.glb" id="5_ihscj"]
Expand Down Expand Up @@ -41,32 +41,6 @@
[ext_resource type="PackedScene" uid="uid://sfypssn0rllo" path="res://COGITO/PrefabScenes/Pickups/pickup_stamina_extension.tscn" id="38_ayqrv"]
[ext_resource type="PackedScene" uid="uid://bekq2c16juwa1" path="res://COGITO/PrefabScenes/Pickups/pickup_dart.tscn" id="40_hi3jw"]

[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_wjbty"]
panorama = ExtResource("1_ponqc")

[sub_resource type="Sky" id="Sky_h3ipr"]
sky_material = SubResource("PanoramaSkyMaterial_wjbty")

[sub_resource type="Environment" id="Environment_obnk3"]
background_mode = 2
sky = SubResource("Sky_h3ipr")
sky_rotation = Vector3(0, 1.74533, 0.174533)
ambient_light_sky_contribution = 0.1
ambient_light_energy = 0.2
tonemap_mode = 1
ssao_enabled = true
ssil_enabled = true
glow_enabled = true
glow_intensity = 2.5
glow_strength = 0.37
glow_bloom = 0.2
glow_blend_mode = 0
volumetric_fog_enabled = true
volumetric_fog_density = 0.0
volumetric_fog_ambient_inject = 0.1
volumetric_fog_sky_affect = 0.1
volumetric_fog_temporal_reprojection_amount = 0.85

[sub_resource type="BoxShape3D" id="BoxShape3D_w6kc6"]
size = Vector3(10, 0.1, 6)

Expand Down Expand Up @@ -922,14 +896,14 @@ size = Vector3(0.1, 0.1, 0.1)
script = ExtResource("1_4dqq6")
connectors = [NodePath("CONNECTOR_TO_LOBBY/ConnectorFromLobby")]

[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="." groups=["DirectionalLight"]]
transform = Transform3D(0.5, -0.224144, 0.836516, -1.13133e-08, 0.965926, 0.258819, -0.866025, -0.12941, 0.482963, 0, 2, 0)
light_color = Color(1, 0.929167, 0.75, 1)
shadow_enabled = true
shadow_opacity = 0.8

[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_obnk3")
environment = ExtResource("2_537sm")

[node name="Player" parent="." instance=ExtResource("2_7qwrr")]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5.13854, 0.8, -5.43073)
Expand Down
8 changes: 0 additions & 8 deletions COGITO/EasyMenus/Nodes/slider_w_labels.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,15 @@ title = "Slider"

[node name="Title" type="Label" parent="."]
layout_mode = 2
offset_right = 800.0
offset_bottom = 38.0
theme_override_font_sizes/font_size = 25
text = "Slider"
horizontal_alignment = 1

[node name="HSlider" type="HSlider" parent="."]
layout_mode = 2
offset_top = 42.0
offset_right = 800.0
offset_bottom = 58.0

[node name="CurrentValue" type="Label" parent="."]
layout_mode = 2
offset_top = 62.0
offset_right = 800.0
offset_bottom = 93.0
theme_override_font_sizes/font_size = 20
text = "0 %"
horizontal_alignment = 1
Expand Down
Loadi 3D49 ng
0