rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-20 20:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize and clean up rbx_snapshot a bit

Browse Source
This commit is contained in:
Lucien Greathouse
2018-12-17 13:02:40 -08:00
parent e3e4809446
commit 7154f2c328
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
server/src/rbx_snapshot.rs
View File

@@ -15,6 +15,32 @@ pub struct RbxSnapshotInstance<'a> {
pub source_path: Option<PathBuf>,
}
pub fn reify_root(snapshot: &RbxSnapshotInstance) -> RbxTree {
let instance = reify_core(snapshot);
let mut tree = RbxTree::new(instance);
let root_id = tree.get_root_id();
for child in &snapshot.children {
reify_subtree(child, &mut tree, root_id);
}
tree
}
pub fn reify_subtree(snapshot: &RbxSnapshotInstance, tree: &mut RbxTree, parent_id: RbxId) {
let instance = reify_core(snapshot);
let id = tree.insert_instance(instance, parent_id);
for child in &snapshot.children {
reify_subtree(child, tree, id);
}
}
pub fn reconcile_subtree(tree: &mut RbxTree, id: RbxId, snapshot: &RbxSnapshotInstance) {
reconcile_instance_properties(tree.get_instance_mut(id).unwrap(), snapshot);
reconcile_instance_children(tree, id, snapshot);
}
fn reify_core(snapshot: &RbxSnapshotInstance) -> RbxInstance {
let mut properties = HashMap::new();
@@ -31,27 +57,6 @@ fn reify_core(snapshot: &RbxSnapshotInstance) -> RbxInstance {
instance
}
pub fn reify_root(snapshot: &RbxSnapshotInstance) -> RbxTree {
let instance = reify_core(snapshot);
let mut tree = RbxTree::new(instance);
let root_id = tree.get_root_id();
for child in &snapshot.children {
reify_child(child, &mut tree, root_id);
}
tree
}
fn reify_child(snapshot: &RbxSnapshotInstance, tree: &mut RbxTree, parent_id: RbxId) {
let instance = reify_core(snapshot);
let id = tree.insert_instance(instance, parent_id);
for child in &snapshot.children {
reify_child(child, tree, id);
}
}
fn reconcile_instance_properties(instance: &mut RbxInstance, snapshot: &RbxSnapshotInstance) -> bool {
let mut has_diffs = false;
@@ -139,7 +144,7 @@ fn reconcile_instance_children(tree: &mut RbxTree, id: RbxId, snapshot: &RbxSnap
}
for child_snapshot in &children_to_add {
reify_child(child_snapshot, tree, id);
reify_subtree(child_snapshot, tree, id);
}
for child_id in &children_to_remove {
@@ -149,9 +154,4 @@ fn reconcile_instance_children(tree: &mut RbxTree, id: RbxId, snapshot: &RbxSnap
for (child_id, child_snapshot) in &children_to_update {
reconcile_subtree(tree, *child_id, child_snapshot);
}
}
pub fn reconcile_subtree(tree: &mut RbxTree, id: RbxId, snapshot: &RbxSnapshotInstance) {
reconcile_instance_properties(tree.get_instance_mut(id).unwrap(), snapshot);
reconcile_instance_children(tree, id, snapshot);
}