Zylann
/
voxelgame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved common stuff in a common/ folder

master
Marc Gilleron 2019-09-12 19:39:20 +01:00
parent 3fcee8a8a6
commit 63c18a8883
15 changed files with 71 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
project/blocky_terrain/character_avatar.tscn
View File

@ -1,7 +1,7 @@
[gd_scene load_steps=8 format=2]
[ext_resource path="res://blocky_terrain/character_controller.gd" type="Script" id=1]
[ext_resource path="res://mouse_look.gd" type="Script" id=2]
[ext_resource path="res://common/mouse_look.gd" type="Script" id=2]
[ext_resource path="res://blocky_terrain/avatar_interaction.gd" type="Script" id=3]
[ext_resource path="res://blocky_terrain/crosshair.png" type="Texture" id=4]
[ext_resource path="res://blocky_terrain/center.gd" type="Script" id=5]
@ -10,6 +10,7 @@
[sub_resource type="SpatialMaterial" id=1]
flags_transparent = false

6
project/blocky_terrain/main.tscn
View File

@ -3,12 +3,14 @@
[ext_resource path="res://blocky_terrain/provider_image.tres" type="VoxelStreamImage" id=1]
[ext_resource path="res://blocky_terrain/terrain_material.tres" type="Material" id=2]
[ext_resource path="res://blocky_terrain/terrain_marerial_transparent.tres" type="Material" id=3]
[ext_resource path="res://axes.tscn" type="PackedScene" id=4]
[ext_resource path="res://grid.gd" type="Script" id=5]
[ext_resource path="res://common/axes.tscn" type="PackedScene" id=4]
[ext_resource path="res://common/grid.gd" type="Script" id=5]
[ext_resource path="res://blocky_terrain/character_avatar.tscn" type="PackedScene" id=6]
[ext_resource path="res://blocky_terrain/profiling_gui.gd" type="Script" id=8]
[ext_resource path="res://blocky_terrain/debug3d.gd" type="Script" id=9]
[sub_resource type="ProceduralSky" id=1]
sky_top_color = Color( 0.268204, 0.522478, 0.847656, 1 )
sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )

6
project/blocky_terrain/main_with_saving.tscn
View File

@ -1,14 +1,16 @@
[gd_scene load_steps=19 format=2]
[ext_resource path="res://blocky_terrain/provider_image.tres" type="VoxelStreamImage" id=1]
[ext_resource path="res://axes.tscn" type="PackedScene" id=2]
[ext_resource path="res://grid.gd" type="Script" id=3]
[ext_resource path="res://common/axes.tscn" type="PackedScene" id=2]
[ext_resource path="res://common/grid.gd" type="Script" id=3]
[ext_resource path="res://blocky_terrain/terrain_marerial_transparent.tres" type="Material" id=4]
[ext_resource path="res://blocky_terrain/terrain_material.tres" type="Material" id=5]
[ext_resource path="res://blocky_terrain/profiling_gui.gd" type="Script" id=6]
[ext_resource path="res://blocky_terrain/debug3d.gd" type="Script" id=7]
[ext_resource path="res://blocky_terrain/character_avatar.tscn" type="PackedScene" id=8]
[sub_resource type="ProceduralSky" id=1]
sky_top_color = Color( 0.268204, 0.522478, 0.847656, 1 )
sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )

0
project/axes.tscn → project/common/axes.tscn
View File

0
project/ddd.gd → project/common/ddd.gd
View File

70
project/grid.gd → project/common/grid.gd
View File

@ -1,35 +1,35 @@
extends MeshInstance
export var size = 4
export var step = 16
func _ready():
var st = SurfaceTool.new()
st.begin(Mesh.PRIMITIVE_LINES)
st.add_color(Color(0,0,0))
var wsize = step * size
for i in range(0, size+1):
for j in range(0, size+1):
var x = i * step
var y = j * step
st.add_vertex(Vector3(x, 0, y))
st.add_vertex(Vector3(x, wsize, y))
st.add_vertex(Vector3(x, y, 0))
st.add_vertex(Vector3(x, y, wsize))
st.add_vertex(Vector3(0, x, y))
st.add_vertex(Vector3(wsize, x, y))
mesh = st.commit()
#set_mesh(mesh)
extends MeshInstance
export var size = 4
export var step = 16
func _ready():
var st = SurfaceTool.new()
st.begin(Mesh.PRIMITIVE_LINES)
st.add_color(Color(0,0,0))
var wsize = step * size
for i in range(0, size+1):
for j in range(0, size+1):
var x = i * step
var y = j * step
st.add_vertex(Vector3(x, 0, y))
st.add_vertex(Vector3(x, wsize, y))
st.add_vertex(Vector3(x, y, 0))
st.add_vertex(Vector3(x, y, wsize))
st.add_vertex(Vector3(0, x, y))
st.add_vertex(Vector3(wsize, x, y))
mesh = st.commit()
#set_mesh(mesh)

0
project/mouse_look.gd → project/common/mouse_look.gd
View File

0
project/spectator_avatar.gd → project/common/spectator_avatar.gd
View File

6
project/spectator_avatar.tscn → project/common/spectator_avatar.tscn
View File

@ -1,7 +1,9 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://mouse_look.gd" type="Script" id=1]
[ext_resource path="res://spectator_avatar.gd" type="Script" id=2]
[ext_resource path="res://common/mouse_look.gd" type="Script" id=1]
[ext_resource path="res://common/spectator_avatar.gd" type="Script" id=2]
[node name="SpectatorAvatar" type="Spatial"]
script = ExtResource( 2 )

8
project/dmc_terrain/main.tscn
View File

@ -3,8 +3,8 @@
[ext_resource path="res://dmc_terrain/interaction.gd" type="Script" id=1]
[ext_resource path="res://dmc_terrain/dmc_terrain_material.tres" type="Material" id=2]
[ext_resource path="res://blocky_terrain/noise_distorted.png" type="Image" id=3]
[ext_resource path="res://axes.tscn" type="PackedScene" id=4]
[ext_resource path="res://spectator_avatar.tscn" type="PackedScene" id=5]
[ext_resource path="res://common/spectator_avatar.tscn" type="PackedScene" id=4]
[ext_resource path="res://common/axes.tscn" type="PackedScene" id=5]
[sub_resource type="ProceduralSky" id=1]
sky_top_color = Color( 0.388235, 0.533333, 0.615686, 1 )
@ -48,9 +48,9 @@ transform = Transform( 0.912457, -0.352848, 0.207171, 0, 0.506317, 0.862348, -0.
shadow_enabled = true
shadow_bias = 0.05
[node name="Axes" parent="." instance=ExtResource( 4 )]
[node name="Axes" parent="." instance=ExtResource( 5 )]
[node name="SpectatorAvatar" parent="." instance=ExtResource( 5 )]
[node name="SpectatorAvatar" parent="." instance=ExtResource( 4 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 19.9349, 17.285 )
speed = 20.0

10
project/dmc_terrain/main_lod.tscn
View File

@ -2,8 +2,8 @@
[ext_resource path="res://dmc_terrain/main_lod.gd" type="Script" id=1]
[ext_resource path="res://dmc_terrain/dmc_terrain_material.tres" type="Material" id=2]
[ext_resource path="res://axes.tscn" type="PackedScene" id=3]
[ext_resource path="res://spectator_avatar.tscn" type="PackedScene" id=4]
[ext_resource path="res://common/spectator_avatar.tscn" type="PackedScene" id=3]
[ext_resource path="res://common/axes.tscn" type="PackedScene" id=4]
[ext_resource path="res://dmc_terrain/block_debug.gd" type="Script" id=5]
[sub_resource type="ProceduralSky" id=1]
@ -39,9 +39,9 @@ shadow_enabled = true
shadow_bias = 0.05
directional_shadow_max_distance = 1000.0
[node name="Axes" parent="." instance=ExtResource( 3 )]
[node name="Axes" parent="." instance=ExtResource( 4 )]
[node name="SpectatorAvatar" parent="." instance=ExtResource( 4 )]
[node name="SpectatorAvatar" parent="." instance=ExtResource( 3 )]
speed = 100.0
[node name="Camera" parent="SpectatorAvatar" index="0"]
@ -57,9 +57,9 @@ material/0 = ExtResource( 2 )
[node name="VoxelTerrain" type="VoxelLodTerrain" parent="."]
stream = SubResource( 5 )
lod_count = 8
viewer_path = NodePath("../SpectatorAvatar")
material = ExtResource( 2 )
lod_count = 8
generate_collisions = false
[node name="BlockDebug" type="Control" parent="."]

4
project/dmc_terrain/main_lod_with_saving.tscn
View File

@ -4,9 +4,9 @@
[ext_resource path="res://dmc_terrain/main_lod.gd" type="Script" id=2]
[ext_resource path="res://dmc_terrain/dmc_terrain_material.tres" type="Material" id=3]
[ext_resource path="res://dmc_terrain/interaction.gd" type="Script" id=4]
[ext_resource path="res://spectator_avatar.tscn" type="PackedScene" id=5]
[ext_resource path="res://common/spectator_avatar.tscn" type="PackedScene" id=5]
[ext_resource path="res://dmc_terrain/noise_generator_stream.tres" type="VoxelStreamNoise" id=6]
[ext_resource path="res://axes.tscn" type="PackedScene" id=7]
[ext_resource path="res://common/axes.tscn" type="PackedScene" id=7]
[sub_resource type="ProceduralSky" id=1]
sky_top_color = Color( 0.388235, 0.533333, 0.615686, 1 )

6
project/dmc_test/main.tscn
View File

@ -1,8 +1,10 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://dmc_test/main.gd" type="Script" id=1]
[ext_resource path="res://axes.tscn" type="PackedScene" id=2]
[ext_resource path="res://spectator_avatar.tscn" type="PackedScene" id=3]
[ext_resource path="res://common/axes.tscn" type="PackedScene" id=2]
[ext_resource path="res://common/spectator_avatar.tscn" type="PackedScene" id=3]
[sub_resource type="ProceduralSky" id=1]
sky_top_color = Color( 0.388235, 0.533333, 0.615686, 1 )

2
project/project.godot
View File

@ -21,7 +21,7 @@ config/icon="res://icon.png"
[autoload]
DDD="*res://ddd.gd"
DDD="*res://common/ddd.gd"
[physics]

9
project/transvoxel_test/transvoxel_test.tscn
View File

@ -1,9 +1,12 @@
[gd_scene load_steps=7 format=2]
[ext_resource path="res://transvoxel_test/transvoxel_test.gd" type="Script" id=1]
[ext_resource path="res://axes.tscn" type="PackedScene" id=2]
[ext_resource path="res://spectator_avatar.tscn" type="PackedScene" id=3]
[ext_resource path="res://grid.gd" type="Script" id=4]
[ext_resource path="res://common/axes.tscn" type="PackedScene" id=2]
[ext_resource path="res://common/spectator_avatar.tscn" type="PackedScene" id=3]
[ext_resource path="res://common/grid.gd" type="Script" id=4]
[sub_resource type="SpatialMaterial" id=1]
albedo_color = Color( 0.7, 0.7, 0.7, 1 )