Fixed TileMapLayer scaled problems and solved scaled QMeshNode render…

… problems.
erayzesen · Jan 17, 2025 · 69aced6 · 69aced6
1 parent eee1973
commit 69aced6
Show file tree

Hide file tree

Showing 42 changed files with 18 additions and 4 deletions.
diff --git a/.sconsign.dblite b/.sconsign.dblite
diff --git a/project/addons/quarkphysics/bin/libquarkphysics.linux.template_debug.x86_64.so b/project/addons/quarkphysics/bin/libquarkphysics.linux.template_debug.x86_64.so
diff --git a/project/addons/quarkphysics/helper_nodes/qtilemap_collider.gd b/project/addons/quarkphysics/helper_nodes/qtilemap_collider.gd
@@ -138,8 +138,12 @@ func parse_tile_map() :
 		bodyNode.collidable_layers=collider_layer["body_collidable_layers_bit"]
 		bodyNodes.add_child(bodyNode)
 
+
 		for polygon in collider_layer["polygons"] :
 			var decomp_polygons=Geometry2D.decompose_polygon_in_convex(polygon)
+			for decomp_poly in decomp_polygons : 
+				for i in range(decomp_poly.size()) :
+					decomp_poly[i]=decomp_poly[i]*tile_map.global_scale
 			for decomp_poly in decomp_polygons : 
 				create_and_add_mesh_with_cell_data(bodyNode,decomp_poly)
 

diff --git a/project/examples/7_classic_platformer/main.tscn b/project/examples/7_classic_platformer/main.tscn
@@ -133,7 +133,7 @@ data_uv_maps = Array[PackedInt32Array]([PackedInt32Array(0, 1, 3), PackedInt32Ar
 [node name="Water" type="QSoftBodyNode" parent="."]
 rigidity = 0.01
 use_custom_gravity = true
-position = Vector2(754, 785)
+position = Vector2(656, 496)
 
 [node name="QMeshAdvancedNode" type="QMeshAdvancedNode" parent="Water"]
 disable_polygon_for_collisions = true

diff --git a/src/QuarkPhysics/extensions/qplatformerbody.os b/src/QuarkPhysics/extensions/qplatformerbody.os
diff --git a/src/QuarkPhysics/extensions/qspatialhashing.os b/src/QuarkPhysics/extensions/qspatialhashing.os
diff --git a/src/QuarkPhysics/json/json.os b/src/QuarkPhysics/json/json.os
diff --git a/src/QuarkPhysics/qaabb.os b/src/QuarkPhysics/qaabb.os
diff --git a/src/QuarkPhysics/qareabody.os b/src/QuarkPhysics/qareabody.os
diff --git a/src/QuarkPhysics/qbody.os b/src/QuarkPhysics/qbody.os
diff --git a/src/QuarkPhysics/qbroadphase.os b/src/QuarkPhysics/qbroadphase.os
diff --git a/src/QuarkPhysics/qcollision.os b/src/QuarkPhysics/qcollision.os
diff --git a/src/QuarkPhysics/qgizmos.os b/src/QuarkPhysics/qgizmos.os
diff --git a/src/QuarkPhysics/qjoint.os b/src/QuarkPhysics/qjoint.os
diff --git a/src/QuarkPhysics/qmanifold.os b/src/QuarkPhysics/qmanifold.os
diff --git a/src/QuarkPhysics/qmesh.os b/src/QuarkPhysics/qmesh.os
diff --git a/src/QuarkPhysics/qobjectpool.os b/src/QuarkPhysics/qobjectpool.os
diff --git a/src/QuarkPhysics/qparticle.os b/src/QuarkPhysics/qparticle.os
diff --git a/src/QuarkPhysics/qraycast.os b/src/QuarkPhysics/qraycast.os
diff --git a/src/QuarkPhysics/qrigidbody.os b/src/QuarkPhysics/qrigidbody.os
diff --git a/src/QuarkPhysics/qsoftbody.os b/src/QuarkPhysics/qsoftbody.os
diff --git a/src/QuarkPhysics/qspring.os b/src/QuarkPhysics/qspring.os
diff --git a/src/QuarkPhysics/quarkphysics.os b/src/QuarkPhysics/quarkphysics.os
diff --git a/src/QuarkPhysics/qvector.os b/src/QuarkPhysics/qvector.os
diff --git a/src/QuarkPhysics/qworld.os b/src/QuarkPhysics/qworld.os
diff --git a/src/qareabody_node.os b/src/qareabody_node.os
diff --git a/src/qbody_node.os b/src/qbody_node.os
diff --git a/src/qjoint_object.os b/src/qjoint_object.os
diff --git a/src/qmesh_advanced_node.os b/src/qmesh_advanced_node.os
diff --git a/src/qmesh_circle_node.os b/src/qmesh_circle_node.os
diff --git a/src/qmesh_node.cpp b/src/qmesh_node.cpp
@@ -328,7 +328,7 @@ void QMeshNode::debug_render_in_runtime()
     QDebugColors colors;
 
     bool isOwnerBodyRigid=false;
-
+    Vector2 node_scale_inverse_factor=Vector2(1/get_global_scale().x,1/get_global_scale().y);
     //Drawing springs
     if(ownerBodyNode!=nullptr){
         if(ownerBodyNode->bodyObject->GetBodyType()!=QBody::BodyTypes::RIGID){
@@ -340,6 +340,8 @@ void QMeshNode::debug_render_in_runtime()
                 QVector qpb=spring->GetParticleB()->GetGlobalPosition();
                 Vector2 pA=( Vector2(qpa.x,qpa.y)-get_global_position() ).rotated(-get_global_rotation() );
                 Vector2 pB=( Vector2(qpb.x,qpb.y)-get_global_position() ).rotated(-get_global_rotation() );
+                pA*=node_scale_inverse_factor;
+                pB*=node_scale_inverse_factor;
                 rs->canvas_item_add_line(debugRenderInstance,pA,pB,springColor);
 
             }
@@ -363,6 +365,8 @@ void QMeshNode::debug_render_in_runtime()
             QVector qpn=meshObject->GetParticleFromPolygon((n+1)%meshObject->GetPolygonParticleCount())->GetGlobalPosition();
             Vector2 p=(Vector2(qp.x,qp.y)-get_global_position() ).rotated(-get_global_rotation() ) ;
             Vector2 pn=( Vector2(qpn.x,qpn.y)-get_global_position() ).rotated(-get_global_rotation() );
+            p*=node_scale_inverse_factor;
+            pn*=node_scale_inverse_factor;
             rs->canvas_item_add_line(debugRenderInstance,p,pn,colliderColor);
         }
     }
@@ -371,6 +375,7 @@ void QMeshNode::debug_render_in_runtime()
         QParticle *particle=meshObject->GetParticleAt(i);
         Vector2 pos=Vector2( particle->GetGlobalPosition().x, particle->GetGlobalPosition().y )-get_global_position();
         pos=pos.rotated(-get_global_rotation() );
+        pos*=node_scale_inverse_factor;
         float radius=particle->GetRadius();
         Color particleColor=colors.COLLIDER_PARTICLE;
         if (particle->GetIsLazy()==true){
@@ -414,6 +419,8 @@ void QMeshNode::vector_render_in_runtime()
     if(enableVectorRendering==false)
         return;
 
+    Vector2 node_scale_inverse_factor=Vector2(1/get_global_scale().x,1/get_global_scale().y);
+
     PackedColorArray fillColors;
     fillColors.push_back(fillColor);	
     PackedColorArray strokeColors;
@@ -426,7 +433,8 @@ void QMeshNode::vector_render_in_runtime()
         for(int n=0;n<polygonSize;n++){
             QVector qpg=meshObject->GetParticleFromPolygon(n)->GetGlobalPosition();
             QVector qpl=meshObject->GetParticleFromPolygon(n)->GetPosition();
-            Vector2 pg=(Vector2(qpg.x,qpg.y)-get_global_position() ).rotated(-get_global_rotation() ); 
+            Vector2 pg=(Vector2(qpg.x,qpg.y)-get_global_position() ).rotated(-get_global_rotation() );
+            pg*=node_scale_inverse_factor; 
             Vector2 pl=Vector2(qpl.x,qpl.y);
             polygonPoints.push_back(pg );
             polygonLocalPoints.push_back(pl );
@@ -657,7 +665,9 @@ QMesh::MeshData QMeshNode::convert_mesh_node_data_to_mesh_data()
 
     QMesh::MeshData qData;
     for(size_t i=0;i<dataParticlePositions.size();++i){
-        qData.particlePositions.push_back( QVector( dataParticlePositions[i].x, dataParticlePositions[i].y) );
+        Vector2 pos=dataParticlePositions[i];
+        pos*=get_global_scale();
+        qData.particlePositions.push_back( QVector( pos.x, pos.y) );
     }
 
     for(size_t i=0;i<dataParticlePositions.size();++i){

diff --git a/src/qmesh_node.os b/src/qmesh_node.os
diff --git a/src/qmesh_polygon_node.os b/src/qmesh_polygon_node.os
diff --git a/src/qmesh_rect_node.os b/src/qmesh_rect_node.os
diff --git a/src/qparticle_object.os b/src/qparticle_object.os
diff --git a/src/qplatformerbody_node.os b/src/qplatformerbody_node.os
diff --git a/src/qraycast_object.os b/src/qraycast_object.os
diff --git a/src/qrigidbody_node.os b/src/qrigidbody_node.os
diff --git a/src/qsoftbody_node.os b/src/qsoftbody_node.os
diff --git a/src/qspring_object.os b/src/qspring_object.os
diff --git a/src/qworld_node.os b/src/qworld_node.os
diff --git a/src/register_types.os b/src/register_types.os