Skip to content

Add SharedString defaults to reflection database #458

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
kennethloeffler merged 2 commits into from
Oct 23, 2024
Merged

Add SharedString defaults to reflection database #458

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
5d18294
Add SharedString defaults to reflection database
kennethloeffler Oct 23, 2024
c6653c3
Check SharedString default via borrow, not matching Cow::Owned
kennethloeffler Oct 23, 2024
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
2 changes: 1 addition & 1 deletion rbx_binary/src/serializer/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ impl<'dom, 'db, W: Write> SerializerState<'dom, 'db, W> {
// There's no assurance that the default SharedString value
// will actually get serialized inside of the SSTR chunk, so we
// check here just to make sure.
if let Cow::Owned(Variant::SharedString(sstr)) = &default_value {
if let Variant::SharedString(sstr) = default_value.borrow() {
if !self.shared_string_ids.contains_key(sstr) {
self.shared_string_ids.insert(sstr.clone(), 0);
self.shared_strings.push(sstr.clone());
Expand Down
93 changes: 93 additions & 0 deletions rbx_dom_lua/src/database.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,9 @@
]
}
},
"ModelMeshData": {
"SharedString": ""
},
"ModelMeshSize": {
"Vector3": [
0.0,
Expand Down Expand Up @@ -22232,6 +22235,9 @@
]
}
},
"ModelMeshData": {
"SharedString": ""
},
"ModelMeshSize": {
"Vector3": [
0.0,
Expand Down Expand Up @@ -27034,6 +27040,9 @@
]
}
},
"ModelMeshData": {
"SharedString": ""
},
"ModelMeshSize": {
"Vector3": [
0.0,
Expand Down Expand Up @@ -30797,6 +30806,9 @@
"Superclass": "PartOperation",
"Properties": {},
"DefaultProperties": {
"AeroMeshData": {
"SharedString": ""
},
"Anchored": {
"Bool": false
},
Expand Down Expand Up @@ -30877,6 +30889,9 @@
"ChildData": {
"BinaryString": ""
},
"ChildData2": {
"SharedString": ""
},
"CollisionGroup": {
"String": "Default"
},
Expand Down Expand Up @@ -30954,6 +30969,12 @@
"MeshData": {
"BinaryString": ""
},
"MeshData2": {
"SharedString": ""
},
"PhysicalConfigData": {
"SharedString": ""
},
"PhysicsData": {
"BinaryString": ""
},
Expand Down Expand Up @@ -35598,6 +35619,9 @@
}
},
"DefaultProperties": {
"AeroMeshData": {
"SharedString": ""
},
"Anchored": {
"Bool": false
},
Expand Down Expand Up @@ -35762,6 +35786,9 @@
"MeshId": {
"Content": ""
},
"PhysicalConfigData": {
"SharedString": ""
},
"PhysicsData": {
"BinaryString": ""
},
Expand Down Expand Up @@ -36534,6 +36561,9 @@
]
}
},
"ModelMeshData": {
"SharedString": ""
},
"ModelMeshSize": {
"Vector3": [
0.0,
Expand Down Expand Up @@ -37314,6 +37344,9 @@
"Superclass": "PartOperation",
"Properties": {},
"DefaultProperties": {
"AeroMeshData": {
"SharedString": ""
},
"Anchored": {
"Bool": true
},
Expand Down Expand Up @@ -37394,6 +37427,9 @@
"ChildData": {
"BinaryString": ""
},
"ChildData2": {
"SharedString": ""
},
"CollisionGroup": {
"String": "Default"
},
Expand Down Expand Up @@ -37471,6 +37507,12 @@
"MeshData": {
"BinaryString": ""
},
"MeshData2": {
"SharedString": ""
},
"PhysicalConfigData": {
"SharedString": ""
},
"PhysicsData": {
"BinaryString": ""
},
Expand Down Expand Up @@ -39644,6 +39686,9 @@
}
},
"DefaultProperties": {
"AeroMeshData": {
"SharedString": ""
},
"Anchored": {
"Bool": false
},
Expand Down Expand Up @@ -39724,6 +39769,9 @@
"ChildData": {
"BinaryString": ""
},
"ChildData2": {
"SharedString": ""
},
"CollisionGroup": {
"String": "Default"
},
Expand Down Expand Up @@ -39801,6 +39849,12 @@
"MeshData": {
"BinaryString": ""
},
"MeshData2": {
"SharedString": ""
},
"PhysicalConfigData": {
"SharedString": ""
},
"PhysicsData": {
"BinaryString": ""
},
Expand Down Expand Up @@ -65305,6 +65359,9 @@
]
}
},
"ModelMeshData": {
"SharedString": ""
},
"ModelMeshSize": {
"Vector3": [
0.0,
Expand Down Expand Up @@ -68951,6 +69008,9 @@
"Superclass": "PartOperation",
"Properties": {},
"DefaultProperties": {
"AeroMeshData": {
"SharedString": ""
},
"Anchored": {
"Bool": false
},
Expand Down Expand Up @@ -69031,6 +69091,9 @@
"ChildData": {
"BinaryString": ""
},
"ChildData2": {
"SharedString": ""
},
"CollisionGroup": {
"String": "Default"
},
Expand Down Expand Up @@ -69108,6 +69171,12 @@
"MeshData": {
"BinaryString": ""
},
"MeshData2": {
"SharedString": ""
},
"PhysicalConfigData": {
"SharedString": ""
},
"PhysicsData": {
"BinaryString": ""
},
Expand Down Expand Up @@ -74842,6 +74911,9 @@
]
}
},
"ModelMeshData": {
"SharedString": ""
},
"ModelMeshSize": {
"Vector3": [
0.0,
Expand Down Expand Up @@ -75024,6 +75096,9 @@
]
}
},
"ModelMeshData": {
"SharedString": ""
},
"ModelMeshSize": {
"Vector3": [
0.0,
Expand Down Expand Up @@ -75128,6 +75203,12 @@
"HSRAssetId": {
"Content": ""
},
"HSRData": {
"SharedString": ""
},
"HSRMeshIdData": {
"SharedString": ""
},
"HistoryId": {
"UniqueId": "00000000000000000000000000000000"
},
Expand Down Expand Up @@ -75422,6 +75503,12 @@
"HSRAssetId": {
"Content": ""
},
"HSRData": {
"SharedString": ""
},
"HSRMeshIdData": {
"SharedString": ""
},
"HistoryId": {
"UniqueId": "00000000000000000000000000000000"
},
Expand Down Expand Up @@ -75602,6 +75689,12 @@
"HSRAssetId": {
"Content": ""
},
"HSRData": {
"SharedString": ""
},
"HSRMeshIdData": {
"SharedString": ""
},
"HistoryId": {
"UniqueId": "00000000000000000000000000000000"
},
Expand Down
2 changes: 2 additions & 0 deletions rbx_reflection_database/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
## Unreleased Changes
* Update to Roblox version 647.
* `Model.WorldPivotData`'s default value is now `null`. ([#450])
* `SharedString` properties now have default values. ([#458])

[#458]: https://github.com/rojo-rbx/rbx-dom/pull/458
[#450]: https://github.com/rojo-rbx/rbx-dom/pull/450

## 0.2.12+roblox-638 (2024-08-22)
Expand Down
Binary file modified rbx_reflection_database/database.msgpack
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions rbx_reflector/src/defaults.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ fn apply_instance_defaults(database: &mut ReflectionDatabase, instance: &Instanc
let property_name = Cow::Owned(property_name.clone());

match property_value.ty() {
// We skip these types because their defaults aren't useful.
VariantType::Ref | VariantType::SharedString => continue,
// We skip the Ref type because its default value is not useful.
VariantType::Ref => continue,

_ => class
.default_properties
Expand Down