mirror of
https://gitlab.com/MaddoScientisto/cirnogodot.git
synced 2026-06-10 03:35:54 +00:00
Fixed material PBR properties
This commit is contained in:
parent
5e54f96592
commit
3cf71e5c56
30 changed files with 1001 additions and 710 deletions
|
|
@ -34,9 +34,17 @@ animation/trimming=false
|
|||
animation/remove_immutable_tracks=true
|
||||
animation/import_rest_as_RESET=false
|
||||
import_script/path=""
|
||||
materials/extract=0
|
||||
materials/extract=1
|
||||
materials/extract_format=0
|
||||
materials/extract_path=""
|
||||
_subresources={}
|
||||
materials/extract_path="res://3D/BlockbenchModels/Tubes/tube_corner_materials"
|
||||
_subresources={
|
||||
"materials": {
|
||||
"material_0": {
|
||||
"use_external/enabled": true,
|
||||
"use_external/fallback_path": "res://3D/BlockbenchModels/Tubes/tube_corner_materials/material_0.tres",
|
||||
"use_external/path": "uid://cctih04ilh76i"
|
||||
}
|
||||
}
|
||||
}
|
||||
gltf/naming_version=1
|
||||
gltf/embedded_image_handling=1
|
||||
|
|
|
|||
|
|
@ -34,9 +34,17 @@ animation/trimming=false
|
|||
animation/remove_immutable_tracks=true
|
||||
animation/import_rest_as_RESET=false
|
||||
import_script/path=""
|
||||
materials/extract=0
|
||||
materials/extract=1
|
||||
materials/extract_format=0
|
||||
materials/extract_path=""
|
||||
_subresources={}
|
||||
materials/extract_path="res://3D/BlockbenchModels/Tubes/tube_emitter_materials"
|
||||
_subresources={
|
||||
"materials": {
|
||||
"material_0": {
|
||||
"use_external/enabled": true,
|
||||
"use_external/fallback_path": "res://3D/BlockbenchModels/Tubes/tube_emitter_materials/material_0.tres",
|
||||
"use_external/path": "uid://b6kqb8er0g7s4"
|
||||
}
|
||||
}
|
||||
}
|
||||
gltf/naming_version=2
|
||||
gltf/embedded_image_handling=1
|
||||
|
|
|
|||
|
|
@ -15,9 +15,11 @@ dest_files=["res://.godot/imported/Tube_Junction.gltf-2cf07e579b2bb732c223c80fc4
|
|||
|
||||
nodes/root_type=""
|
||||
nodes/root_name=""
|
||||
nodes/root_script=null
|
||||
nodes/apply_root_scale=true
|
||||
nodes/root_scale=1.0
|
||||
nodes/import_as_skeleton_bones=false
|
||||
nodes/use_name_suffixes=true
|
||||
nodes/use_node_type_suffixes=true
|
||||
meshes/ensure_tangents=true
|
||||
meshes/generate_lods=true
|
||||
|
|
@ -32,6 +34,17 @@ animation/trimming=false
|
|||
animation/remove_immutable_tracks=true
|
||||
animation/import_rest_as_RESET=false
|
||||
import_script/path=""
|
||||
_subresources={}
|
||||
materials/extract=1
|
||||
materials/extract_format=0
|
||||
materials/extract_path="res://3D/BlockbenchModels/Tubes/tube_junction_materials"
|
||||
_subresources={
|
||||
"materials": {
|
||||
"material_0": {
|
||||
"use_external/enabled": true,
|
||||
"use_external/fallback_path": "res://3D/BlockbenchModels/Tubes/tube_junction_materials/material_0.tres",
|
||||
"use_external/path": "uid://be6en04v68nsr"
|
||||
}
|
||||
}
|
||||
}
|
||||
gltf/naming_version=1
|
||||
gltf/embedded_image_handling=1
|
||||
|
|
|
|||
|
|
@ -34,9 +34,17 @@ animation/trimming=false
|
|||
animation/remove_immutable_tracks=true
|
||||
animation/import_rest_as_RESET=false
|
||||
import_script/path=""
|
||||
materials/extract=0
|
||||
materials/extract=1
|
||||
materials/extract_format=0
|
||||
materials/extract_path=""
|
||||
_subresources={}
|
||||
materials/extract_path="res://3D/BlockbenchModels/Tubes/tube_straight_materials"
|
||||
_subresources={
|
||||
"materials": {
|
||||
"material_0": {
|
||||
"use_external/enabled": true,
|
||||
"use_external/fallback_path": "res://3D/BlockbenchModels/Tubes/tube_straight_materials/material_0.tres",
|
||||
"use_external/path": "uid://dr0ovopefv6fk"
|
||||
}
|
||||
}
|
||||
}
|
||||
gltf/naming_version=1
|
||||
gltf/embedded_image_handling=1
|
||||
|
|
|
|||
|
|
@ -34,9 +34,17 @@ animation/trimming=false
|
|||
animation/remove_immutable_tracks=true
|
||||
animation/import_rest_as_RESET=false
|
||||
import_script/path=""
|
||||
materials/extract=0
|
||||
materials/extract=1
|
||||
materials/extract_format=0
|
||||
materials/extract_path=""
|
||||
_subresources={}
|
||||
materials/extract_path="res://3D/BlockbenchModels/Tubes/tube_straight_long_materials"
|
||||
_subresources={
|
||||
"materials": {
|
||||
"material_0": {
|
||||
"use_external/enabled": true,
|
||||
"use_external/fallback_path": "res://3D/BlockbenchModels/Tubes/tube_straight_long_materials/material_0.tres",
|
||||
"use_external/path": "uid://f4mxc3jmwyop"
|
||||
}
|
||||
}
|
||||
}
|
||||
gltf/naming_version=2
|
||||
gltf/embedded_image_handling=1
|
||||
|
|
|
|||
13
3D/BlockbenchModels/Tubes/material_0.tres
Normal file
13
3D/BlockbenchModels/Tubes/material_0.tres
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bmu6acg1n4ma2"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://kjrriwty2h3e" path="res://3D/BlockbenchModels/Tubes/Tube_Straight_0.png" id="1_1vxi0"]
|
||||
|
||||
[resource]
|
||||
resource_name = "material_0"
|
||||
transparency = 2
|
||||
alpha_scissor_threshold = 0.05
|
||||
alpha_antialiasing_mode = 0
|
||||
cull_mode = 2
|
||||
albedo_texture = ExtResource("1_1vxi0")
|
||||
texture_filter = 0
|
||||
texture_repeat = false
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://cctih04ilh76i"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://cgknuorqrjbwo" path="res://3D/BlockbenchModels/Tubes/Tube_Corner_0.png" id="1_r3yii"]
|
||||
|
||||
[resource]
|
||||
resource_name = "material_0"
|
||||
transparency = 2
|
||||
alpha_scissor_threshold = 0.05
|
||||
alpha_antialiasing_mode = 0
|
||||
cull_mode = 2
|
||||
albedo_texture = ExtResource("1_r3yii")
|
||||
metallic = 0.28
|
||||
metallic_specular = 0.24
|
||||
texture_filter = 0
|
||||
texture_repeat = false
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://b6kqb8er0g7s4"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://gdttxslts7lc" path="res://3D/BlockbenchModels/Tubes/Tube_Emitter_0.png" id="1_ggbgk"]
|
||||
|
||||
[resource]
|
||||
resource_name = "material_0"
|
||||
transparency = 2
|
||||
alpha_scissor_threshold = 0.05
|
||||
alpha_antialiasing_mode = 0
|
||||
cull_mode = 2
|
||||
albedo_texture = ExtResource("1_ggbgk")
|
||||
metallic = 0.28
|
||||
metallic_specular = 0.24
|
||||
texture_filter = 0
|
||||
texture_repeat = false
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://be6en04v68nsr"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://bdvwee2ntrxyc" path="res://3D/BlockbenchModels/Tubes/Tube_Junction_0.png" id="1_sbqkf"]
|
||||
|
||||
[resource]
|
||||
resource_name = "material_0"
|
||||
transparency = 2
|
||||
alpha_scissor_threshold = 0.05
|
||||
alpha_antialiasing_mode = 0
|
||||
cull_mode = 2
|
||||
albedo_texture = ExtResource("1_sbqkf")
|
||||
metallic = 0.28
|
||||
metallic_specular = 0.24
|
||||
texture_filter = 0
|
||||
texture_repeat = false
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://f4mxc3jmwyop"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://b27u3rwvbo8n1" path="res://3D/BlockbenchModels/Tubes/Tube_Straight_Long_0.png" id="1_dcqo1"]
|
||||
|
||||
[resource]
|
||||
resource_name = "material_0"
|
||||
transparency = 2
|
||||
alpha_scissor_threshold = 0.05
|
||||
alpha_antialiasing_mode = 0
|
||||
cull_mode = 2
|
||||
albedo_texture = ExtResource("1_dcqo1")
|
||||
metallic = 0.28
|
||||
metallic_specular = 0.24
|
||||
texture_filter = 0
|
||||
texture_repeat = false
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://dr0ovopefv6fk"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://kjrriwty2h3e" path="res://3D/BlockbenchModels/Tubes/Tube_Straight_0.png" id="1_44qv6"]
|
||||
|
||||
[resource]
|
||||
resource_name = "material_0"
|
||||
transparency = 2
|
||||
alpha_scissor_threshold = 0.05
|
||||
alpha_antialiasing_mode = 0
|
||||
cull_mode = 2
|
||||
albedo_texture = ExtResource("1_44qv6")
|
||||
metallic = 0.28
|
||||
metallic_specular = 0.24
|
||||
texture_filter = 0
|
||||
texture_repeat = false
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1376,6 +1376,15 @@
|
|||
( 336 -256 16 ) ( 337 -256 16 ) ( 336 -256 17 ) Manual/Black [ -1 1.0718754395722282e-15 0 0 ] [ 0 0 -1 0 ] 90 1 1
|
||||
( 344 -264 20 ) ( 344 -265 20 ) ( 344 -264 21 ) Walls/WallColumn_005 [ 1.0718754395722282e-15 1 0 -5 ] [ 0 0 -1 0 ] 270 1 1
|
||||
}
|
||||
// brush 151
|
||||
{
|
||||
( 480 -352 48 ) ( 480 -351 48 ) ( 480 -352 49 ) Walls/Wall0 [ 0 -1 0 -8 ] [ 0 0 -1 0 ] 0 1 1
|
||||
( 496 -360 48 ) ( 496 -360 49 ) ( 497 -360 48 ) Walls/Wall0 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
|
||||
( 496 -352 48 ) ( 497 -352 48 ) ( 496 -351 48 ) Walls/Wall0 [ -1 0 0 0 ] [ 0 -1 0 -8 ] 90 1 1
|
||||
( 520 -328 56 ) ( 520 -327 56 ) ( 521 -328 56 ) Various/Floor_rough_test [ 1 0 0 0 ] [ 0 -1 0 -8 ] 90 1 1
|
||||
( 520 -312 56 ) ( 521 -312 56 ) ( 520 -312 57 ) Walls/Wall0 [ -1 0 0 0 ] [ 0 0 -1 0 ] 270 1 1
|
||||
( 528 -328 56 ) ( 528 -328 57 ) ( 528 -327 56 ) Walls/Wall0 [ 0 1 0 8 ] [ 0 0 -1 0 ] 0 1 1
|
||||
}
|
||||
}
|
||||
// entity 1
|
||||
{
|
||||
|
|
|
|||
|
|
@ -9,23 +9,4 @@ script = ExtResource("3_u7jfk")
|
|||
inverse_scale_factor = 16.0
|
||||
entity_fgd = ExtResource("2_timv6")
|
||||
entity_name_property = "globalname"
|
||||
base_texture_dir = "res://textures"
|
||||
texture_file_extensions = Array[String](["png", "jpg", "jpeg", "bmp", "tga", "webp"])
|
||||
clip_texture = "special/clip"
|
||||
skip_texture = "special/skip"
|
||||
origin_texture = "special/origin"
|
||||
texture_wads = Array[Resource]([])
|
||||
material_file_extension = "tres"
|
||||
default_material = ExtResource("1_frq64")
|
||||
default_material_albedo_uniform = ""
|
||||
albedo_map_pattern = "%s_albedo.%s"
|
||||
normal_map_pattern = "%s_normal.%s"
|
||||
metallic_map_pattern = "%s_metallic.%s"
|
||||
roughness_map_pattern = "%s_roughness.%s"
|
||||
emission_map_pattern = "%s_emission.%s"
|
||||
ao_map_pattern = "%s_ao.%s"
|
||||
height_map_pattern = "%s_height.%s"
|
||||
orm_map_pattern = "%s_orm.%s"
|
||||
save_generated_materials = true
|
||||
uv_unwrap_texel_size = 2.0
|
||||
use_trenchbroom_groups_hierarchy = true
|
||||
|
|
|
|||
BIN
ExternalMaterial/HexGrid/Perlin_16x16_001.png
(Stored with Git LFS)
Normal file
BIN
ExternalMaterial/HexGrid/Perlin_16x16_001.png
(Stored with Git LFS)
Normal file
Binary file not shown.
40
ExternalMaterial/HexGrid/Perlin_16x16_001.png.import
Normal file
40
ExternalMaterial/HexGrid/Perlin_16x16_001.png.import
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://csff21fpbsfr3"
|
||||
path="res://.godot/imported/Perlin_16x16_001.png-3cb2def6b0c1fd8d98f12d6504be180b.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://ExternalMaterial/HexGrid/Perlin_16x16_001.png"
|
||||
dest_files=["res://.godot/imported/Perlin_16x16_001.png-3cb2def6b0c1fd8d98f12d6504be180b.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=3
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=true
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
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=0
|
||||
BIN
ExternalMaterial/HexGrid/Singles/Various/Floor_rough_test.png
(Stored with Git LFS)
Normal file
BIN
ExternalMaterial/HexGrid/Singles/Various/Floor_rough_test.png
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -0,0 +1,40 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://8y275ku8qsh5"
|
||||
path="res://.godot/imported/Floor_rough_test.png-9e2495fc764eec2b5e6e32da6e761ff2.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://textures/Various/Floor_rough_test.png"
|
||||
dest_files=["res://.godot/imported/Floor_rough_test.png-9e2495fc764eec2b5e6e32da6e761ff2.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=3
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=true
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
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=0
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://c73xq3mckpawx"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://8y275ku8qsh5" path="res://textures/Various/Floor_rough_test.png" id="1_vcwlg"]
|
||||
[ext_resource type="Texture2D" uid="uid://bth1o5hi322rh" path="res://textures/Various/Floor_rough_test_roughness.png" id="2_gu125"]
|
||||
|
||||
[resource]
|
||||
albedo_texture = ExtResource("1_vcwlg")
|
||||
metallic = 0.36
|
||||
metallic_specular = 0.0
|
||||
roughness = 0.1
|
||||
roughness_texture = ExtResource("2_gu125")
|
||||
roughness_texture_channel = 4
|
||||
texture_filter = 2
|
||||
BIN
ExternalMaterial/HexGrid/Singles/Various/Floor_rough_test_roughness.png
(Stored with Git LFS)
Normal file
BIN
ExternalMaterial/HexGrid/Singles/Various/Floor_rough_test_roughness.png
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -0,0 +1,40 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bth1o5hi322rh"
|
||||
path="res://.godot/imported/Floor_rough_test_roughness.png-4ebc18af8f3c22041cac4c43c786609a.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://textures/Various/Floor_rough_test_roughness.png"
|
||||
dest_files=["res://.godot/imported/Floor_rough_test_roughness.png-4ebc18af8f3c22041cac4c43c786609a.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=3
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=true
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
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=0
|
||||
|
|
@ -4,5 +4,6 @@
|
|||
|
||||
[resource]
|
||||
albedo_texture = ExtResource("1_jeudg")
|
||||
metallic = 1.0
|
||||
metallic_specular = 0.0
|
||||
texture_filter = 2
|
||||
|
|
|
|||
|
|
@ -4,5 +4,6 @@
|
|||
|
||||
[resource]
|
||||
albedo_texture = ExtResource("1_81hbt")
|
||||
metallic = 1.0
|
||||
metallic_specular = 0.0
|
||||
texture_filter = 2
|
||||
|
|
|
|||
|
|
@ -4,5 +4,6 @@
|
|||
|
||||
[resource]
|
||||
albedo_texture = ExtResource("1_f4o6s")
|
||||
metallic = 1.0
|
||||
metallic_specular = 0.0
|
||||
texture_filter = 2
|
||||
|
|
|
|||
|
|
@ -4,5 +4,6 @@
|
|||
|
||||
[resource]
|
||||
albedo_texture = ExtResource("1_aom5j")
|
||||
metallic = 1.0
|
||||
metallic_specular = 0.0
|
||||
texture_filter = 2
|
||||
|
|
|
|||
|
|
@ -4,5 +4,6 @@
|
|||
|
||||
[resource]
|
||||
albedo_texture = ExtResource("1_5bgo2")
|
||||
metallic = 1.0
|
||||
metallic_specular = 0.0
|
||||
texture_filter = 2
|
||||
|
|
|
|||
|
|
@ -7,5 +7,6 @@ transparency = 2
|
|||
alpha_scissor_threshold = 0.5
|
||||
alpha_antialiasing_mode = 0
|
||||
albedo_texture = ExtResource("1_f0twd")
|
||||
metallic = 0.33
|
||||
metallic_specular = 0.0
|
||||
texture_filter = 2
|
||||
|
|
|
|||
|
|
@ -4,5 +4,6 @@
|
|||
|
||||
[resource]
|
||||
albedo_texture = ExtResource("1_e5b2i")
|
||||
metallic = 0.4
|
||||
metallic_specular = 0.0
|
||||
texture_filter = 2
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue