1
0
Fork 0

Godot 4 changes

This commit is contained in:
Michaël Lemaire 2021-10-17 20:02:36 +02:00
parent ef84d58273
commit e2fab65d3a
22 changed files with 95 additions and 91 deletions

View file

@ -2,7 +2,7 @@ extends Node2D
class_name DebugNode2d, "res://addons/thunderk-basics/debug/debug_node2d.png"
func _ready():
TKDebug.connect("active_changed", self, "_on_debug_active_changed")
TKDebug.connect("active_changed", _on_debug_active_changed)
_on_debug_active_changed()
func _on_debug_active_changed():

View file

@ -1,8 +1,9 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/debug_node2d.png-9af8296c13fef1491514dd8ffc720d31.stex"
type="StreamTexture2D"
uid="uid://bsjs2c7p1gf4f"
path="res://.godot/imported/debug_node2d.png-9af8296c13fef1491514dd8ffc720d31.stex"
metadata={
"vram_texture": false
}
@ -10,25 +11,25 @@ metadata={
[deps]
source_file="res://addons/thunderk-basics/debug/debug_node2d.png"
dest_files=[ "res://.import/debug_node2d.png-9af8296c13fef1491514dd8ffc720d31.stex" ]
dest_files=["res://.godot/imported/debug_node2d.png-9af8296c13fef1491514dd8ffc720d31.stex"]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
compress/channel_pack=0
compress/streamed=false
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/invert_color=false
stream=false
size_limit=0
detect_3d=true
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0

View file

@ -1,8 +1,8 @@
extends Spatial
extends Node3D
class_name DebugNode3d, "res://addons/thunderk-basics/debug/debug_node3d.png"
func _ready():
TKDebug.connect("active_changed", self, "_on_debug_active_changed")
TKDebug.connect("active_changed", _on_debug_active_changed)
_on_debug_active_changed()
func _on_debug_active_changed():

View file

@ -1,8 +1,9 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/debug_node3d.png-36a7db45ad9e93eafb387b6f9eba2759.stex"
type="StreamTexture2D"
uid="uid://bk87ieewxtcpx"
path="res://.godot/imported/debug_node3d.png-36a7db45ad9e93eafb387b6f9eba2759.stex"
metadata={
"vram_texture": false
}
@ -10,25 +11,25 @@ metadata={
[deps]
source_file="res://addons/thunderk-basics/debug/debug_node3d.png"
dest_files=[ "res://.import/debug_node3d.png-36a7db45ad9e93eafb387b6f9eba2759.stex" ]
dest_files=["res://.godot/imported/debug_node3d.png-36a7db45ad9e93eafb387b6f9eba2759.stex"]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
compress/channel_pack=0
compress/streamed=false
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/invert_color=false
stream=false
size_limit=0
detect_3d=true
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0

View file

@ -1,6 +1,6 @@
extends Node
export var active = false
@export var active := false
signal active_changed
@ -8,4 +8,4 @@ func _process(delta):
# TODO disable in release builds
if Input.is_action_just_released("ui_debug"):
active = not active
emit_signal("active_changed")
active_changed.emit()

View file

@ -6,11 +6,11 @@ extends Resource
# -- enums --
# -- constants --
# -- exported variables --
export (Mesh) var max_detail_mesh
export (Mesh) var mid_detail_mesh
export var mid_detail_distance = 1.0
export (Mesh) var min_detail_mesh
export var min_detail_distance = 10.0
@export var max_detail_mesh: Mesh
@export var mid_detail_mesh: Mesh
@export var mid_detail_distance := 1.0
@export var min_detail_mesh: Mesh
@export var min_detail_distance := 10.0
# -- public variables --
# -- private variables --
# -- onready variables --

View file

@ -6,12 +6,12 @@ extends Node
# -- enums --
# -- constants --
# -- exported variables --
export var precision = 0.1
export var timer = 5.0
@export var precision := 0.1
@export var timer := 5.0
# -- public variables --
# -- private variables --
var _previous_cam = Vector3.INF
var _time = 0.0
var _previous_cam := Vector3(INF, INF, INF)
var _time := 0.0
# -- onready variables --
# -- preloads --
@ -19,7 +19,7 @@ var _time = 0.0
# -- virtual methods --
func _process(delta):
var cam := get_viewport().get_camera().global_transform.origin
var cam := get_viewport().get_camera_3d().global_transform.origin
_time += delta
if _time > timer or cam.distance_to(_previous_cam) > precision:

View file

@ -1,12 +1,12 @@
# MeshInstance with Level-of-Detail support
class_name LODMeshInstance
extends MeshInstance
extends MeshInstance3D
# -- signals --
# -- enums --
# -- constants --
# -- exported variables --
export (Resource) var lod_config = LODConfig.new()
@export var lod_config := LODConfig.new() as Resource
# -- public variables --
# -- private variables --
# -- onready variables --

View file

@ -1,12 +1,12 @@
# MultiMeshInstance with Level-of-Detail support
class_name LODMultiMeshInstance
extends MultiMeshInstance
extends MultiMeshInstance3D
# -- signals --
# -- enums --
# -- constants --
# -- exported variables --
export (Resource) var lod_config = LODConfig.new()
@export var lod_config := LODConfig.new() as Resource
# -- public variables --
# -- private variables --
# -- onready variables --

View file

@ -1,9 +1,9 @@
# Return the forward vector for a global transform
static func forward(transform: Transform) -> Vector3:
static func forward(transform: Transform3D) -> Vector3:
return transform.basis.z.normalized()
# Return a basis facing a direction
static func facing(direction: Vector3) -> Basis:
var plane = Basis(Vector3.UP, atan2(-direction.x, -direction.z))
var cut = plane.xform_inv(direction)
var plane := Basis(Vector3.UP, atan2(-direction.x, -direction.z))
var cut := plane.inverse() * direction
return plane * Basis(Vector3.RIGHT, atan2(cut.y, -cut.z))

View file

@ -1,4 +1,4 @@
tool
@tool
# Base for in-editor interactive previews
class_name Preview2D, "res://addons/thunderk-basics/preview/preview_2d.png"

View file

@ -1,8 +1,9 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/preview_2d.png-6ebeec30dc3f2a3056853ed12257c507.stex"
type="StreamTexture2D"
uid="uid://cmn57doh2kr77"
path="res://.godot/imported/preview_2d.png-6ebeec30dc3f2a3056853ed12257c507.stex"
metadata={
"vram_texture": false
}
@ -10,25 +11,25 @@ metadata={
[deps]
source_file="res://addons/thunderk-basics/preview/preview_2d.png"
dest_files=[ "res://.import/preview_2d.png-6ebeec30dc3f2a3056853ed12257c507.stex" ]
dest_files=["res://.godot/imported/preview_2d.png-6ebeec30dc3f2a3056853ed12257c507.stex"]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
compress/channel_pack=0
compress/streamed=false
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/invert_color=false
stream=false
size_limit=0
detect_3d=true
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0

View file

@ -1,8 +1,8 @@
tool
@tool
# Base for in-editor interactive previews
class_name Preview3D, "res://addons/thunderk-basics/preview/preview_3d.png"
extends Spatial
extends Node3D
# -- signals --
# -- enums --

View file

@ -1,8 +1,9 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/preview_3d.png-77ba78c7ae135c58f7aa2a6db5bb63b9.stex"
type="StreamTexture2D"
uid="uid://bwsmr8dmj3gdb"
path="res://.godot/imported/preview_3d.png-77ba78c7ae135c58f7aa2a6db5bb63b9.stex"
metadata={
"vram_texture": false
}
@ -10,25 +11,25 @@ metadata={
[deps]
source_file="res://addons/thunderk-basics/preview/preview_3d.png"
dest_files=[ "res://.import/preview_3d.png-77ba78c7ae135c58f7aa2a6db5bb63b9.stex" ]
dest_files=["res://.godot/imported/preview_3d.png-77ba78c7ae135c58f7aa2a6db5bb63b9.stex"]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
compress/channel_pack=0
compress/streamed=false
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/invert_color=false
stream=false
size_limit=0
detect_3d=true
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0

View file

@ -1,4 +1,4 @@
tool
@tool
# Inspector plugin for preview scenes
extends EditorInspectorPlugin
@ -25,7 +25,7 @@ func parse_begin(object):
var button := Button.new()
button.text = "Update preview"
add_custom_control(button)
button.connect("pressed", self, "_on_update_pressed", [preview])
button.connect("pressed", _on_update_pressed, [preview])
# -- public methods --

View file

@ -1,4 +1,4 @@
tool
@tool
# Tools for randomization

View file

@ -1,11 +1,11 @@
tool
@tool
# Resources tools
static func list_from_dir(path: String, pattern="*") -> PoolStringArray:
static func list_from_dir(path: String, pattern="*") -> PackedStringArray:
""" List all resources in a directory (non-recursive)
"""
var result := PoolStringArray()
var result := PackedStringArray()
path = path.rstrip("/")
var dir := Directory.new()

View file

@ -1,4 +1,4 @@
tool
@tool
static func empty_node(node: Node):
""" Remove all children from a container node
@ -26,10 +26,10 @@ static func set_owner(node: Node, owner: Node, force_inherited=false):
for child in node.get_children():
set_owner(child, owner)
static func set_layer(node: Spatial, layer: int):
static func set_layer(node: Node3D, layer: int):
""" Recursively set a display layer
"""
if node is VisualInstance:
if node is VisualInstance3D:
node.layers = layer
else:
for child in node.get_children():
@ -61,7 +61,7 @@ static func pack_as_file(node: Node, filename: String, update_owner=true):
return FAILED
return OK
static func distance3d(obj1: Spatial, obj2: Spatial) -> float:
static func distance3d(obj1: Node3D, obj2: Node3D) -> float:
""" Get the distance between two 3d nodes
"""
return obj1.global_transform.origin.distance_to(obj2.global_transform.origin)

View file

@ -1,4 +1,4 @@
#tool
#@tool
# docstring
#class_name

View file

@ -1,4 +1,4 @@
tool
@tool
static func add_to_signal_store(store: Array, path: NodePath, signal_name: String, method: String):
store.append({"path": path, "signal": signal_name, "method": method})

View file

@ -1,4 +1,4 @@
tool
@tool
extends EditorPlugin
var preview_inspector

View file

@ -1,4 +1,4 @@
tool
@tool
static func update_dict(base: Dictionary, incoming: Dictionary):
for key in incoming.keys():