-Moved the basic mesh color baking into the base VoxelMesher, as well as the 2 light specific parameters.

-Added a binding from the AO VoxelBuffer enum value.
-Renamed back draw_debug_voxels_colored to draw_debug_voxels.

meshers/cubic_mesher/voxel_mesher_cubic.cpp

@@ -1,19 +1,5 @@
 #include "voxel_mesher_cubic.h"
 
-float VoxelMesherCubic::get_ao_strength() const {
-	return _ao_strength;
-}
-void VoxelMesherCubic::set_ao_strength(float value) {
-	_ao_strength = value;
-}
-
-float VoxelMesherCubic::get_base_light_value() const {
-	return _base_light_value;
-}
-void VoxelMesherCubic::set_base_light_value(float value) {
-	_base_light_value = value;
-}
-
 
 void VoxelMesherCubic::_add_buffer(Ref<VoxelBuffer> buffer) {
 	buffer->generate_ao();
@@ -95,64 +81,8 @@ void VoxelMesherCubic::_add_buffer(Ref<VoxelBuffer> buffer) {
 	}
 }
 
-void VoxelMesherCubic::_bake_colors(Ref<VoxelBuffer> buffer) {
-	Color base_light(_base_light_value, _base_light_value, _base_light_value);
-
-	ERR_FAIL_COND(_vertices.size() != _normals.size());
-
-	/*
-	if (_vertices.size() != _normals.size()) {
-		print_error("VoxelMesherCubic: Generating normals!");
-	}*/
-	
-	for (int i = 0; i < _vertices.size(); ++i) {
-		Vector3 vert = _vertices[i];
-
-		if (vert.x < 0 || vert.y < 0 || vert.z < 0) {
-			if (_colors.size() < _vertices.size()) {
-				_colors.push_back(base_light);
-			}
-
-			continue;
-		}
-
-		unsigned int x = (unsigned int)(vert.x / _voxel_scale);
-		unsigned int y = (unsigned int)(vert.y / _voxel_scale);
-		unsigned int z = (unsigned int)(vert.z / _voxel_scale);
-
-		if (buffer->validate_pos(x, y, z)) {
-			int ao = buffer->get_voxel(x, y, z, VoxelBuffer::CHANNEL_AO);
-			Color light = Color(buffer->get_voxel(x, y, z, VoxelBuffer::CHANNEL_LIGHT_COLOR_R) / 255.0, buffer->get_voxel(x, y, z, VoxelBuffer::CHANNEL_LIGHT_COLOR_G) / 255.0, buffer->get_voxel(x, y, z, VoxelBuffer::CHANNEL_LIGHT_COLOR_B) / 255.0);
-			Color ao_color(ao, ao, ao);
-
-			light += base_light;
-
-			float NdotL = CLAMP(_normals[i].dot(vert - Vector3(x, y, z)), 0, 1.0);
-
-			light *= NdotL;
-
-			light -= ao_color * _ao_strength;
-
-			light.r = CLAMP(light.r, 0, 1.0);
-			light.g = CLAMP(light.g, 0, 1.0);
-			light.b = CLAMP(light.b, 0, 1.0);
-
-			if (_colors.size() < _vertices.size()) {
-				_colors.push_back(light);
-			} else {
-				_colors.set(i, light);
-			}
-		} else {
-			if (_colors.size() < _vertices.size()) {
-				_colors.push_back(base_light);
-			}
-		}
-	}
-}
-
 VoxelMesherCubic::VoxelMesherCubic() {
-	_ao_strength = 0.25;
+	
-	_base_light_value = 0.5;
 }
 
 VoxelMesherCubic::~VoxelMesherCubic() {
@@ -160,13 +90,4 @@ VoxelMesherCubic::~VoxelMesherCubic() {
 
 void VoxelMesherCubic::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_add_buffer", "buffer"), &VoxelMesherCubic::_add_buffer);
-	ClassDB::bind_method(D_METHOD("_bake_colors", "buffer"), &VoxelMesherCubic::_bake_colors);
-
-	ClassDB::bind_method(D_METHOD("get_ao_strength"), &VoxelMesherCubic::get_ao_strength);
-	ClassDB::bind_method(D_METHOD("set_ao_strength", "value"), &VoxelMesherCubic::set_ao_strength);
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "ao_strength"), "set_ao_strength", "get_ao_strength");
-
-	ClassDB::bind_method(D_METHOD("get_base_light_value"), &VoxelMesherCubic::get_base_light_value);
-	ClassDB::bind_method(D_METHOD("set_base_light_value", "value"), &VoxelMesherCubic::set_base_light_value);
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "base_light_value"), "set_base_light_value", "get_base_light_value");
 }

meshers/cubic_mesher/voxel_mesher_cubic.h

@@ -13,24 +13,14 @@ class VoxelMesherCubic : public VoxelMesher {
 	GDCLASS(VoxelMesherCubic, VoxelMesher);
 
 public:
-	float get_ao_strength() const;
-	void set_ao_strength(float value);
-
-	float get_base_light_value() const;
-	void set_base_light_value(float value);
-
 	void _add_buffer(Ref<VoxelBuffer> buffer);
-	void _bake_colors(Ref<VoxelBuffer> buffer);
+	
-
 	VoxelMesherCubic();
 	~VoxelMesherCubic();
 
 protected:
 	static void _bind_methods();
 
-private:
-	float _ao_strength;
-	float _base_light_value;
 };
 
 #endif

meshers/voxel_mesher.cpp

@@ -1,35 +1,38 @@
 #include "voxel_mesher.h"
 
-VoxelMesher::VoxelMesher(Ref<VoxelmanLibrary> library) {
+Ref<VoxelmanLibrary> VoxelMesher::get_library() {
+	return _library;
+}
+void VoxelMesher::set_library(Ref<VoxelmanLibrary> library) {
 	_library = library;
-
-	_voxel_scale = 1;
-	_lod_size = 1;
-
-	_surface_tool.instance();
 }
 
-VoxelMesher::VoxelMesher() {
+float VoxelMesher::get_ao_strength() const {
-
+	return _ao_strength;
-	_voxel_scale = 1;
+}
-	_lod_size = 1;
+void VoxelMesher::set_ao_strength(float value) {
-
+	_ao_strength = value;
-	_surface_tool.instance();
 }
 
-VoxelMesher::~VoxelMesher() {
+float VoxelMesher::get_base_light_value() const {
-	_vertices.clear();
+	return _base_light_value;
-	_normals.clear();
+}
-	_colors.clear();
+void VoxelMesher::set_base_light_value(float value) {
-	_uvs.clear();
+	_base_light_value = value;
-	_indices.clear();
+}
-	_bones.clear();
 
-	_surface_tool.unref();
+float VoxelMesher::get_voxel_scale() const {
+	return _voxel_scale;
+}
+void VoxelMesher::set_voxel_scale(const float voxel_scale) {
+	_voxel_scale = voxel_scale;
+}
 
-	if (_library.is_valid()) {
+int VoxelMesher::get_lod_size() const {
-		_library.unref();
+	return _lod_size;
-	}
+}
+void VoxelMesher::set_lod_size(const int lod_size) {
+	_lod_size = lod_size;
 }
 
 void VoxelMesher::build_mesh(RID mesh) {
@@ -221,18 +224,59 @@ void VoxelMesher::bake_colors(Ref<VoxelBuffer> voxels) {
 		call("_bake_colors", voxels);
 }
 
-float VoxelMesher::get_voxel_scale() const {
+void VoxelMesher::_bake_colors(Ref<VoxelBuffer> buffer) {
-	return _voxel_scale;
+	Color base_light(_base_light_value, _base_light_value, _base_light_value);
-}
-void VoxelMesher::set_voxel_scale(const float voxel_scale) {
-	_voxel_scale = voxel_scale;
-}
 
-int VoxelMesher::get_lod_size() const {
+	ERR_FAIL_COND(_vertices.size() != _normals.size());
-	return _lod_size;
+
-}
+	/*
-void VoxelMesher::set_lod_size(const int lod_size) {
+	if (_vertices.size() != _normals.size()) {
-	_lod_size = lod_size;
+		print_error("VoxelMesherCubic: Generating normals!");
+	}*/
+	
+	for (int i = 0; i < _vertices.size(); ++i) {
+		Vector3 vert = _vertices[i];
+
+		if (vert.x < 0 || vert.y < 0 || vert.z < 0) {
+			if (_colors.size() < _vertices.size()) {
+				_colors.push_back(base_light);
+			}
+
+			continue;
+		}
+
+		unsigned int x = (unsigned int)(vert.x / _voxel_scale);
+		unsigned int y = (unsigned int)(vert.y / _voxel_scale);
+		unsigned int z = (unsigned int)(vert.z / _voxel_scale);
+
+		if (buffer->validate_pos(x, y, z)) {
+			int ao = buffer->get_voxel(x, y, z, VoxelBuffer::CHANNEL_AO);
+			Color light = Color(buffer->get_voxel(x, y, z, VoxelBuffer::CHANNEL_LIGHT_COLOR_R) / 255.0, buffer->get_voxel(x, y, z, VoxelBuffer::CHANNEL_LIGHT_COLOR_G) / 255.0, buffer->get_voxel(x, y, z, VoxelBuffer::CHANNEL_LIGHT_COLOR_B) / 255.0);
+			Color ao_color(ao, ao, ao);
+
+			light += base_light;
+
+			float NdotL = CLAMP(_normals[i].dot(vert - Vector3(x, y, z)), 0, 1.0);
+
+			light *= NdotL;
+
+			light -= ao_color * _ao_strength;
+
+			light.r = CLAMP(light.r, 0, 1.0);
+			light.g = CLAMP(light.g, 0, 1.0);
+			light.b = CLAMP(light.b, 0, 1.0);
+
+			if (_colors.size() < _vertices.size()) {
+				_colors.push_back(light);
+			} else {
+				_colors.set(i, light);
+			}
+		} else {
+			if (_colors.size() < _vertices.size()) {
+				_colors.push_back(base_light);
+			}
+		}
+	}
 }
 
 void VoxelMesher::build_collider(RID shape) const {
@@ -458,15 +502,47 @@ void VoxelMesher::remove_indices(int idx) {
 	_indices.remove(idx);
 }
 
+VoxelMesher::VoxelMesher(Ref<VoxelmanLibrary> library) {
+	_library = library;
+
+	_voxel_scale = 1;
+	_lod_size = 1;
+
+	_surface_tool.instance();
+}
+
+VoxelMesher::VoxelMesher() {
+
+	_voxel_scale = 1;
+	_lod_size = 1;
+	_ao_strength = 0.25;
+	_base_light_value = 0.5;
+
+	_surface_tool.instance();
+}
+
+VoxelMesher::~VoxelMesher() {
+	_vertices.clear();
+	_normals.clear();
+	_colors.clear();
+	_uvs.clear();
+	_indices.clear();
+	_bones.clear();
+
+	_surface_tool.unref();
+
+	if (_library.is_valid()) {
+		_library.unref();
+	}
+}
 
 void VoxelMesher::_bind_methods() {
 	BIND_VMETHOD(MethodInfo("_add_buffer", PropertyInfo(Variant::OBJECT, "buffer", PROPERTY_HINT_RESOURCE_TYPE, "VoxelBuffer")));
 	BIND_VMETHOD(MethodInfo("_bake_colors", PropertyInfo(Variant::OBJECT, "buffer", PROPERTY_HINT_RESOURCE_TYPE, "VoxelBuffer")));
 
-	ClassDB::bind_method(D_METHOD("add_buffer", "buffer"), &VoxelMesher::add_buffer);
+	ClassDB::bind_method(D_METHOD("get_library"), &VoxelMesher::get_library);
-	ClassDB::bind_method(D_METHOD("add_mesh_data_resource", "mesh", "position", "rotation", "scale"), &VoxelMesher::add_mesh_data_resource, DEFVAL(Vector3(1.0, 1.0, 1.0)), DEFVAL(Vector3()), DEFVAL(Vector3()));
+	ClassDB::bind_method(D_METHOD("set_library", "value"), &VoxelMesher::set_library);
-	ClassDB::bind_method(D_METHOD("add_mesh_data_resource_transform", "transform"), &VoxelMesher::add_mesh_data_resource_transform);
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "library"), "set_library", "get_library");
-	ClassDB::bind_method(D_METHOD("bake_colors", "buffer"), &VoxelMesher::bake_colors);
 
 	ClassDB::bind_method(D_METHOD("get_voxel_scale"), &VoxelMesher::get_voxel_scale);
 	ClassDB::bind_method(D_METHOD("set_voxel_scale", "value"), &VoxelMesher::set_voxel_scale);
@@ -476,9 +552,21 @@ void VoxelMesher::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_lod_size", "value"), &VoxelMesher::set_lod_size);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "lod_size"), "set_lod_size", "get_lod_size");
 
-	ClassDB::bind_method(D_METHOD("get_library"), &VoxelMesher::get_library);
+	ClassDB::bind_method(D_METHOD("get_ao_strength"), &VoxelMesher::get_ao_strength);
-	ClassDB::bind_method(D_METHOD("set_library", "value"), &VoxelMesher::set_library);
+	ClassDB::bind_method(D_METHOD("set_ao_strength", "value"), &VoxelMesher::set_ao_strength);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "library"), "set_library", "get_library");
+	ADD_PROPERTY(PropertyInfo(Variant::REAL, "ao_strength"), "set_ao_strength", "get_ao_strength");
+
+	ClassDB::bind_method(D_METHOD("get_base_light_value"), &VoxelMesher::get_base_light_value);
+	ClassDB::bind_method(D_METHOD("set_base_light_value", "value"), &VoxelMesher::set_base_light_value);
+	ADD_PROPERTY(PropertyInfo(Variant::REAL, "base_light_value"), "set_base_light_value", "get_base_light_value");
+
+
+	ClassDB::bind_method(D_METHOD("add_buffer", "buffer"), &VoxelMesher::add_buffer);
+	ClassDB::bind_method(D_METHOD("add_mesh_data_resource", "mesh", "position", "rotation", "scale"), &VoxelMesher::add_mesh_data_resource, DEFVAL(Vector3(1.0, 1.0, 1.0)), DEFVAL(Vector3()), DEFVAL(Vector3()));
+	ClassDB::bind_method(D_METHOD("add_mesh_data_resource_transform", "transform"), &VoxelMesher::add_mesh_data_resource_transform);
+	ClassDB::bind_method(D_METHOD("bake_colors", "buffer"), &VoxelMesher::bake_colors);
+
+	ClassDB::bind_method(D_METHOD("_bake_colors", "buffer"), &VoxelMesher::_bake_colors);
 
 	ClassDB::bind_method(D_METHOD("get_vertex_count"), &VoxelMesher::get_vertex_count);
 	ClassDB::bind_method(D_METHOD("get_vertex", "idx"), &VoxelMesher::get_vertex);

meshers/voxel_mesher.h

@@ -30,8 +30,20 @@ class VoxelMesher : public Reference {
 	GDCLASS(VoxelMesher, Reference);
 
 public:
-	Ref<VoxelmanLibrary> get_library() { return _library; }
+	Ref<VoxelmanLibrary> get_library();
-	void set_library(Ref<VoxelmanLibrary> library) { _library = library; }
+	void set_library(Ref<VoxelmanLibrary> library);
+
+	float get_ao_strength() const;
+	void set_ao_strength(float value);
+
+	float get_base_light_value() const;
+	void set_base_light_value(float value);
+
+	float get_voxel_scale() const;
+	void set_voxel_scale(const float voxel_scale);
+
+	int get_lod_size() const;
+	void set_lod_size(const int lod_size);
 
 	void reset();
 
@@ -40,11 +52,7 @@ public:
 	void add_mesh_data_resource_transform(Ref<MeshDataResource> mesh, const Transform transform);
 	void bake_colors(Ref<VoxelBuffer> voxels);
 
-	float get_voxel_scale() const;
+	void _bake_colors(Ref<VoxelBuffer> buffer);
-	void set_voxel_scale(const float voxel_scale);
-
-	int get_lod_size() const;
-	void set_lod_size(const int lod_size);
 
 	void build_collider(RID shape) const;
 
@@ -102,6 +110,9 @@ protected:
 	int _lod_size;
 
 	Ref<SurfaceTool> _surface_tool;
+
+	float _ao_strength;
+	float _base_light_value;
 };
 
 #endif

world/voxel_buffer.cpp

@@ -432,6 +432,7 @@ void VoxelBuffer::_bind_methods() {
 	BIND_ENUM_CONSTANT(CHANNEL_LIGHT_COLOR_R);
 	BIND_ENUM_CONSTANT(CHANNEL_LIGHT_COLOR_G);
 	BIND_ENUM_CONSTANT(CHANNEL_LIGHT_COLOR_B);
+	BIND_ENUM_CONSTANT(CHANNEL_AO);
 	BIND_ENUM_CONSTANT(CHANNEL_DATA1);
 	BIND_ENUM_CONSTANT(CHANNEL_DATA2);
 	BIND_ENUM_CONSTANT(MAX_CHANNELS);

world/voxel_chunk.cpp

@@ -625,7 +625,7 @@ void VoxelChunk::draw_cross_voxels_fill(Vector3 pos, float fill) {
 	_debug_drawer->add_vertex(pos + Vector3(0.5 * fill, 0, 0));
 }
 
-void VoxelChunk::draw_debug_voxels_colored(int max, Color color) {
+void VoxelChunk::draw_debug_voxels(int max, Color color) {
 	if (_debug_drawer == NULL) {
 		create_debug_immediate_geometry();
 	}
@@ -846,7 +846,7 @@ void VoxelChunk::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("draw_cross_voxels", "pos"), &VoxelChunk::draw_cross_voxels);
 	ClassDB::bind_method(D_METHOD("draw_cross_voxels_fill", "pos", "fill"), &VoxelChunk::draw_cross_voxels_fill);
-	ClassDB::bind_method(D_METHOD("draw_debug_voxels_colored", "pos", "color"), &VoxelChunk::draw_debug_voxels_colored, DEFVAL(Color(1, 1, 1)));
+	ClassDB::bind_method(D_METHOD("draw_debug_voxels", "pos", "color"), &VoxelChunk::draw_debug_voxels, DEFVAL(Color(1, 1, 1)));
 
 	ClassDB::bind_method(D_METHOD("draw_debug_voxel_lights"), &VoxelChunk::draw_debug_voxel_lights);
 }

world/voxel_chunk.h

@@ -133,7 +133,7 @@ public:
 
 	void draw_cross_voxels(Vector3 pos);
 	void draw_cross_voxels_fill(Vector3 pos, float fill);
-	void draw_debug_voxels_colored(int max, Color color = Color(1, 1, 1));
+	void draw_debug_voxels(int max, Color color = Color(1, 1, 1));
 	void draw_debug_voxel_lights();
 
 	VoxelChunk();