Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update HEADS. Removed the air block, as it's no longer needed.

Browse Source
This commit is contained in:
Relintai 2020-04-17 00:39:46 +02:00
parent d7d67d97eb
commit b15c97b099
7 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "0e43565a7c64c40d5b18fd0e4ce171cc1186cb33", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "9d946f1623b9cb57b2e1d9681ac3b7f7e7b746d4"}, "entity_spell_system": {"master": "0f823f4206ec3f7710fafcdf7b76ba66c2c66d30"}, "ui_extensions": {"master": "8c4302f7f700d0c03adeeba305e728c39521ab65"}, "voxelman": {"master": "17b033e7072f516c0bd96a3bd1e374543259b3e9"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "f7aed39c065f465abcb6f1651ea0256306818934"}, "mesh_data_resource": {"master": "b9cb58897af8e4fc9526b3355528f10f3d2c19e1"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "58d46884a492e644b16f988479d286fc8a342239"}, "props": {"master": "0aceb2aeca8a9d7cd2c312b66cf23dc330f041b2"}}
{"engine": {"3.2": "529daebe07897c98260f63d4e087c2160831c4e8", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "9d946f1623b9cb57b2e1d9681ac3b7f7e7b746d4"}, "entity_spell_system": {"master": "0f823f4206ec3f7710fafcdf7b76ba66c2c66d30"}, "ui_extensions": {"master": "8c4302f7f700d0c03adeeba305e728c39521ab65"}, "voxelman": {"master": "7c0390de74c69358ea72a0f9b7364689ce0e737b"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "f7aed39c065f465abcb6f1651ea0256306818934"}, "mesh_data_resource": {"master": "b9cb58897af8e4fc9526b3355528f10f3d2c19e1"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "58d46884a492e644b16f988479d286fc8a342239"}, "props": {"master": "0aceb2aeca8a9d7cd2c312b66cf23dc330f041b2"}}

4
game/data/materials/1_standard_material.tres
View File

File diff suppressed because one or more lines are too long

5
game/data/voxel_libraries/1_main_lib_merger_empty.tres
View File

@ -1,15 +1,14 @@
[gd_resource type="VoxelmanLibraryMerger" load_steps=9 format=2]
[gd_resource type="VoxelmanLibraryMerger" load_steps=8 format=2]
[ext_resource path="res://data/materials/1_standard_material.tres" type="Material" id=1]
[ext_resource path="res://data/voxel_surfaces/4_dungeon_stone.tres" type="VoxelSurfaceMerger" id=2]
[ext_resource path="res://data/voxel_surfaces/2_test.tres" type="VoxelSurfaceMerger" id=3]
[ext_resource path="res://data/voxel_surfaces/1_stone.tres" type="VoxelSurfaceMerger" id=4]
[ext_resource path="res://data/voxel_surfaces/3_test2.tres" type="VoxelSurfaceMerger" id=5]
[ext_resource path="res://data/voxel_surfaces/0_air.tres" type="VoxelSurfaceMerger" id=7]
[ext_resource path="res://data/materials/5_standard_material_nouv2.tres" type="Material" id=8]
[ext_resource path="res://data/materials/7_standard_material_notex.tres" type="Material" id=10]
[resource]
materials = [ ExtResource( 1 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 10 ) ]
texture_flags = 1
voxel_surfaces = [ ExtResource( 7 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 5 ), ExtResource( 2 ) ]
voxel_surfaces = [ ExtResource( 4 ), ExtResource( 3 ), ExtResource( 5 ), ExtResource( 2 ) ]

1
game/data/voxel_libraries/merger_prop_mat.tres
View File

@ -2,7 +2,6 @@
[ext_resource path="res://data/voxel_textures/grass_mossy_albedo.png" type="Texture" id=1]
[resource]
resource_name = "Material.003"
vertex_color_use_as_albedo = true

6
game/data/voxel_surfaces/0_air.tres
View File

@ -1,6 +0,0 @@
[gd_resource type="VoxelSurfaceMerger" format=2]
[resource]
resource_name = "Air"
voxel_name = "Air"
transparent = true

20
game/dungeon_generator/MainDungeonGenerator.gd
View File

@ -275,16 +275,16 @@ func generate_noise3d_terrarin(chunk : VoxelChunk) -> void:
# generate_random_ao(chunk)
#warning-ignore:unused_variable
for i in range(5):
#var light : VoxelLight = VoxelLight.new()
randomize()
var color : Color = Color(randf(), randf(), randf())
var size : int = randi() % 5 + 5
var lx : int = (chunk.position_x * chunk.size_x) + (randi() % (chunk.size_x - 3))
var ly : int = (chunk.position_y * chunk.size_y) + (randi() % 6)
var lz : int = (chunk.position_z * chunk.size_z) + (randi() % (chunk.size_z - 3))
# light.set_world_position((chunk.position_x * chunk.size_x) + 10, (chunk.position_y * chunk.size_y) + 10, (chunk.position_z * chunk.size_z) + 10)
_world.add_light(lx, ly, lz, size, color)
# for i in range(5):
# #var light : VoxelLight = VoxelLight.new()
# randomize()
# var color : Color = Color(randf(), randf(), randf())
# var size : int = randi() % 5 + 5
# var lx : int = (chunk.position_x * chunk.size_x) + (randi() % (chunk.size_x - 3))
# var ly : int = (chunk.position_y * chunk.size_y) + (randi() % 6)
# var lz : int = (chunk.position_z * chunk.size_z) + (randi() % (chunk.size_z - 3))
## light.set_world_position((chunk.position_x * chunk.size_x) + 10, (chunk.position_y * chunk.size_y) + 10, (chunk.position_z * chunk.size_z) + 10)
# _world.add_light(lx, ly, lz, size, color)
chunk.bake_lights()

13
game/voxelman/world/TVVoxelWorld.gd
View File

@ -192,7 +192,7 @@ func set_editor_generate(value : bool) -> void:
_editor_generate = value
func add_light(x : int, y : int, z : int, size : int, color : Color) -> void:
func create_light(x : int, y : int, z : int, size : int, color : Color) -> void:
var chunkx : int = int(x / chunk_size_x)
var chunky : int = int(y / chunk_size_y)
var chunkz : int = int(z / chunk_size_z)
@ -202,15 +202,8 @@ func add_light(x : int, y : int, z : int, size : int, color : Color) -> void:
light.size = size
light.set_world_position(x, y, z)
for xx in range(chunkx - 1, chunkx + 1):
for yy in range(chunky - 1, chunky + 1):
for zz in range(chunkz - 1, chunkz + 1):
var chunk : VoxelChunk = get_chunk(xx, yy, zz)
if chunk == null:
continue
chunk.add_voxel_light(light)
add_light(light)
func setup_client_seed(pseed : int) -> void:
# _player_file_name = ""