Allow polygon collision to be optionally disabled

Author: erayzesen

.sconsign.dblite

@@ -56,6 +56,7 @@ sources/1 = SubResource("TileSetAtlasSource_qdrbb")
 metadata/_edit_horizontal_guides_ = [352.0]
 
 [node name="QWorldNode" type="QWorldNode" parent="."]
+debug_renderer = false
 enable_debug_mouse_interactions = true
 
 [node name="background" type="ColorRect" parent="."]
@@ -132,22 +133,21 @@ data_uv_maps = Array[PackedInt32Array]([PackedInt32Array(0, 1, 3), PackedInt32Ar
 
 [node name="Water" type="QSoftBodyNode" parent="."]
 rigidity = 0.01
-shape_matching = true
-shape_matching_rate = 0.02
 use_custom_gravity = true
 position = Vector2(640, 480)
 
 [node name="QMeshAdvancedNode" type="QMeshAdvancedNode" parent="Water"]
-enable_springs = false
+disable_polygon_for_collisions = true
 enable_vector_rendering = true
 fill_color = Color(0.146318, 0.398419, 0.80446, 0.803922)
 enable_stroke = true
 enable_curved_corners = true
-curve_length = 5.0
+curve_length = 4.0
+enable_particle_rendering = false
 data_particle_positions = PackedVector2Array(-73, -20, -25, -20, 31, -20, 87, -20, 151, -20, -72, 16, -24, 16, 32, 16, 88, 16, 152, 16, -72, 56, -24, 56, 32, 56, 88, 56, 152, 56, -72, 104, -24, 104, 32, 104, 88, 104, 152, 104)
-data_particle_radius = PackedFloat32Array(5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5)
+data_particle_radius = PackedFloat32Array(18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18)
 data_particle_is_internal = PackedByteArray("AAAAAAAAAQEBAAABAQEAAAAAAAA=")
-data_particle_is_enabled = PackedByteArray("AAEBAQAAAQEBAAABAQEAAAAAAAA=")
+data_particle_is_enabled = PackedByteArray("AAEBAQAAAAEBAAAAAQEAAAAAAAA=")
 data_particle_is_lazy = PackedByteArray("AAEBAQAAAQEBAAABAQEAAAAAAAA=")
 data_springs = Array[PackedInt32Array]([PackedInt32Array(0, 1), PackedInt32Array(1, 2), PackedInt32Array(2, 3), PackedInt32Array(3, 4), PackedInt32Array(4, 9), PackedInt32Array(9, 14), PackedInt32Array(14, 19), PackedInt32Array(15, 10), PackedInt32Array(10, 5), PackedInt32Array(5, 0)])
 data_internal_springs = Array[PackedInt32Array]([PackedInt32Array(0, 6), PackedInt32Array(1, 7), PackedInt32Array(1, 5), PackedInt32Array(1, 6), PackedInt32Array(2, 8), PackedInt32Array(2, 6), PackedInt32Array(2, 7), PackedInt32Array(3, 9), PackedInt32Array(3, 7), PackedInt32Array(3, 8), PackedInt32Array(4, 8), PackedInt32Array(6, 5), PackedInt32Array(5, 11), PackedInt32Array(7, 6), PackedInt32Array(6, 12), PackedInt32Array(6, 10), PackedInt32Array(6, 11), PackedInt32Array(8, 7), PackedInt32Array(7, 13), PackedInt32Array(7, 11), PackedInt32Array(7, 12), PackedInt32Array(9, 8), PackedInt32Array(8, 14), PackedInt32Array(8, 12), PackedInt32Array(8, 13), PackedInt32Array(9, 13), PackedInt32Array(11, 10), PackedInt32Array(10, 16), PackedInt32Array(12, 11), PackedInt32Array(11, 17), PackedInt32Array(11, 15), PackedInt32Array(11, 16), PackedInt32Array(13, 12), PackedInt32Array(12, 18), PackedInt32Array(12, 16), PackedInt32Array(12, 17), PackedInt32Array(14, 13), PackedInt32Array(13, 19), PackedInt32Array(13, 17), PackedInt32Array(13, 18), PackedInt32Array(14, 18), PackedInt32Array(16, 15), PackedInt32Array(17, 16), PackedInt32Array(18, 17), PackedInt32Array(19, 18)])

project/addons/quarkphysics/bin/libquarkphysics.linux.template_debug.x86_64.so

@@ -66,7 +66,7 @@ void QMesh::UpdateCollisionBehavior()
 		return;
 
 
-	if(GetPolygonParticleCount()>0){
+	if(GetPolygonParticleCount()>0 && disablePolygonForCollisions==false){
 		if(ownerBody->simulationModel==QBody::SimulationModels::RIGID_BODY){
 			collisionBehavior=CollisionBehaviors::POLYGONS;
 		}else{

project/examples/7_classic_platformer/main.tscn

@@ -67,6 +67,7 @@ struct QMesh
 	QBody *ownerBody=nullptr;
 	CollisionBehaviors collisionBehavior=CollisionBehaviors::CIRCLES;
 	vector<vector<int>> UVMaps=vector<vector<int>>();
+	bool disablePolygonForCollisions=false;
 
 	bool collisionBehaviorNeedsUpdate=false;
 
@@ -242,6 +243,15 @@ struct QMesh
 		}
 		return collisionBehavior;
 	}
+	/** Returns whether the polygon is disabled for collisions.
+
+		The polygon defined for the mesh is disabled during collision behavior determination and
+		is not used in collisions. As a result, collisions are handled by the particles.
+		The polygon can optionally be used for rendering purposes and other external
+		purposes in the related simulation.  */
+	bool GetPolygonForCollisionsDisabled(){
+		return disablePolygonForCollisions;
+	}
 
 
 	//General Set Methods
@@ -269,6 +279,20 @@ struct QMesh
 		rotation=value;
 		return this;
 	}
+
+	/** Sets whether the polygon is disabled for collisions.
+	 * The polygon defined for the mesh is disabled during collision behavior determination and
+	 * is not used in collisions. As a result, collisions are handled by the particles.
+	 * The polygon can optionally be used for rendering purposes and other external
+	 * purposes in the related simulation. 
+	 * @param value The boolean value to set.
+	 * @return QMesh* A pointer to mesh itself.
+	 */
+	QMesh *SetPolygonForCollisionsDisabled(bool value){
+		disablePolygonForCollisions=value;
+		collisionBehaviorNeedsUpdate=true;
+		return this;
+	}
 
 
 

src/QuarkPhysics/extensions/qplatformerbody.os

@@ -586,6 +586,10 @@ void QMeshNode::on_post_enter_tree() {
         }
         set_mesh_position(get_position());
         set_mesh_rotation(get_rotation());
+
+        //Re-Set Properties of Mesh Object
+        meshObject->SetPolygonForCollisionsDisabled(disablePolygonForCollisions);
+        
         if(ownerBodyNode==nullptr){
             QBodyNode *bodyNode=QBodyNode::type_cast(get_parent());
             if(bodyNode!=nullptr){
@@ -773,12 +777,14 @@ void QMeshNode::_bind_methods()
     ClassDB::bind_method(D_METHOD("get_owner_body_node"),&QMeshNode::get_owner_body_node );
     ClassDB::bind_method(D_METHOD("get_springs_enabled"),&QMeshNode::get_springs_enabled );
     ClassDB::bind_method(D_METHOD("get_polygons_enabled"),&QMeshNode::get_polygons_enabled );
+    ClassDB::bind_method(D_METHOD("get_polygon_for_collision_disabled"),&QMeshNode::get_polygon_for_collision_disabled );
     //Set
     ClassDB::bind_method(D_METHOD("set_mesh_position"),&QMeshNode::set_mesh_position );
     ClassDB::bind_method(D_METHOD("set_mesh_global_position"),&QMeshNode::set_mesh_global_position );
     ClassDB::bind_method(D_METHOD("set_mesh_rotation"),&QMeshNode::set_mesh_rotation );
     ClassDB::bind_method(D_METHOD("set_springs_enabled","value"),&QMeshNode::set_springs_enabled );
     ClassDB::bind_method(D_METHOD("set_polygons_enabled","value"),&QMeshNode::set_polygons_enabled );
+    ClassDB::bind_method(D_METHOD("set_polygon_for_collision_disabled","value"),&QMeshNode::set_polygon_for_collision_disabled );
     //Particle Operations
     ClassDB::bind_method(D_METHOD("add_particle","particle_object"),&QMeshNode::add_particle );
     ClassDB::bind_method(D_METHOD("remove_particle","particle_object"),&QMeshNode::remove_particle );
@@ -894,6 +900,8 @@ void QMeshNode::_bind_methods()
 
 
     //Props
+    ADD_PROPERTY( PropertyInfo(Variant::BOOL , "disable_polygon_for_collisions"), "set_polygon_for_collision_disabled","get_polygon_for_collision_disabled" );
+
     ADD_PROPERTY( PropertyInfo(Variant::BOOL , "enable_springs"), "set_springs_enabled","get_springs_enabled" );
     ADD_PROPERTY( PropertyInfo(Variant::BOOL , "enable_polygons"), "set_polygons_enabled","get_polygons_enabled" );
 
@@ -1021,6 +1029,11 @@ float QMeshNode::get_min_angle_constraint_of_polygon() {
 	return meshObject->GetMinAngleConstraintOfPolygon();
 }
 
+bool QMeshNode::get_polygon_for_collision_disabled()
+{
+    return disablePolygonForCollisions;
+}
+
 QBodyNode * QMeshNode::get_owner_body_node(){
     return ownerBodyNode;
 }
@@ -1058,6 +1071,15 @@ QMeshNode *QMeshNode::set_min_angle_constraint_of_polygon(bool value) {
     return this;
 }
 
+QMeshNode *QMeshNode::set_polygon_for_collision_disabled(bool value)
+{
+    disablePolygonForCollisions=value;
+    if ( Engine::get_singleton()->is_editor_hint()==false && meshObject!=nullptr ){
+        meshObject->SetPolygonForCollisionsDisabled(value);
+    }
+    return this;
+}
+
 //Particle Operations
 QMeshNode *QMeshNode::add_particle(Ref<QParticleObject> particle_object) {
     if(particle_object.is_valid()==false ){

src/QuarkPhysics/extensions/qspatialhashing.os

@@ -52,6 +52,7 @@ class QMeshNode: public Node2D{
     bool enableSprings=true;
     bool enablePolygons=true;
     float particleRadius=0.5f;
+    bool disablePolygonForCollisions=false;
 
     QMesh *meshObject=nullptr;
     QBodyNode *ownerBodyNode=nullptr;
@@ -171,7 +172,10 @@ class QMeshNode: public Node2D{
     Array get_matching_particle_positions(TypedArray<QParticleObject> particle_collection,Vector2 target_position,float target_rotation);
     float get_min_angle_constraint_of_polygon();
 
+    bool get_polygon_for_collision_disabled();
+
     QBodyNode *get_owner_body_node();
+    
 
     //Set Methods
     QMeshNode *set_mesh_position(Vector2 value);
@@ -180,6 +184,7 @@ class QMeshNode: public Node2D{
     QMeshNode *set_springs_enabled(bool value);
     QMeshNode *set_polygons_enabled(bool value);
     QMeshNode *set_min_angle_constraint_of_polygon(bool value);
+    QMeshNode *set_polygon_for_collision_disabled(bool value);
 
 
     //Particle Operations