Scenegit: a Practical System for Diffing and Merging 3D Environments
Total Page：16
File Type：pdf, Size：1020Kb
SceneGit: A Practical System for Diffing and Merging 3D Environments EDOARDO CARRA, Sapienza University of Rome FABIO PELLACINI, Sapienza University of Rome Ancestor Versions Merged delete/change from 1 delete/change from 2 add/change from 1 add/change from 2 concurrent change conflict Fig. 1. Two scene versions (middle top and middle bottom) are created concurrently by editing a common ancestor (top left). Our system detects changes between each version and the ancestor, then merges the changes automatically (top right). We highlight added and changed elements on the merged scene (bottom right), and deleted and changed elements on the ancestor (bottom left). The color of the edits, shown in the legend below the figure, indicates their provenance: green/yellow for version one, blue/red for version two, cyan/orange if the same element was edited in both versions, purple for conflicts. Version control systems are the foundation of collaborative workflows for 1 INTRODUCTION text documents. For 3D environments though, version control is still an Distributed version control [Chacon 2009; O’Sullivan 2009] and col- open problem due to the heterogeneous data of 3D scenes and their size. laborative editors [Clara.io 2014; Google 2016] are the two most In this paper, we present a practical version control system for 3D scenes used tools in modern collaborative workflows. In 3D graphics, ver- comprised of shapes, materials, textures, and animations, combined together in scene graphs. We version objects at their finest granularity, to make sion control is the most widely adopted in practice since it explicitly repositories smaller and to allow artists to work concurrently on the same maintains version histories and allows for branching workflows object. Since, for some scene data, computing an optimal set of changes between multiple artists. However, it is performed solely by version- between versions is not computationally feasible, version control systems ing each asset as a whole, which means that no concurrent edits can use heuristics. Compared to prior work, we propose heuristics that are be made by multiple users on the same asset. Recently, collaborative efficient, robust, and independent of the application. We test oursystem editors have been proposed that use version control as the under- on a variety of large scenes edited with different workflows, and show that lying implementation mechanism [Calabrese et al. 2016; Onshape our approach can handle all cases well while remaining efficient as scene 2014; Salvati et al. 2015; Santoni et al. 2018]. To this day though, size increases. Compared to prior work, we are significantly faster and more version control for 3D environments is still an open problem. While robust. A user study confirms that our system aids collaboration. many systems have been proposed [Denning and Pellacini 2013; ACM Reference format: Doboš et al. 2018, 2014, 2013; Doboš and Steed 2012a,b], there is still Edoardo Carra and Fabio Pellacini. 2019. SceneGit: A Practical System for no comprehensive solution that supports all scene data versioned Diffing and Merging 3D Environments. ACM Trans. Graph. 38, 6, Article 1 at its finest granularity. (November 2019), 15 pages. In this paper, we discuss a practical solution for versioning 3D https://doi.org/10.1145/3355089.3356550 environments. We consider versioning of shapes, materials, anima- Permission to make digital or hard copies of all or part of this work for personal or tions and scene layouts in a comprehensive framework. For each of classroom use is granted without fee provided that copies are not made or distributed these different entities, we support versioning at their finest granu- for profit or commercial advantage and that copies bear this notice and the full citation on the first page. Copyrights for components of this work owned by others than ACM larity, e.g., individual vertices and faces for shapes, keyframes for must be honored. Abstracting with credit is permitted. To copy otherwise, or republish, animations, texels for textures and single properties for generic to post on servers or to redistribute to lists, requires prior specific permission and/or a scene objects. By using a fine granularity, we ensure that edits are fee. Request permissions from [email protected]. © 2019 Association for Computing Machinery. captured precisely, so that they can be efficiently stored, correctly 0730-0301/2019/11-ART1 $15.00 merged and informatively displayed. https://doi.org/10.1145/3355089.3356550 ACM Transactions on Graphics, Vol. 38, No. 6, Article 1. Publication date: November 2019. 1:2 • Edoardo Carra and Fabio Pellacini Version control systems are often built in layers from the most We tested our system by diffing and merging a variety of scenes basic operations, all the way to the command-line and graphical stored in two different file formats, Wavefront OBJ [WavefrontTech- interfaces shown to users. In this paper, we focus on the lowest nologies 1980] and Khronos glTF [KhronosGroup 2016]. This shows level operations needed to build a version control system. To define that our system is generic with respect to the scene format itself. them, let us introduce some simplified nomenclature that we will The tested scenes differ substantially in the type, size and number of use throughout the paper. We call ancestor a scene that will be edited objects. We perform a variety of edits to shapes, materials, textures, and a version a scene edited starting from the ancestor. A change animations and scene nodes. For each of these edits we used differ- is the unordered collections of modifications that we apply to the ent tools and editing techniques, including addition and deletion ancestor to obtain the version. of elements, parameter adjustments, painting, sculpting, low-poly We investigate four different operations. The most basic oper- modeling, scene layout and instancing. In all these edits, we found ation is diffing an ancestor and a version to compute the change our system to be efficient, capable of correctly merging all edits or between them. The inverse operation is patching an ancestor with determining conflicts precisely. a change to reconstruct the edited version. Patching is used quite We further validate our system by comparing to prior work as often for example when changes are sent over a network and recon- well as commercial products. In both cases, we are significantly structed locally. For collaboration, we support merging two versions more efficient and robust. In fact, this comparison shows thatour created independently using a three-way merge operation where system is the only one that can reliably support concurrent edits to the changes of both versions with respect to a common ancestor are large scenes. We further validate our work by running a user study merged together into a scene that combines both edits. We consider where we ask users to rate how well our system highlights the edits, only three-way merging since it has better reliability compared to how reliably it merges versions, and how helpful it is in supporting two-way merging [Chacon 2009]. Finally, we support efficient encod- collaboration. All subjects rated our system high in all questions. ing and decoding of changes for storage or transmission. Fig. 1 shows In conclusion, we present a comprehensive solution for versioning a three-way merge between two edited scenes and their common 3D environments that improves upon the state of the art with the ancestor, with changes highlighted. following technical contributions: Distributed version control systems are designed to handle large (1) we present, motivate and analyze an overall design for version collections of small text documents where each document is diffed control systems for 3D scenes; to the best of knowledge this is and merged independently. Diffing and merging 3D environments the first work that presents such comprehensive discussion; has significant challenges compared to text. Scenes are madeof (2) we introduce a sparse scene representation that tracks scene heterogeneous data, e.g., shapes, textures, animations, scene layouts. elements uniquely and at their finest granularity across all Furthermore, scenes elements have relationships between them that versions in a repository; need to be maintained during diffing and merging, e.g., relationships (3) based on this data structure, we introduce a definition of the between vertices and faces in meshes, transforms and keyframe merge operation that is formally well-defined, leading to a times in animations, references to nodes in scene trees. Finally, 3D robust merge algorithm; scenes are large, both in terms of file size and number of elements, (4) we extract a sparse representation efficiently from edited compared to standard text documents. scenes by deriving diff algorithms that adapt to the heteroge- In our system, we handle all these concerns guided by four main nous data in 3D scenes; insights. First, 3D scenes need to be versioned as wholes rather (5) compared to prior work, we are significantly faster, scale than as single components to maintain relationships. Second, dur- better and remains robust for large edits; ing diffing, we assign unique identifiers to all scenes elements at (6) with a user study, we validate that our system is helpful in the finest possible granularity, e.g., objects, vertices, faces, texels, supporting collaboration. keyframes have unique identifiers computed by our systems. These identifiers are unique in the scene and across versions so thatthey 2 RELATED WORK can be tracked by the version control system. This allows us to easily Authoring 3D environments requires considerable effort for all but implement patching and merging, robustly detect conflicting edits, the simplest cases. For this reason, many artists work on the same store changes concisely in a sparse representation, view changes scene. A common practice in industry is to split scenes into a large informatively and handle heterogeneous data with ease. To assign collection of small files so that each file can be edited independently.