Paradox Game Engine  v1.0.0 beta06
 All Classes Namespaces Files Functions Variables Typedefs Enumerations Enumerator Properties Events Macros Pages
Package SiliconStudio.Assets.Diff

Classes

class  AssetDiff
 Class AssetDiff. This class cannot be inherited. More...
 
class  AssetMerge
 Merges asset differences. More...
 
class  AssetMergePolicies
 Contains different default merge policies to use with AssetMerge. More...
 
struct  DataMatch
 
class  DataMatcher
 
class  DataVisitObjectNode
 The root node used for storing a hierarchy of DataVisitNode More...
 
class  Diff3Node
 
class  MergeResult
 Result of a merge. Contains Asset != null if there are no errors. More...
 

Enumerations

enum  Diff3ChangeType {
  Diff3ChangeType.None, Diff3ChangeType.Children, Diff3ChangeType.MergeFromAsset1, Diff3ChangeType.MergeFromAsset2,
  Diff3ChangeType.MergeFromAsset1And2, Diff3ChangeType.Conflict, Diff3ChangeType.ConflictType, Diff3ChangeType.ConflictArraySize,
  Diff3ChangeType.InvalidNodeType
}
 

Enumeration Type Documentation

Enumerator
None 
Children 
MergeFromAsset1 
MergeFromAsset2 
MergeFromAsset1And2 
Conflict 
ConflictType 
ConflictArraySize 
InvalidNodeType 

Definition at line 5 of file Diff3ChangeType.cs.