Skip to content

Use new property options api #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jhonnyg merged 2 commits into from
Feb 3, 2026
Merged

Use new property options api #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a19b94
Use new property options api
Jhonnyg Feb 3, 2026
e123523
Update defold_min_version
Jhonnyg Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions defold-rive/src/comp_rive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,11 @@ namespace dmRive
}
}
}
return dmGameSystem::GetMaterialConstant(GetMaterial(component, component->m_Resource), params.m_PropertyId, params.m_Options.m_Index, out_value, false, CompRiveGetConstantCallback, component);

int32_t value_index = 0;
dmGameObject::GetPropertyOptionsIndex(params.m_Options, 0, &value_index);

return dmGameSystem::GetMaterialConstant(GetMaterial(component, component->m_Resource), params.m_PropertyId, value_index, out_value, false, CompRiveGetConstantCallback, component);
}

dmGameObject::PropertyResult CompRiveSetProperty(const dmGameObject::ComponentSetPropertyParams& params)
Expand Down Expand Up @@ -1269,7 +1273,9 @@ namespace dmRive
}
}
}
return dmGameSystem::SetMaterialConstant(GetMaterial(component, component->m_Resource), params.m_PropertyId, params.m_Value, params.m_Options.m_Index, CompRiveSetConstantCallback, component);
int32_t value_index = 0;
dmGameObject::GetPropertyOptionsIndex(params.m_Options, 0, &value_index);
return dmGameSystem::SetMaterialConstant(GetMaterial(component, component->m_Resource), params.m_PropertyId, params.m_Value, value_index, CompRiveSetConstantCallback, component);
}

static void ResourceReloadedCallback(const dmResource::ResourceReloadedParams* params)
Expand Down
2 changes: 1 addition & 1 deletion game.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies#0 = https://github.com/andsve/dirtylarry/archive/master.zip

[library]
include_dirs = defold-rive
defold_min_version = 1.12.0
defold_min_version = 1.12.2

[graphics]
max_draw_calls = 1024
Expand Down
Loading