Unverified Commit 474dba22 authored by Sumeyra Demir Kanik's avatar Sumeyra Demir Kanik
Browse files

Radius editing for only diegetic objects

parent 82ef1c3e
Loading
Loading
Loading
Loading
Loading
+13 −15
Original line number Diff line number Diff line
@@ -4165,6 +4165,19 @@ static void do_object_editing(
                        editableParameters->ism_metadata[obj_idx].pitch = readInfo->obj_pitch[obj_idx];
                    }
                }
                /* radius editing only for diegetic objects */
                if ( readInfo->obj_radius_edited[obj_idx] )
                {
                    if ( readInfo->obj_radius_relative[obj_idx] )
                    {
                        /* radius: apply relative edit + saturation */
                        editableParameters->ism_metadata[obj_idx].radius = fmaxf( fminf( editableParameters->ism_metadata[obj_idx].radius * readInfo->obj_radius[obj_idx], OBJ_EDIT_RADIUS_MAX ), 0.0f );
                    }
                    else
                    {
                        editableParameters->ism_metadata[obj_idx].radius = readInfo->obj_radius[obj_idx];
                    }
                }
#endif
            }

@@ -4181,21 +4194,6 @@ static void do_object_editing(
                    editableParameters->ism_metadata[obj_idx].gain = readInfo->obj_gain[obj_idx];
                }
            }
#ifdef FIX_1427_OBJ_EDITING_EXT_METADATA
            /* radius editing for all objects */
            if ( readInfo->obj_radius_edited[obj_idx] )
            {
                if ( readInfo->obj_radius_relative[obj_idx] )
                {
                    /* radius: apply relative edit + saturation */
                    editableParameters->ism_metadata[obj_idx].radius = fmaxf( fminf( editableParameters->ism_metadata[obj_idx].radius * readInfo->obj_radius[obj_idx], OBJ_EDIT_RADIUS_MAX ), 0.0f );
                }
                else
                {
                    editableParameters->ism_metadata[obj_idx].radius = readInfo->obj_radius[obj_idx];
                }
            }
#endif
        }
    }
    else