Skip to content

Commit 7de644f

Browse files
authored
Patch v2.1.8 (#46)
* VMT Import: Fix applying shader uniforms * ValveIONode: Update aliases definition funcs * Bump 2.1.8
1 parent 25a7b6d commit 7de644f

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

addons/godotvmf/godotvmt/vmt_loader.gd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,9 @@ static func load(path: String):
173173

174174
if material is ShaderMaterial:
175175
var mat: ShaderMaterial = material;
176-
if uniforms.find(key) > -1:
177-
var is_texture = value.has("/");
176+
var uniform_index: int = uniforms.find_custom(func(uniform): return uniform.name == key);
177+
if uniform_index > -1:
178+
var is_texture = uniforms[uniform_index].hint_string == "Texture2D";
178179
mat.set_shader_parameter(key, VTFLoader.get_texture(value) if is_texture else value);
179180
continue;
180181

addons/godotvmf/plugin.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
name="GodotVMF"
44
description="Allows use VMF files in Godot"
55
author="H2xDev"
6-
version="2.1.7"
6+
version="2.1.8"
77
script="godotvmf.gd"

addons/godotvmf/src/ValveIONode.gd

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
@tool
22
class_name ValveIONode extends Node3D;
33

4-
static var named_entities = {};
4+
static var named_entities := {};
55
static var scene_instance: Node = null;
66

77
## Assigns global targetname for the node
88
static func define_alias(name: String, value: Node):
9-
if name == '!self' or name in aliases:
9+
if name == '!self':
1010
VMFLogger.error('The alias "' + name + '" is already defined');
1111
return;
1212

1313
aliases[name] = value;
1414

15+
static func remove_alias(name: String):
16+
if name in aliases:
17+
aliases.erase(name);
18+
1519
@export var entity := {};
1620
@export var enabled := true;
1721
@export var flags: int = 0;
1822

19-
var config:
20-
get: return VMFConfig;
23+
var config := VMFConfig;
2124

2225
static var aliases: Dictionary = {};
2326

0 commit comments

Comments
 (0)