Skip to content

Commit

Permalink
Merge branch 'wip/blocks-csg'
Browse files Browse the repository at this point in the history
  • Loading branch information
andybak committed Jul 22, 2024
2 parents 8ead0e0 + adbe7cf commit 36ccd85
Show file tree
Hide file tree
Showing 146 changed files with 8,783 additions and 30 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 50 additions & 0 deletions Assets/Logo/Logo CSG.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d216953ee452c43dd87a229fcb879dd4, type: 3}
m_Name: Logo CSG
m_EditorClassIdentifier:
Operators:
- Active: 0
OpType: 40
Parameter1: 0
Parameter2: 0
Iterations: 1
Parameter1Randomize: 0
Parameter2Randomize: 0
FilterType: 0
FilterParam: 0
FilterFlip: 0
- Active: 0
OpType: 47
Parameter1: 0.01
Parameter2: 0
Iterations: 1
Parameter1Randomize: 1
Parameter2Randomize: 0
FilterType: 0
FilterParam: 0
FilterFlip: 0
FastConicalize: 1
CanonicalizeIterations: 0
PlanarizeIterations: 0
FaceInset: 0
ColorMethod: 1
csgOp: 2
Operand1: {fileID: 11400000, guid: 8f0b6d5c5d2fc456ea6b95d37059acd9, type: 2}
Operand2: {fileID: 11400000, guid: 5c356fbfc3d0d4d1fa72f188eeeed36f, type: 2}
Operand2Transform:
Translation: {x: -1, y: 0, z: 0}
Rotation: {x: 0, y: 0, z: 0}
Scale: 1
NonUniformScale: {x: 1, y: 1, z: 1}
WeldThreshold: 0
MergeThreshold: 0
8 changes: 8 additions & 0 deletions Assets/Logo/Logo CSG.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions Assets/Logo/Logo Element 1.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bcdd704e9dd94c86b0d2f7d8638f92e9, type: 3}
m_Name: Logo Element 1
m_EditorClassIdentifier:
Operators:
- Active: 0
OpType: 36
Parameter1: 0.21
Parameter2: 0
Iterations: 1
Parameter1Randomize: 0
Parameter2Randomize: 0
FilterType: 0
FilterParam: 0
FilterFlip: 0
FastConicalize: 1
CanonicalizeIterations: 0
PlanarizeIterations: 0
FaceInset: 0
ColorMethod: 1
type: 0
Sides: 4
SetHeight: 1
Height: 0.5
CapHeight: 1
8 changes: 8 additions & 0 deletions Assets/Logo/Logo Element 1.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions Assets/Logo/Logo Element 2.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bcdd704e9dd94c86b0d2f7d8638f92e9, type: 3}
m_Name: Logo Element 2
m_EditorClassIdentifier:
Operators:
- Active: 1
OpType: 102
Parameter1: -0.21
Parameter2: 0
Iterations: 1
Parameter1Randomize: 0
Parameter2Randomize: 0
FilterType: 0
FilterParam: 0
FilterFlip: 0
- Active: 0
OpType: 118
Parameter1: 5.9
Parameter2: 0
Iterations: 1
Parameter1Randomize: 0
Parameter2Randomize: 0
FilterType: 0
FilterParam: 0
FilterFlip: 0
FastConicalize: 1
CanonicalizeIterations: 0
PlanarizeIterations: 0
FaceInset: 0
ColorMethod: 1
type: 0
Sides: 4
SetHeight: 1
Height: 0.15
CapHeight: 1
8 changes: 8 additions & 0 deletions Assets/Logo/Logo Element 2.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 36ccd85

Please sign in to comment.