Relintai/props_2d
1
0
Fork 0
mirror of https://github.com/Relintai/props_2d.git synced 2025-02-04 16:15:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

More cleanups to the mesher.

Browse Source
This commit is contained in:
Relintai 2022-02-23 01:52:18 +01:00
parent 9ae6cd5a0b
commit 9cd631a36c
2 changed files with 5 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
prop_2d_mesher.cpp
View File

@ -37,15 +37,6 @@ bool Prop2DMesher::Vertex::operator==(const Vertex &p_vertex) const {
if (uv != p_vertex.uv) if (uv != p_vertex.uv)
return false; return false;
if (uv2 != p_vertex.uv2)
return false;
if (normal != p_vertex.normal)
return false;
if (binormal != p_vertex.binormal)
return false;
if (color != p_vertex.color) if (color != p_vertex.color)
return false; return false;
@ -67,38 +58,13 @@ bool Prop2DMesher::Vertex::operator==(const Vertex &p_vertex) const {
uint32_t Prop2DMesher::VertexHasher::hash(const Vertex &p_vtx) { uint32_t Prop2DMesher::VertexHasher::hash(const Vertex &p_vtx) {
uint32_t h = hash_djb2_buffer((const uint8_t *)&p_vtx.vertex, sizeof(real_t) * 3); uint32_t h = hash_djb2_buffer((const uint8_t *)&p_vtx.vertex, sizeof(real_t) * 3);
h = hash_djb2_buffer((const uint8_t *)&p_vtx.normal, sizeof(real_t) * 3, h);
h = hash_djb2_buffer((const uint8_t *)&p_vtx.binormal, sizeof(real_t) * 3, h);
h = hash_djb2_buffer((const uint8_t *)&p_vtx.tangent, sizeof(real_t) * 3, h);
h = hash_djb2_buffer((const uint8_t *)&p_vtx.uv, sizeof(real_t) * 2, h); h = hash_djb2_buffer((const uint8_t *)&p_vtx.uv, sizeof(real_t) * 2, h);
h = hash_djb2_buffer((const uint8_t *)&p_vtx.uv2, sizeof(real_t) * 2, h);
h = hash_djb2_buffer((const uint8_t *)&p_vtx.color, sizeof(real_t) * 4, h); h = hash_djb2_buffer((const uint8_t *)&p_vtx.color, sizeof(real_t) * 4, h);
h = hash_djb2_buffer((const uint8_t *)p_vtx.bones.ptr(), p_vtx.bones.size() * sizeof(int), h); h = hash_djb2_buffer((const uint8_t *)p_vtx.bones.ptr(), p_vtx.bones.size() * sizeof(int), h);
h = hash_djb2_buffer((const uint8_t *)p_vtx.weights.ptr(), p_vtx.weights.size() * sizeof(float), h); h = hash_djb2_buffer((const uint8_t *)p_vtx.weights.ptr(), p_vtx.weights.size() * sizeof(float), h);
return h; return h;
} }
int Prop2DMesher::get_channel_index_type() const {
return _channel_index_type;
}
void Prop2DMesher::set_channel_index_type(const int value) {
_channel_index_type = value;
}
int Prop2DMesher::get_channel_index_isolevel() const {
return _channel_index_isolevel;
}
void Prop2DMesher::set_channel_index_isolevel(const int value) {
_channel_index_isolevel = value;
}
int Prop2DMesher::get_mesher_index() const {
return _mesher_index;
}
void Prop2DMesher::set_mesher_index(const int value) {
_mesher_index = value;
}
int Prop2DMesher::get_format() const { int Prop2DMesher::get_format() const {
return _format; return _format;
} }
@ -380,12 +346,9 @@ void Prop2DMesher::reset() {
_indices.resize(0); _indices.resize(0);
_last_color = Color(); _last_color = Color();
_last_normal = Vector3();
_last_uv = Vector2(); _last_uv = Vector2();
_last_uv2 = Vector2();
_last_bones.clear(); _last_bones.clear();
_last_weights.clear(); _last_weights.clear();
_last_tangent = Plane();
} }
void Prop2DMesher::add_tiled_wall_simple(const int width, const int height, const Transform2D &transform, const Ref<TiledWall2DData> &tiled_wall_data, Ref<Prop2DMaterialCache> cache) { void Prop2DMesher::add_tiled_wall_simple(const int width, const int height, const Transform2D &transform, const Ref<TiledWall2DData> &tiled_wall_data, Ref<Prop2DMaterialCache> cache) {
@ -711,7 +674,7 @@ float Prop2DMesher::get_random_ao(const Vector2 &position) {
return val; return val;
} }
Color Prop2DMesher::get_light_color_at(const Vector2 &position, const Vector3 &normal) { Color Prop2DMesher::get_light_color_at(const Vector2 &position) {
Vector3 v_lightDiffuse; Vector3 v_lightDiffuse;
//calculate the lights value //calculate the lights value
@ -724,18 +687,10 @@ Color Prop2DMesher::get_light_color_at(const Vector2 &position, const Vector3 &n
//inverse sqrt //inverse sqrt
lightDir *= (1.0 / sqrt(dist2)); lightDir *= (1.0 / sqrt(dist2));
float NdotL = 1.0;//normal.dot(lightDir);
if (NdotL > 1.0) {
NdotL = 1.0;
} else if (NdotL < 0.0) {
NdotL = 0.0;
}
Color cc = light->get_color(); Color cc = light->get_color();
Vector3 cv(cc.r, cc.g, cc.b); Vector3 cv(cc.r, cc.g, cc.b);
Vector3 value = cv * (NdotL / (1.0 + dist2)); Vector3 value = cv * (1.0 / (1.0 + dist2));
value *= light->get_size(); value *= light->get_size();
v_lightDiffuse += value; v_lightDiffuse += value;
@ -855,7 +810,7 @@ void Prop2DMesher::bake_colors_lights_rao() {
Vertex vertex = _vertices[i]; Vertex vertex = _vertices[i];
Vector2 vert = vertex.vertex; Vector2 vert = vertex.vertex;
Color light = get_light_color_at(vert, vertex.normal); Color light = get_light_color_at(vert);
float rao = get_random_ao(vert) * _ao_strength; float rao = get_random_ao(vert) * _ao_strength;
@ -883,7 +838,7 @@ void Prop2DMesher::bake_colors_lights() {
Vertex vertex = _vertices[i]; Vertex vertex = _vertices[i];
Vector2 vert = vertex.vertex; Vector2 vert = vertex.vertex;
Color light = get_light_color_at(vert, vertex.normal); Color light = get_light_color_at(vert);
light.r += _base_light_value; light.r += _base_light_value;
light.g += _base_light_value; light.g += _base_light_value;
@ -1014,14 +969,10 @@ void Prop2DMesher::add_vertex(const Vector2 &vertex) {
Vertex vtx; Vertex vtx;
vtx.vertex = vertex; vtx.vertex = vertex;
vtx.color = _last_color; vtx.color = _last_color;
vtx.normal = _last_normal;
vtx.uv = _last_uv; vtx.uv = _last_uv;
vtx.uv2 = _last_uv2;
// Todo? // Todo?
// vtx.weights = _last_weights; // vtx.weights = _last_weights;
// vtx.bones = _last_bones; // vtx.bones = _last_bones;
// vtx.tangent = _last_tangent.normal;
// vtx.binormal = _last_normal.cross(_last_tangent.normal).normalized() * _last_tangent.d;
_vertices.push_back(vtx); _vertices.push_back(vtx);
} }
@ -1121,14 +1072,11 @@ void Prop2DMesher::remove_index(const int idx) {
} }
Prop2DMesher::Prop2DMesher() { Prop2DMesher::Prop2DMesher() {
_mesher_index = 0;
_voxel_scale = 1; _voxel_scale = 1;
_ao_strength = 0.25; _ao_strength = 0.25;
_base_light_value = 0.5; _base_light_value = 0.5;
_uv_margin = Rect2(0, 0, 1, 1); _uv_margin = Rect2(0, 0, 1, 1);
_format = 0; _format = 0;
_channel_index_type = 0;
_channel_index_isolevel = 0;
_texture_scale = 1; _texture_scale = 1;
_build_flags = 0; _build_flags = 0;
@ -1149,18 +1097,6 @@ Prop2DMesher::~Prop2DMesher() {
} }
void Prop2DMesher::_bind_methods() { void Prop2DMesher::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_channel_index_type"), &Prop2DMesher::get_channel_index_type);
ClassDB::bind_method(D_METHOD("set_channel_index_type", "value"), &Prop2DMesher::set_channel_index_type);
ADD_PROPERTY(PropertyInfo(Variant::INT, "channel_index_type"), "set_channel_index_type", "get_channel_index_type");
ClassDB::bind_method(D_METHOD("get_channel_index_isolevel"), &Prop2DMesher::get_channel_index_isolevel);
ClassDB::bind_method(D_METHOD("set_channel_index_isolevel", "value"), &Prop2DMesher::set_channel_index_isolevel);
ADD_PROPERTY(PropertyInfo(Variant::INT, "channel_index_isolevel"), "set_channel_index_isolevel", "get_channel_index_isolevel");
ClassDB::bind_method(D_METHOD("get_mesher_index"), &Prop2DMesher::get_mesher_index);
ClassDB::bind_method(D_METHOD("set_mesher_index", "value"), &Prop2DMesher::set_mesher_index);
ADD_PROPERTY(PropertyInfo(Variant::INT, "mesher_index"), "set_mesher_index", "get_mesher_index");
ClassDB::bind_method(D_METHOD("get_format"), &Prop2DMesher::get_format); ClassDB::bind_method(D_METHOD("get_format"), &Prop2DMesher::get_format);
ClassDB::bind_method(D_METHOD("set_format", "value"), &Prop2DMesher::set_format); ClassDB::bind_method(D_METHOD("set_format", "value"), &Prop2DMesher::set_format);
ADD_PROPERTY(PropertyInfo(Variant::INT, "format"), "set_format", "get_format"); ADD_PROPERTY(PropertyInfo(Variant::INT, "format"), "set_format", "get_format");

20
prop_2d_mesher.h
View File

@ -84,11 +84,7 @@ public:
struct Vertex { struct Vertex {
Vector2 vertex; Vector2 vertex;
Color color; Color color;
Vector3 normal; // normal, binormal, tangent
Vector3 binormal;
Vector3 tangent;
Vector2 uv; Vector2 uv;
Vector2 uv2;
Vector<int> bones; Vector<int> bones;
Vector<float> weights; Vector<float> weights;
@ -110,15 +106,6 @@ public:
}; };
public: public:
int get_channel_index_type() const;
void set_channel_index_type(const int value);
int get_channel_index_isolevel() const;
void set_channel_index_isolevel(const int value);
int get_mesher_index() const;
void set_mesher_index(const int value);
int get_format() const; int get_format() const;
void set_format(const int value); void set_format(const int value);
@ -157,7 +144,7 @@ public:
void generate_ao(); void generate_ao();
float get_random_ao(const Vector2 &position); float get_random_ao(const Vector2 &position);
Color get_light_color_at(const Vector2 &position, const Vector3 &normal); Color get_light_color_at(const Vector2 &position);
void add_mesher(const Ref<Prop2DMesher> &mesher); void add_mesher(const Ref<Prop2DMesher> &mesher);
void _add_mesher(const Ref<Prop2DMesher> &mesher); void _add_mesher(const Ref<Prop2DMesher> &mesher);
@ -215,8 +202,6 @@ protected:
int _channel_index_type; int _channel_index_type;
int _channel_index_isolevel; int _channel_index_isolevel;
int _mesher_index;
int _format; int _format;
int _texture_scale; int _texture_scale;
@ -226,12 +211,9 @@ protected:
Vector<Ref<Prop2DLight>> _lights; Vector<Ref<Prop2DLight>> _lights;
Color _last_color; Color _last_color;
Vector3 _last_normal;
Vector2 _last_uv; Vector2 _last_uv;
Vector2 _last_uv2;
Vector<int> _last_bones; Vector<int> _last_bones;
Vector<float> _last_weights; Vector<float> _last_weights;
Plane _last_tangent;
Ref<Material> _material; Ref<Material> _material;