diff --git a/.gitattributes b/.gitattributes
index d530ed421..87c9db929 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -51,11 +51,12 @@
*.dylib filter=lfs diff=lfs merge=lfs -text
*.bundle filter=lfs diff=lfs merge=lfs -text
*.engine filter=lfs diff=lfs merge=lfs -text
-*.sbsar filter=lfs diff=lfs merge=lfs -text
*.msgpack filter=lfs diff=lfs merge=lfs -text
GameData/*.cc filter=lfs diff=lfs merge=lfs -text
GameData/Mods/**/*.cc filter=lfs diff=lfs merge=lfs -text
GameData/Mods/**/*.glb filter=lfs diff=lfs merge=lfs -text
+tests/fixtures/mods/**/*.cc filter=lfs diff=lfs merge=lfs -text
+tests/fixtures/mods/**/*.glb filter=lfs diff=lfs merge=lfs -text
tools/blender/tests/fixtures/*.glb filter=lfs diff=lfs merge=lfs -text
*.a filter=lfs diff=lfs merge=lfs -text
*AkSoundEngine filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
index ac9c49142..8f15133d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,3 +113,4 @@ tests/_scratch_*
# Stryker.NET mutation reports (regenerated per run)
StrykerOutput/
+native/aetherlight/target/
diff --git a/Assets/Content/Prefabs/Turrets/Turret.prefab b/Assets/Content/Prefabs/Turrets/Turret.prefab
index 748ca8a29..2df968941 100644
--- a/Assets/Content/Prefabs/Turrets/Turret.prefab
+++ b/Assets/Content/Prefabs/Turrets/Turret.prefab
@@ -998,8 +998,8 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 3720744386649352057, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8, type: 3}
- - {fileID: 3720744386649352057, guid: b2bec4b400153d745b2915f1c43e5c96, type: 3}
+ - {fileID: 2100000, guid: 38f8ba6b169127249b6532be2b3926ee, type: 2}
+ - {fileID: 2100000, guid: 5e43f48908cce2949a41677ec48affe5, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
diff --git a/Assets/Fonts/Ubuntu/Montserrat-OFL-1.1.txt b/Assets/Fonts/Ubuntu/Montserrat-OFL-1.1.txt
new file mode 100644
index 000000000..d2fcdf3eb
--- /dev/null
+++ b/Assets/Fonts/Ubuntu/Montserrat-OFL-1.1.txt
@@ -0,0 +1,93 @@
+Copyright(c) 2014 by Julieta Ulanovsky
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/Assets/Materials/Substance.meta b/Assets/Fonts/Ubuntu/Montserrat-OFL-1.1.txt.meta
similarity index 57%
rename from Assets/Materials/Substance.meta
rename to Assets/Fonts/Ubuntu/Montserrat-OFL-1.1.txt.meta
index c6926c786..c2ea6a451 100644
--- a/Assets/Materials/Substance.meta
+++ b/Assets/Fonts/Ubuntu/Montserrat-OFL-1.1.txt.meta
@@ -1,7 +1,6 @@
fileFormatVersion: 2
-guid: 7de1c11cf7591ec48bdb53e9818172f5
-folderAsset: yes
-DefaultImporter:
+guid: dc84a6b2454445f9be69af26e86eb90c
+TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
diff --git a/Assets/Fonts/Ubuntu/UFL-1.0.txt b/Assets/Fonts/Ubuntu/UFL-1.0.txt
new file mode 100644
index 000000000..ae78a8f94
--- /dev/null
+++ b/Assets/Fonts/Ubuntu/UFL-1.0.txt
@@ -0,0 +1,96 @@
+-------------------------------
+UBUNTU FONT LICENCE Version 1.0
+-------------------------------
+
+PREAMBLE
+This licence allows the licensed fonts to be used, studied, modified and
+redistributed freely. The fonts, including any derivative works, can be
+bundled, embedded, and redistributed provided the terms of this licence
+are met. The fonts and derivatives, however, cannot be released under
+any other licence. The requirement for fonts to remain under this
+licence does not require any document created using the fonts or their
+derivatives to be published under this licence, as long as the primary
+purpose of the document is not to be a vehicle for the distribution of
+the fonts.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this licence and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Original Version" refers to the collection of Font Software components
+as received under this licence.
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to
+a new environment.
+
+"Copyright Holder(s)" refers to all individuals and companies who have a
+copyright ownership of the Font Software.
+
+"Substantially Changed" refers to Modified Versions which can be easily
+identified as dissimilar to the Font Software by users of the Font
+Software comparing the Original Version with the Modified Version.
+
+To "Propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification and with or without charging
+a redistribution fee), making available to the public, and in some
+countries other activities as well.
+
+PERMISSION & CONDITIONS
+This licence does not grant any rights under trademark law and all such
+rights are reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to propagate the Font Software, subject to
+the below conditions:
+
+1) Each copy of the Font Software must contain the above copyright
+notice and this licence. These can be included either as stand-alone
+text files, human-readable headers or in the appropriate machine-
+readable metadata fields within text or binary files as long as those
+fields can be easily viewed by the user.
+
+2) The font name complies with the following:
+(a) The Original Version must retain its name, unmodified.
+(b) Modified Versions which are Substantially Changed must be renamed to
+avoid use of the name of the Original Version or similar names entirely.
+(c) Modified Versions which are not Substantially Changed must be
+renamed to both (i) retain the name of the Original Version and (ii) add
+additional naming elements to distinguish the Modified Version from the
+Original Version. The name of such Modified Versions must be the name of
+the Original Version, with "derivative X" where X represents the name of
+the new work, appended to that name.
+
+3) The name(s) of the Copyright Holder(s) and any contributor to the
+Font Software shall not be used to promote, endorse or advertise any
+Modified Version, except (i) as required by this licence, (ii) to
+acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
+their explicit written permission.
+
+4) The Font Software, modified or unmodified, in part or in whole, must
+be distributed entirely under this licence, and must not be distributed
+under any other licence. The requirement for fonts to remain under this
+licence does not affect any document created using the Font Software,
+except any version of the Font Software extracted from a document
+created using the Font Software may only be distributed under this
+licence.
+
+TERMINATION
+This licence becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.
diff --git a/Assets/Materials/Substance/Metal.meta b/Assets/Fonts/Ubuntu/UFL-1.0.txt.meta
similarity index 57%
rename from Assets/Materials/Substance/Metal.meta
rename to Assets/Fonts/Ubuntu/UFL-1.0.txt.meta
index e8c0226e7..33790c1ab 100644
--- a/Assets/Materials/Substance/Metal.meta
+++ b/Assets/Fonts/Ubuntu/UFL-1.0.txt.meta
@@ -1,7 +1,6 @@
fileFormatVersion: 2
-guid: 09aee558716a08d4c9806b9b4273a209
-folderAsset: yes
-DefaultImporter:
+guid: 331370618a0a473fb6a6837985b38a35
+TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
diff --git a/Assets/Materials/Aluminium brushed.mat b/Assets/Materials/Aluminium brushed.mat
index b8ade999f..a624f95e1 100644
--- a/Assets/Materials/Aluminium brushed.mat
+++ b/Assets/Materials/Aluminium brushed.mat
@@ -20,8 +20,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: 4730978449518085612, guid: 06d6a565d43fba5409712ce9a10bfbef,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: c3ef09438e3e46d18a4c267810aeb285, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -45,23 +44,19 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 7556082237344091230, guid: 06d6a565d43fba5409712ce9a10bfbef,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: f70b6df0395b4752b4ec80cb7bfd8f42, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: 6373266012617290493, guid: 06d6a565d43fba5409712ce9a10bfbef,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 40f5e915d2734d43bc01f984772e9d29, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
- m_Texture: {fileID: 342959783478273704, guid: 06d6a565d43fba5409712ce9a10bfbef,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
- m_Texture: {fileID: -9132138291289375396, guid: 06d6a565d43fba5409712ce9a10bfbef,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
@@ -85,7 +80,7 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0.951, g: 0.951, b: 0.951, a: 1}
- _EdgeColor: {r: 3.0117648, g: 3.0117648, b: 11.984314, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Materials/Car Paint Magenta.mat b/Assets/Materials/Car Paint Magenta.mat
index dbe95bd62..bff25331a 100644
--- a/Assets/Materials/Car Paint Magenta.mat
+++ b/Assets/Materials/Car Paint Magenta.mat
@@ -26,8 +26,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: 3068890721646206586, guid: a1d39ea984432bf44b4a0686afe2bf1a,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 4ce3c2cc69304068b4a2ddc833b748b9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FadeTex:
@@ -35,18 +34,15 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 5917659159057834157, guid: a1d39ea984432bf44b4a0686afe2bf1a,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 73568a0c02bd4184bcb398c9e3dd7ab6, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: -3552914696322007609, guid: a1d39ea984432bf44b4a0686afe2bf1a,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: d9cd336372c244e398532512e3f8f3be, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
- m_Texture: {fileID: -1242281561028671816, guid: a1d39ea984432bf44b4a0686afe2bf1a,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 73e117729c3447e5aa0eb1a30fad7c75, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
@@ -59,6 +55,6 @@ Material:
- _Metallic: 1
- _OcclusionStrength: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0.5, g: 0, b: 0.228113, a: 1}
- _EdgeColor: {r: 3.0117648, g: 3.0117648, b: 11.984314, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Materials/Car Paint Red.mat b/Assets/Materials/Car Paint Red.mat
index 8a7ffa46f..063e9367c 100644
--- a/Assets/Materials/Car Paint Red.mat
+++ b/Assets/Materials/Car Paint Red.mat
@@ -20,8 +20,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: 3068890721646206586, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 4ce3c2cc69304068b4a2ddc833b748b9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -45,23 +44,19 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 5917659159057834157, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 73568a0c02bd4184bcb398c9e3dd7ab6, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: -3552914696322007609, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: d9cd336372c244e398532512e3f8f3be, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
- m_Texture: {fileID: -1242281561028671816, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 73e117729c3447e5aa0eb1a30fad7c75, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
- m_Texture: {fileID: -1652887728991447519, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
@@ -85,7 +80,7 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 1, g: 0.15685, b: 0, a: 1}
- _EdgeColor: {r: 6.0235295, g: 6.0235295, b: 24.094118, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Materials/Car Paint White Small.mat b/Assets/Materials/Car Paint White Small.mat
index aab8a3663..cca6010f3 100644
--- a/Assets/Materials/Car Paint White Small.mat
+++ b/Assets/Materials/Car Paint White Small.mat
@@ -29,8 +29,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: 3068890721646206586, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 4ce3c2cc69304068b4a2ddc833b748b9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -54,23 +53,19 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 5917659159057834157, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 73568a0c02bd4184bcb398c9e3dd7ab6, type: 3}
m_Scale: {x: 16, y: 16}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: -3552914696322007609, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: d9cd336372c244e398532512e3f8f3be, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
- m_Texture: {fileID: -1242281561028671816, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 73e117729c3447e5aa0eb1a30fad7c75, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
- m_Texture: {fileID: -1652887728991447519, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
@@ -95,7 +90,7 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 1, g: 0.891509, b: 0.946396, a: 1}
- _EdgeColor: {r: 6.0235295, g: 6.0235295, b: 24.094118, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Materials/Car Paint White.mat b/Assets/Materials/Car Paint White.mat
index ba32280af..ad0af17d2 100644
--- a/Assets/Materials/Car Paint White.mat
+++ b/Assets/Materials/Car Paint White.mat
@@ -26,8 +26,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: 3068890721646206586, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 4ce3c2cc69304068b4a2ddc833b748b9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FadeTex:
@@ -35,18 +34,15 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 5917659159057834157, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 73568a0c02bd4184bcb398c9e3dd7ab6, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: -3552914696322007609, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: d9cd336372c244e398532512e3f8f3be, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
- m_Texture: {fileID: -1242281561028671816, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 73e117729c3447e5aa0eb1a30fad7c75, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
@@ -59,6 +55,6 @@ Material:
- _Metallic: 1
- _OcclusionStrength: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 1, g: 0.891509, b: 0.946396, a: 1}
- _EdgeColor: {r: 3.0117648, g: 3.0117648, b: 11.984314, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Materials/Cockpit.mat b/Assets/Materials/Cockpit.mat
index 543d0d608..fb19e541a 100644
--- a/Assets/Materials/Cockpit.mat
+++ b/Assets/Materials/Cockpit.mat
@@ -26,8 +26,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: -3419035557588562233, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 3a10044baac4438f9fc0930783eccdf7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -51,23 +50,19 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: -1863473678134789185, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 5a9cee903a2d48718aaf6b224126f279, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: 6214616473909614744, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 8b24d7ea11c341408a146fa39f59b7b0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
- m_Texture: {fileID: -3436886866959827803, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
- m_Texture: {fileID: 7009887839391554354, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
@@ -92,7 +87,7 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0.85, g: 0.65, b: 0.30, a: 1}
- _EdgeColor: {r: 3.0117648, g: 3.0117648, b: 11.984314, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Materials/Metal 003.mat b/Assets/Materials/Metal 003.mat
index 4d07d4c1a..09330e338 100644
--- a/Assets/Materials/Metal 003.mat
+++ b/Assets/Materials/Metal 003.mat
@@ -20,8 +20,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: -2508943184622041221, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 3a10044baac4438f9fc0930783eccdf7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -41,23 +40,19 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: -1236254257114565538, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 5a9cee903a2d48718aaf6b224126f279, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: 4019402794555593307, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 8b24d7ea11c341408a146fa39f59b7b0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
- m_Texture: {fileID: -1475328947160444094, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
- m_Texture: {fileID: 7523010977671448217, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
diff --git a/Assets/Materials/Mine Glow.mat b/Assets/Materials/Mine Glow.mat
index e1627f2d9..7d6d630e7 100644
--- a/Assets/Materials/Mine Glow.mat
+++ b/Assets/Materials/Mine Glow.mat
@@ -20,8 +20,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: -812895718602229137, guid: b7e648471e9dfc44490bd41973711541,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 8bc10cfce8a64defaf9f67d156003f09, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -41,13 +40,11 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: -6057190860509678031, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 2195885db9e846999fd10aa7f5c629b1, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: -894214952450941493, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: d91bff887b764847a484d0a9bedce9e9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
diff --git a/Assets/Models/Discobolus/Discobolus Bronze.mat b/Assets/Materials/Pickup Trim.mat
similarity index 64%
rename from Assets/Models/Discobolus/Discobolus Bronze.mat
rename to Assets/Materials/Pickup Trim.mat
index 30697d42a..0cea43f4f 100644
--- a/Assets/Models/Discobolus/Discobolus Bronze.mat
+++ b/Assets/Materials/Pickup Trim.mat
@@ -2,25 +2,34 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
- serializedVersion: 6
+ serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Discobolus Bronze
- m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP
+ m_Name: Pickup Trim
+ m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords:
+ - _MAINTEX
+ - _METALLICGLOSSMAP
+ - _NORMALMAP
+ - _OCCLUSIONMAP
+ - _PARALLAXMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
+ m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: 2800000, guid: 9863db663524d9a4eab030a666b1f2da, type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -37,35 +46,41 @@ Material:
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
+ m_Scale: {x: 16, y: 16}
+ m_Offset: {x: 0, y: 0}
+ - _FadeTex:
+ m_Texture: {fileID: 2800000, guid: df0632a08c5f1a1498fa325c755dc459, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: -1863473678134789185, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
- m_Scale: {x: 1, y: 1}
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 16, y: 16}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: 6214616473909614744, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
- m_Texture: {fileID: 2800000, guid: d60207b632e464d4b884dded41db5b9b, type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
+ - _Fade: 1
+ - _FadeEdge: 0.1
+ - _FadeSharpness: 16
- _GlossMapScale: 1
- - _Glossiness: 0.5
+ - _Glossiness: 0.7
- _GlossyReflections: 1
- - _Metallic: 0
+ - _Metallic: 0.6
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
@@ -75,6 +90,8 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0, g: 0.605881, b: 1, a: 1}
+ - _EdgeColor: {r: 6.0235295, g: 6.0235295, b: 24.094118, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
+ m_AllowLocking: 1
diff --git a/Assets/Steel.mat.meta b/Assets/Materials/Pickup Trim.mat.meta
similarity index 79%
rename from Assets/Steel.mat.meta
rename to Assets/Materials/Pickup Trim.mat.meta
index d645ba6a4..d57d829c2 100644
--- a/Assets/Steel.mat.meta
+++ b/Assets/Materials/Pickup Trim.mat.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 4c998decce894b4458e1bc667975aeea
+guid: bebc82079e5d4e578a73c3ab48d2c2da
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
diff --git a/Assets/Materials/Radiators 1.mat b/Assets/Materials/Radiators 1.mat
deleted file mode 100644
index a6219fe9d..000000000
--- a/Assets/Materials/Radiators 1.mat
+++ /dev/null
@@ -1,87 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
- serializedVersion: 6
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Radiators 1
- m_Shader: {fileID: 4800000, guid: d69ef48273708ef4680762f5cdcfc860, type: 3}
- m_ShaderKeywords:
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _BumpMap:
- m_Texture: {fileID: -812895718602229137, guid: b7e648471e9dfc44490bd41973711541,
- type: 3}
- m_Scale: {x: 8, y: 8}
- m_Offset: {x: 0, y: 0}
- - _DetailAlbedoMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailMask:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailNormalMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _EmissionMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MainTex:
- m_Texture: {fileID: -6057190860509678031, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
- m_Scale: {x: 8, y: 8}
- m_Offset: {x: 0, y: 0}
- - _MetallicGlossMap:
- m_Texture: {fileID: -894214952450941493, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _OcclusionMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _ParallaxMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Floats:
- - _BumpPower: 2
- - _BumpScale: 1
- - _Cutoff: 0.5
- - _DetailNormalMapScale: 1
- - _DstBlend: 0
- - _Emission: 15
- - _EmissionFresnel: 4
- - _EmissionRoughnessFresnelPower: 0.5
- - _GlossMapScale: 1
- - _Glossiness: 1
- - _GlossyReflections: 1
- - _Metallic: 0
- - _Mode: 0
- - _OcclusionStrength: 1
- - _Parallax: 0.02
- - _ReverseRim: 0
- - _Rotation: 0
- - _SmoothnessTextureChannel: 0
- - _SpecularHighlights: 1
- - _SrcBlend: 1
- - _UVSec: 0
- - _ZWrite: 1
- m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- - _EmissionColor: {r: 1, g: 0.40135294, b: 0, a: 1}
- m_BuildTextureStacks: []
diff --git a/Assets/Materials/Radiators 1.mat.meta b/Assets/Materials/Radiators 1.mat.meta
deleted file mode 100644
index c562a84de..000000000
--- a/Assets/Materials/Radiators 1.mat.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f396635dc77c59c44ac85ae278a2e909
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Materials/Radiators.mat b/Assets/Materials/Radiators.mat
index aa7eaf0fb..1e5c52a54 100644
--- a/Assets/Materials/Radiators.mat
+++ b/Assets/Materials/Radiators.mat
@@ -21,8 +21,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: -812895718602229137, guid: b7e648471e9dfc44490bd41973711541,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 8bc10cfce8a64defaf9f67d156003f09, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -46,13 +45,11 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: -6057190860509678031, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 2195885db9e846999fd10aa7f5c629b1, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: -894214952450941493, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: d91bff887b764847a484d0a9bedce9e9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
diff --git a/Assets/Materials/Silver.mat b/Assets/Materials/Silver.mat
index e02d24f97..0bb79d6a1 100644
--- a/Assets/Materials/Silver.mat
+++ b/Assets/Materials/Silver.mat
@@ -26,8 +26,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: 8947980237086559854, guid: 0be5fb1df83ac8e499a3f6a060041e49,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: c3ef09438e3e46d18a4c267810aeb285, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -51,23 +50,19 @@ Material:
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: -1383037052668628532, guid: 0be5fb1df83ac8e499a3f6a060041e49,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: f70b6df0395b4752b4ec80cb7bfd8f42, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: 6429125567479694453, guid: 0be5fb1df83ac8e499a3f6a060041e49,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 40f5e915d2734d43bc01f984772e9d29, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
- m_Texture: {fileID: -9097439929179392311, guid: 0be5fb1df83ac8e499a3f6a060041e49,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
- m_Texture: {fileID: 425190381137097012, guid: 0be5fb1df83ac8e499a3f6a060041e49,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
diff --git a/Assets/Materials/Station Lights.mat b/Assets/Materials/Station Lights.mat
index f863306a1..2aac54ac7 100644
--- a/Assets/Materials/Station Lights.mat
+++ b/Assets/Materials/Station Lights.mat
@@ -24,8 +24,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: -812895718602229137, guid: b7e648471e9dfc44490bd41973711541,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 8bc10cfce8a64defaf9f67d156003f09, type: 3}
m_Scale: {x: 8, y: 8}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -49,13 +48,11 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: -6057190860509678031, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 2195885db9e846999fd10aa7f5c629b1, type: 3}
m_Scale: {x: 16, y: 16}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: -894214952450941493, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: d91bff887b764847a484d0a9bedce9e9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
diff --git a/Assets/Materials/Steel brushed.mat b/Assets/Materials/Steel brushed.mat
deleted file mode 100644
index dba1bd074..000000000
--- a/Assets/Materials/Steel brushed.mat
+++ /dev/null
@@ -1,83 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
- serializedVersion: 6
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Steel brushed
- m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- m_ShaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _BumpMap:
- m_Texture: {fileID: -4471413742775304797, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailAlbedoMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailMask:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailNormalMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _EmissionMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 8, y: 8}
- m_Offset: {x: 0, y: 0}
- - _MainTex:
- m_Texture: {fileID: -4638397344074346932, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- m_Scale: {x: 8, y: 8}
- m_Offset: {x: 0, y: 0}
- - _MetallicGlossMap:
- m_Texture: {fileID: 5049811794194361025, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _OcclusionMap:
- m_Texture: {fileID: 1753668427856518731, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _ParallaxMap:
- m_Texture: {fileID: -3498708498072814504, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Floats:
- - _BumpScale: 1
- - _Cutoff: 0.5
- - _DetailNormalMapScale: 1
- - _DstBlend: 0
- - _GlossMapScale: 1
- - _Glossiness: 0.5
- - _GlossyReflections: 1
- - _Metallic: 0
- - _Mode: 0
- - _OcclusionStrength: 1
- - _Parallax: 0.02
- - _SmoothnessTextureChannel: 0
- - _SpecularHighlights: 1
- - _SrcBlend: 1
- - _UVSec: 0
- - _ZWrite: 1
- m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- m_BuildTextureStacks: []
diff --git a/Assets/Materials/Steel brushed.mat.meta b/Assets/Materials/Steel brushed.mat.meta
deleted file mode 100644
index 73afa8139..000000000
--- a/Assets/Materials/Steel brushed.mat.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: df3e704fc59794a45b8e14a78d96cca3
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Materials/Steel parkerized.mat b/Assets/Materials/Steel parkerized.mat
index b4194ab66..ba47afb87 100644
--- a/Assets/Materials/Steel parkerized.mat
+++ b/Assets/Materials/Steel parkerized.mat
@@ -29,8 +29,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: 885599758852769373, guid: e7758cad28ae98f478940e55222419a6,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: dc71e34b4a1f4de7aa826d18b67b5852, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -54,23 +53,19 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: -4474525002722929857, guid: e7758cad28ae98f478940e55222419a6,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 1ed06708491744fe944217d19e450157, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: -2334804936223627746, guid: e7758cad28ae98f478940e55222419a6,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 31e7d642ff8a49a28390c82626c4b6b9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
- m_Texture: {fileID: -8380876848358870972, guid: e7758cad28ae98f478940e55222419a6,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
- m_Texture: {fileID: 172713863077875830, guid: e7758cad28ae98f478940e55222419a6,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
diff --git a/Assets/Materials/Steel.mat b/Assets/Materials/Steel.mat
index 37420bfd4..6eeb29385 100644
--- a/Assets/Materials/Steel.mat
+++ b/Assets/Materials/Steel.mat
@@ -26,8 +26,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
- m_Texture: {fileID: -3888315358723833787, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: c3ef09438e3e46d18a4c267810aeb285, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -51,23 +50,19 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 108215966750249586, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: f70b6df0395b4752b4ec80cb7bfd8f42, type: 3}
m_Scale: {x: 4, y: 4}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: 4793252353645218242, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
+ m_Texture: {fileID: 2800000, guid: 40f5e915d2734d43bc01f984772e9d29, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
- m_Texture: {fileID: -4384182597330533215, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
- m_Texture: {fileID: 4600200897981803784, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
diff --git a/Assets/Materials/Substance/Metal/Pickup Base.sbsar b/Assets/Materials/Substance/Metal/Pickup Base.sbsar
deleted file mode 100644
index 963310406..000000000
--- a/Assets/Materials/Substance/Metal/Pickup Base.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbee14b278a03ed59e1df8ecd6ba2b07ab7c2b2089e5e2bc3fad5673694a9f03
-size 14971
diff --git a/Assets/Materials/Substance/Metal/Pickup Base.sbsar.meta b/Assets/Materials/Substance/Metal/Pickup Base.sbsar.meta
deleted file mode 100644
index 2966159bc..000000000
--- a/Assets/Materials/Substance/Metal/Pickup Base.sbsar.meta
+++ /dev/null
@@ -1,382 +0,0 @@
-fileFormatVersion: 2
-guid: 26a894e543f3ed44893b1620707ca62c
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_car_paint/metal_car_paint
- - first:
- 4: 400000
- second: metal_car_paint/metal_car_paint/Transform
- - first:
- 21: 2100000
- second: mat.Car paint
- - first:
- 23: 2300000
- second: metal_car_paint/metal_car_paint/MeshRenderer
- - first:
- 28: 2800000
- second: Car paint_baseColor
- - first:
- 28: 2800002
- second: Car paint_normal
- - first:
- 28: 2800004
- second: Car paint_metallic
- - first:
- 28: 2800006
- second: Car paint_ambientOcclusion
- - first:
- 28: 2800008
- second: Car paint_height
- - first:
- 33: 3300000
- second: metal_car_paint/metal_car_paint/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_car_paint/metal_car_paint/SphereCollider
- - first:
- 1001: 100100000
- second: metal_car_paint
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Car paint
- prototypeName: Car paint
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n \n \n \n \n \n \n
- \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 3068890721646206586, guid: 26a894e543f3ed44893b1620707ca62c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 0.5, y: 0.5}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 5917659159057834157, guid: 26a894e543f3ed44893b1620707ca62c,
- type: 3}
- scale: {x: 0.5, y: 0.5}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -3552914696322007609, guid: 26a894e543f3ed44893b1620707ca62c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -1242281561028671816, guid: 26a894e543f3ed44893b1620707ca62c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -1652887728991447519, guid: 26a894e543f3ed44893b1620707ca62c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 1
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 1
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Car paint_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 2048
- textureHeight: 2048
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 3720744386649352057, guid: 26a894e543f3ed44893b1620707ca62c,
- type: 3}
- generatedTextures:
- - {fileID: 5917659159057834157, guid: 26a894e543f3ed44893b1620707ca62c, type: 3}
- - {fileID: 3068890721646206586, guid: 26a894e543f3ed44893b1620707ca62c, type: 3}
- - {fileID: -3552914696322007609, guid: 26a894e543f3ed44893b1620707ca62c, type: 3}
- - {fileID: -1242281561028671816, guid: 26a894e543f3ed44893b1620707ca62c, type: 3}
- - {fileID: -1652887728991447519, guid: 26a894e543f3ed44893b1620707ca62c, type: 3}
diff --git a/Assets/Materials/Substance/Metal/Pickup Trim.sbsar b/Assets/Materials/Substance/Metal/Pickup Trim.sbsar
deleted file mode 100644
index 963310406..000000000
--- a/Assets/Materials/Substance/Metal/Pickup Trim.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbee14b278a03ed59e1df8ecd6ba2b07ab7c2b2089e5e2bc3fad5673694a9f03
-size 14971
diff --git a/Assets/Materials/Substance/Metal/Pickup Trim.sbsar.meta b/Assets/Materials/Substance/Metal/Pickup Trim.sbsar.meta
deleted file mode 100644
index 302e453b5..000000000
--- a/Assets/Materials/Substance/Metal/Pickup Trim.sbsar.meta
+++ /dev/null
@@ -1,381 +0,0 @@
-fileFormatVersion: 2
-guid: c00b5a4f1e4743a4ca59b8030251f900
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_car_paint/metal_car_paint
- - first:
- 4: 400000
- second: metal_car_paint/metal_car_paint/Transform
- - first:
- 21: 2100000
- second: mat.Car paint
- - first:
- 23: 2300000
- second: metal_car_paint/metal_car_paint/MeshRenderer
- - first:
- 28: 2800000
- second: Car paint_baseColor
- - first:
- 28: 2800002
- second: Car paint_normal
- - first:
- 28: 2800004
- second: Car paint_metallic
- - first:
- 28: 2800006
- second: Car paint_ambientOcclusion
- - first:
- 28: 2800008
- second: Car paint_height
- - first:
- 33: 3300000
- second: metal_car_paint/metal_car_paint/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_car_paint/metal_car_paint/SphereCollider
- - first:
- 1001: 100100000
- second: metal_car_paint
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Car paint
- prototypeName: Car paint
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n \n \n \n \n \n \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 3068890721646206586, guid: c00b5a4f1e4743a4ca59b8030251f900,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 0.5, y: 0.5}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 5917659159057834157, guid: c00b5a4f1e4743a4ca59b8030251f900,
- type: 3}
- scale: {x: 0.5, y: 0.5}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -3552914696322007609, guid: c00b5a4f1e4743a4ca59b8030251f900,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -1242281561028671816, guid: c00b5a4f1e4743a4ca59b8030251f900,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -1652887728991447519, guid: c00b5a4f1e4743a4ca59b8030251f900,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.005
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Car paint_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 2048
- textureHeight: 2048
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 3720744386649352057, guid: c00b5a4f1e4743a4ca59b8030251f900,
- type: 3}
- generatedTextures:
- - {fileID: 5917659159057834157, guid: c00b5a4f1e4743a4ca59b8030251f900, type: 3}
- - {fileID: 3068890721646206586, guid: c00b5a4f1e4743a4ca59b8030251f900, type: 3}
- - {fileID: -3552914696322007609, guid: c00b5a4f1e4743a4ca59b8030251f900, type: 3}
- - {fileID: -1242281561028671816, guid: c00b5a4f1e4743a4ca59b8030251f900, type: 3}
- - {fileID: -1652887728991447519, guid: c00b5a4f1e4743a4ca59b8030251f900, type: 3}
diff --git a/Assets/Materials/Substance/Metal/galvanized_001.sbsar b/Assets/Materials/Substance/Metal/galvanized_001.sbsar
deleted file mode 100644
index 5d6237210..000000000
--- a/Assets/Materials/Substance/Metal/galvanized_001.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:274db26d631b6cd53024c1366c01322d99b6194b5e211d04c5430bb8174ae8f6
-size 8207
diff --git a/Assets/Materials/Substance/Metal/galvanized_001.sbsar.meta b/Assets/Materials/Substance/Metal/galvanized_001.sbsar.meta
deleted file mode 100644
index 9815351c0..000000000
--- a/Assets/Materials/Substance/Metal/galvanized_001.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 2be0f689f5b01be4aa1032bc86f15eab
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: galvanized_001/galvanized_001
- - first:
- 4: 400000
- second: galvanized_001/galvanized_001/Transform
- - first:
- 21: 2100000
- second: mat.Galvanized_001
- - first:
- 23: 2300000
- second: galvanized_001/galvanized_001/MeshRenderer
- - first:
- 28: 2800000
- second: Galvanized_001_baseColor
- - first:
- 28: 2800002
- second: Galvanized_001_normal
- - first:
- 28: 2800004
- second: Galvanized_001_metallic
- - first:
- 28: 2800006
- second: Galvanized_001_ambientOcclusion
- - first:
- 28: 2800008
- second: Galvanized_001_height
- - first:
- 33: 3300000
- second: galvanized_001/galvanized_001/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: galvanized_001/galvanized_001/SphereCollider
- - first:
- 1001: 100100000
- second: galvanized_001
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Galvanized_001
- prototypeName: Galvanized_001
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -2787997366030867252, guid: 2be0f689f5b01be4aa1032bc86f15eab,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 7907137595978400316, guid: 2be0f689f5b01be4aa1032bc86f15eab,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 1034366337303036879, guid: 2be0f689f5b01be4aa1032bc86f15eab,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 4470803051826786927, guid: 2be0f689f5b01be4aa1032bc86f15eab,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -3422293810953865746, guid: 2be0f689f5b01be4aa1032bc86f15eab,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Galvanized_001_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Galvanized_001 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -231086597109407277, guid: 2be0f689f5b01be4aa1032bc86f15eab,
- type: 3}
- generatedTextures:
- - {fileID: 7907137595978400316, guid: 2be0f689f5b01be4aa1032bc86f15eab, type: 3}
- - {fileID: -2787997366030867252, guid: 2be0f689f5b01be4aa1032bc86f15eab, type: 3}
- - {fileID: 1034366337303036879, guid: 2be0f689f5b01be4aa1032bc86f15eab, type: 3}
- - {fileID: 4470803051826786927, guid: 2be0f689f5b01be4aa1032bc86f15eab, type: 3}
- - {fileID: -3422293810953865746, guid: 2be0f689f5b01be4aa1032bc86f15eab, type: 3}
diff --git a/Assets/Materials/Substance/Metal/iron_damaged.sbsar b/Assets/Materials/Substance/Metal/iron_damaged.sbsar
deleted file mode 100644
index cb09572e5..000000000
--- a/Assets/Materials/Substance/Metal/iron_damaged.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a12de208077d6dfd8e70dfa8a8976bb9e5b2ca2d258bb34aa50c81a58a6451c
-size 30808
diff --git a/Assets/Materials/Substance/Metal/iron_damaged.sbsar.meta b/Assets/Materials/Substance/Metal/iron_damaged.sbsar.meta
deleted file mode 100644
index d7a4d07d7..000000000
--- a/Assets/Materials/Substance/Metal/iron_damaged.sbsar.meta
+++ /dev/null
@@ -1,293 +0,0 @@
-fileFormatVersion: 2
-guid: d15fc45ed0000934d946b5f271f637ef
-ScriptedImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Iron Damaged
- prototypeName: Iron Damaged
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -1855041196637152199, guid: d15fc45ed0000934d946b5f271f637ef,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -2789335455068261637, guid: d15fc45ed0000934d946b5f271f637ef,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 7922211451800446260, guid: d15fc45ed0000934d946b5f271f637ef,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -4424499752615739725, guid: d15fc45ed0000934d946b5f271f637ef,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 7474978398744299577, guid: d15fc45ed0000934d946b5f271f637ef,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambientocclusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- textureParameters:
- - textureName: Iron Damaged - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Damaged - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Damaged - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Damaged - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Damaged - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Damaged - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Damaged - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Damaged - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Damaged - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 512
- textureHeight: 512
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 1736733470071950104, guid: d15fc45ed0000934d946b5f271f637ef,
- type: 3}
- generatedTextures:
- - {fileID: -2789335455068261637, guid: d15fc45ed0000934d946b5f271f637ef, type: 3}
- - {fileID: -1855041196637152199, guid: d15fc45ed0000934d946b5f271f637ef, type: 3}
- - {fileID: 7922211451800446260, guid: d15fc45ed0000934d946b5f271f637ef, type: 3}
- - {fileID: 7474978398744299577, guid: d15fc45ed0000934d946b5f271f637ef, type: 3}
- - {fileID: -4424499752615739725, guid: d15fc45ed0000934d946b5f271f637ef, type: 3}
diff --git a/Assets/Materials/Substance/Metal/iron_rugged.sbsar b/Assets/Materials/Substance/Metal/iron_rugged.sbsar
deleted file mode 100644
index d211f88ad..000000000
--- a/Assets/Materials/Substance/Metal/iron_rugged.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f2bc787cbb3f6511050a4faddaa07077bf54814131752687ed3717914d77de5
-size 28930
diff --git a/Assets/Materials/Substance/Metal/iron_rugged.sbsar.meta b/Assets/Materials/Substance/Metal/iron_rugged.sbsar.meta
deleted file mode 100644
index 4d3540662..000000000
--- a/Assets/Materials/Substance/Metal/iron_rugged.sbsar.meta
+++ /dev/null
@@ -1,293 +0,0 @@
-fileFormatVersion: 2
-guid: afbd691d0ea2a5a47b5a43b244593a56
-ScriptedImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Iron Rugged
- prototypeName: Iron Rugged
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -2323688274092838296, guid: afbd691d0ea2a5a47b5a43b244593a56,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -3909611376798458227, guid: afbd691d0ea2a5a47b5a43b244593a56,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -1417795912608492100, guid: afbd691d0ea2a5a47b5a43b244593a56,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -7795300588429949130, guid: afbd691d0ea2a5a47b5a43b244593a56,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 3868076301887189615, guid: afbd691d0ea2a5a47b5a43b244593a56,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambientocclusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- textureParameters:
- - textureName: Iron Rugged - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Rugged - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Rugged - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Rugged - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Rugged - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Rugged - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Rugged - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Rugged - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Iron Rugged - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 512
- textureHeight: 512
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -7894845242109240131, guid: afbd691d0ea2a5a47b5a43b244593a56,
- type: 3}
- generatedTextures:
- - {fileID: -3909611376798458227, guid: afbd691d0ea2a5a47b5a43b244593a56, type: 3}
- - {fileID: -2323688274092838296, guid: afbd691d0ea2a5a47b5a43b244593a56, type: 3}
- - {fileID: -1417795912608492100, guid: afbd691d0ea2a5a47b5a43b244593a56, type: 3}
- - {fileID: 3868076301887189615, guid: afbd691d0ea2a5a47b5a43b244593a56, type: 3}
- - {fileID: -7795300588429949130, guid: afbd691d0ea2a5a47b5a43b244593a56, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_002.sbsar b/Assets/Materials/Substance/Metal/metal_002.sbsar
deleted file mode 100644
index 97dcc5ffe..000000000
--- a/Assets/Materials/Substance/Metal/metal_002.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9282e9326add2015fd2748e98c38062e438b085036eae00825551986e30d002f
-size 11670
diff --git a/Assets/Materials/Substance/Metal/metal_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_002.sbsar.meta
deleted file mode 100644
index 725363c0a..000000000
--- a/Assets/Materials/Substance/Metal/metal_002.sbsar.meta
+++ /dev/null
@@ -1,372 +0,0 @@
-fileFormatVersion: 2
-guid: 2b42584452fe0cc4fa4e8a115230b156
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_002/metal_002
- - first:
- 4: 400000
- second: metal_002/metal_002/Transform
- - first:
- 21: 2100000
- second: mat.Metal 002
- - first:
- 23: 2300000
- second: metal_002/metal_002/MeshRenderer
- - first:
- 28: 2800000
- second: Metal 002_baseColor
- - first:
- 28: 2800002
- second: Metal 002_normal
- - first:
- 28: 2800004
- second: Metal 002_metallic
- - first:
- 28: 2800006
- second: Metal 002_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal 002_height
- - first:
- 33: 3300000
- second: metal_002/metal_002/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_002/metal_002/SphereCollider
- - first:
- 1001: 100100000
- second: metal_002
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal 002
- prototypeName: Metal 002
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 1550000119726971649, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -6057190860509678031, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -894214952450941493, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -6882973941229436791, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 6347190432477724635, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal 002_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 002 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 3766318789785789000, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
- generatedTextures:
- - {fileID: -6057190860509678031, guid: 2b42584452fe0cc4fa4e8a115230b156, type: 3}
- - {fileID: 1550000119726971649, guid: 2b42584452fe0cc4fa4e8a115230b156, type: 3}
- - {fileID: -894214952450941493, guid: 2b42584452fe0cc4fa4e8a115230b156, type: 3}
- - {fileID: -6882973941229436791, guid: 2b42584452fe0cc4fa4e8a115230b156, type: 3}
- - {fileID: 6347190432477724635, guid: 2b42584452fe0cc4fa4e8a115230b156, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_003.sbsar b/Assets/Materials/Substance/Metal/metal_003.sbsar
deleted file mode 100644
index bbc118a2d..000000000
--- a/Assets/Materials/Substance/Metal/metal_003.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ef8ee0ce61d17b7c84433ea0f780f32609c81f580f2c7d3a9c78303b9051a47
-size 7739
diff --git a/Assets/Materials/Substance/Metal/metal_003.sbsar.meta b/Assets/Materials/Substance/Metal/metal_003.sbsar.meta
deleted file mode 100644
index f3ab67932..000000000
--- a/Assets/Materials/Substance/Metal/metal_003.sbsar.meta
+++ /dev/null
@@ -1,372 +0,0 @@
-fileFormatVersion: 2
-guid: 885e680924fc12c439a842a2142d4b78
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_003/metal_003
- - first:
- 4: 400000
- second: metal_003/metal_003/Transform
- - first:
- 21: 2100000
- second: mat.Metal 003
- - first:
- 23: 2300000
- second: metal_003/metal_003/MeshRenderer
- - first:
- 28: 2800000
- second: Metal 003_baseColor
- - first:
- 28: 2800002
- second: Metal 003_normal
- - first:
- 28: 2800004
- second: Metal 003_metallic
- - first:
- 28: 2800006
- second: Metal 003_height
- - first:
- 28: 2800008
- second: Metal 003_ambientOcclusion
- - first:
- 33: 3300000
- second: metal_003/metal_003/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_003/metal_003/SphereCollider
- - first:
- 1001: 100100000
- second: metal_003
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal 003
- prototypeName: Metal 003
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -2508943184622041221, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 8, y: 8}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -1236254257114565538, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
- scale: {x: 8, y: 8}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 4019402794555593307, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -1475328947160444094, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 7523010977671448217, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal 003_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 003 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 1024
- textureHeight: 1024
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -741235592913766832, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
- generatedTextures:
- - {fileID: -1236254257114565538, guid: 885e680924fc12c439a842a2142d4b78, type: 3}
- - {fileID: -2508943184622041221, guid: 885e680924fc12c439a842a2142d4b78, type: 3}
- - {fileID: 4019402794555593307, guid: 885e680924fc12c439a842a2142d4b78, type: 3}
- - {fileID: 7523010977671448217, guid: 885e680924fc12c439a842a2142d4b78, type: 3}
- - {fileID: -1475328947160444094, guid: 885e680924fc12c439a842a2142d4b78, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_006.sbsar b/Assets/Materials/Substance/Metal/metal_006.sbsar
deleted file mode 100644
index ac614998f..000000000
--- a/Assets/Materials/Substance/Metal/metal_006.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7cdd662d4c7ee3124366ac316fe6aa5dd247c279bba053a9084916e0510d8df
-size 12109
diff --git a/Assets/Materials/Substance/Metal/metal_006.sbsar.meta b/Assets/Materials/Substance/Metal/metal_006.sbsar.meta
deleted file mode 100644
index f304dd2c0..000000000
--- a/Assets/Materials/Substance/Metal/metal_006.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 53adf8e53222e6f4791d7bf2110fb70c
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_006/metal_006
- - first:
- 4: 400000
- second: metal_006/metal_006/Transform
- - first:
- 21: 2100000
- second: mat.Metal 006
- - first:
- 23: 2300000
- second: metal_006/metal_006/MeshRenderer
- - first:
- 28: 2800000
- second: Metal 006_baseColor
- - first:
- 28: 2800002
- second: Metal 006_normal
- - first:
- 28: 2800004
- second: Metal 006_metallic
- - first:
- 28: 2800006
- second: Metal 006_height
- - first:
- 28: 2800008
- second: Metal 006_ambientOcclusion
- - first:
- 33: 3300000
- second: metal_006/metal_006/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_006/metal_006/SphereCollider
- - first:
- 1001: 100100000
- second: metal_006
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal 006
- prototypeName: Metal 006
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -9145106948908842110, guid: 53adf8e53222e6f4791d7bf2110fb70c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 8714526317094329886, guid: 53adf8e53222e6f4791d7bf2110fb70c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 8283496261199770474, guid: 53adf8e53222e6f4791d7bf2110fb70c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -247870979206812949, guid: 53adf8e53222e6f4791d7bf2110fb70c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 4895182546727821380, guid: 53adf8e53222e6f4791d7bf2110fb70c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal 006_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal 006 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 3954565982357225544, guid: 53adf8e53222e6f4791d7bf2110fb70c,
- type: 3}
- generatedTextures:
- - {fileID: 8714526317094329886, guid: 53adf8e53222e6f4791d7bf2110fb70c, type: 3}
- - {fileID: -9145106948908842110, guid: 53adf8e53222e6f4791d7bf2110fb70c, type: 3}
- - {fileID: 8283496261199770474, guid: 53adf8e53222e6f4791d7bf2110fb70c, type: 3}
- - {fileID: 4895182546727821380, guid: 53adf8e53222e6f4791d7bf2110fb70c, type: 3}
- - {fileID: -247870979206812949, guid: 53adf8e53222e6f4791d7bf2110fb70c, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_aluminium.sbsar b/Assets/Materials/Substance/Metal/metal_aluminium.sbsar
deleted file mode 100644
index 088b73bee..000000000
--- a/Assets/Materials/Substance/Metal/metal_aluminium.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b19246651deb85c3c0a8d424507e0711ccce8c9eae241da396a36cd210f38f20
-size 10491
diff --git a/Assets/Materials/Substance/Metal/metal_aluminium.sbsar.meta b/Assets/Materials/Substance/Metal/metal_aluminium.sbsar.meta
deleted file mode 100644
index 95addd8d7..000000000
--- a/Assets/Materials/Substance/Metal/metal_aluminium.sbsar.meta
+++ /dev/null
@@ -1,373 +0,0 @@
-fileFormatVersion: 2
-guid: 6b2eb94965ca27542b8627d3521f5b5b
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_aluminium/metal_aluminium
- - first:
- 4: 400000
- second: metal_aluminium/metal_aluminium/Transform
- - first:
- 21: 2100000
- second: mat.Aluminium
- - first:
- 23: 2300000
- second: metal_aluminium/metal_aluminium/MeshRenderer
- - first:
- 28: 2800000
- second: Aluminium_baseColor
- - first:
- 28: 2800002
- second: Aluminium_normal
- - first:
- 28: 2800004
- second: Aluminium_metallic
- - first:
- 28: 2800006
- second: Aluminium_ambientOcclusion
- - first:
- 28: 2800008
- second: Aluminium_height
- - first:
- 33: 3300000
- second: metal_aluminium/metal_aluminium/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_aluminium/metal_aluminium/SphereCollider
- - first:
- 1001: 100100000
- second: metal_aluminium
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Aluminium
- prototypeName: Aluminium
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -7227111979962756822, guid: 6b2eb94965ca27542b8627d3521f5b5b,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 5122202571912407749, guid: 6b2eb94965ca27542b8627d3521f5b5b,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -5067940305606501900, guid: 6b2eb94965ca27542b8627d3521f5b5b,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 9049458111962441826, guid: 6b2eb94965ca27542b8627d3521f5b5b,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -7751791800289965735, guid: 6b2eb94965ca27542b8627d3521f5b5b,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Aluminium_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 512
- textureHeight: 512
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 2717629391965333470, guid: 6b2eb94965ca27542b8627d3521f5b5b,
- type: 3}
- generatedTextures:
- - {fileID: 5122202571912407749, guid: 6b2eb94965ca27542b8627d3521f5b5b, type: 3}
- - {fileID: -7227111979962756822, guid: 6b2eb94965ca27542b8627d3521f5b5b, type: 3}
- - {fileID: -5067940305606501900, guid: 6b2eb94965ca27542b8627d3521f5b5b, type: 3}
- - {fileID: 9049458111962441826, guid: 6b2eb94965ca27542b8627d3521f5b5b, type: 3}
- - {fileID: -7751791800289965735, guid: 6b2eb94965ca27542b8627d3521f5b5b, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar b/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar
deleted file mode 100644
index 7f2ec6e98..000000000
--- a/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41bfd12f87e8255f00383022aa8a1d0c83273a8a23e21233db9f8f08eb89738f
-size 12223
diff --git a/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar.meta b/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar.meta
deleted file mode 100644
index cafdf3d25..000000000
--- a/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar.meta
+++ /dev/null
@@ -1,373 +0,0 @@
-fileFormatVersion: 2
-guid: 06d6a565d43fba5409712ce9a10bfbef
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_aluminium_brushed/metal_aluminium_brushed
- - first:
- 4: 400000
- second: metal_aluminium_brushed/metal_aluminium_brushed/Transform
- - first:
- 21: 2100000
- second: mat.Aluminium brushed
- - first:
- 23: 2300000
- second: metal_aluminium_brushed/metal_aluminium_brushed/MeshRenderer
- - first:
- 28: 2800000
- second: Aluminium brushed_baseColor
- - first:
- 28: 2800002
- second: Aluminium brushed_normal
- - first:
- 28: 2800004
- second: Aluminium brushed_metallic
- - first:
- 28: 2800006
- second: Aluminium brushed_ambientOcclusion
- - first:
- 28: 2800008
- second: Aluminium brushed_height
- - first:
- 33: 3300000
- second: metal_aluminium_brushed/metal_aluminium_brushed/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_aluminium_brushed/metal_aluminium_brushed/SphereCollider
- - first:
- 1001: 100100000
- second: metal_aluminium_brushed
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Aluminium brushed
- prototypeName: Aluminium brushed
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n
- \n \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 4730978449518085612, guid: 06d6a565d43fba5409712ce9a10bfbef,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 7556082237344091230, guid: 06d6a565d43fba5409712ce9a10bfbef,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 6373266012617290493, guid: 06d6a565d43fba5409712ce9a10bfbef,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 342959783478273704, guid: 06d6a565d43fba5409712ce9a10bfbef,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -9132138291289375396, guid: 06d6a565d43fba5409712ce9a10bfbef,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Aluminium brushed_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Aluminium brushed - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 512
- textureHeight: 512
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -5899741495057040748, guid: 06d6a565d43fba5409712ce9a10bfbef,
- type: 3}
- generatedTextures:
- - {fileID: 7556082237344091230, guid: 06d6a565d43fba5409712ce9a10bfbef, type: 3}
- - {fileID: 4730978449518085612, guid: 06d6a565d43fba5409712ce9a10bfbef, type: 3}
- - {fileID: 6373266012617290493, guid: 06d6a565d43fba5409712ce9a10bfbef, type: 3}
- - {fileID: 342959783478273704, guid: 06d6a565d43fba5409712ce9a10bfbef, type: 3}
- - {fileID: -9132138291289375396, guid: 06d6a565d43fba5409712ce9a10bfbef, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_brass.sbsar b/Assets/Materials/Substance/Metal/metal_brass.sbsar
deleted file mode 100644
index 8db7e53b4..000000000
--- a/Assets/Materials/Substance/Metal/metal_brass.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26e440c8cc91202789c408e82dfa3caca98938014aaf63baade897fade94f212
-size 12658
diff --git a/Assets/Materials/Substance/Metal/metal_brass.sbsar.meta b/Assets/Materials/Substance/Metal/metal_brass.sbsar.meta
deleted file mode 100644
index dad220291..000000000
--- a/Assets/Materials/Substance/Metal/metal_brass.sbsar.meta
+++ /dev/null
@@ -1,375 +0,0 @@
-fileFormatVersion: 2
-guid: 9fc901afb8a434e46b9405eaec2df5a4
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_brass/metal_brass
- - first:
- 4: 400000
- second: metal_brass/metal_brass/Transform
- - first:
- 21: 2100000
- second: mat.Brass
- - first:
- 23: 2300000
- second: metal_brass/metal_brass/MeshRenderer
- - first:
- 28: 2800000
- second: Brass_baseColor
- - first:
- 28: 2800002
- second: Brass_normal
- - first:
- 28: 2800004
- second: Brass_metallic
- - first:
- 28: 2800006
- second: Brass_ambientOcclusion
- - first:
- 28: 2800008
- second: Brass_height
- - first:
- 33: 3300000
- second: metal_brass/metal_brass/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_brass/metal_brass/SphereCollider
- - first:
- 1001: 100100000
- second: metal_brass
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Brass
- prototypeName: Brass
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -3419035557588562233, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -1863473678134789185, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 6214616473909614744, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -3436886866959827803, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 7009887839391554354, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Brass_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Brass - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 1024
- textureHeight: 1024
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -4907982557009795279, guid: 9fc901afb8a434e46b9405eaec2df5a4,
- type: 3}
- generatedTextures:
- - {fileID: -1863473678134789185, guid: 9fc901afb8a434e46b9405eaec2df5a4, type: 3}
- - {fileID: -3419035557588562233, guid: 9fc901afb8a434e46b9405eaec2df5a4, type: 3}
- - {fileID: 6214616473909614744, guid: 9fc901afb8a434e46b9405eaec2df5a4, type: 3}
- - {fileID: -3436886866959827803, guid: 9fc901afb8a434e46b9405eaec2df5a4, type: 3}
- - {fileID: 7009887839391554354, guid: 9fc901afb8a434e46b9405eaec2df5a4, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_car_paint 1.sbsar b/Assets/Materials/Substance/Metal/metal_car_paint 1.sbsar
deleted file mode 100644
index 963310406..000000000
--- a/Assets/Materials/Substance/Metal/metal_car_paint 1.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbee14b278a03ed59e1df8ecd6ba2b07ab7c2b2089e5e2bc3fad5673694a9f03
-size 14971
diff --git a/Assets/Materials/Substance/Metal/metal_car_paint 1.sbsar.meta b/Assets/Materials/Substance/Metal/metal_car_paint 1.sbsar.meta
deleted file mode 100644
index d6786ba5e..000000000
--- a/Assets/Materials/Substance/Metal/metal_car_paint 1.sbsar.meta
+++ /dev/null
@@ -1,379 +0,0 @@
-fileFormatVersion: 2
-guid: 1c858fec5b74c7c46b1712494192b6b5
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_car_paint/metal_car_paint
- - first:
- 4: 400000
- second: metal_car_paint/metal_car_paint/Transform
- - first:
- 21: 2100000
- second: mat.Car paint
- - first:
- 23: 2300000
- second: metal_car_paint/metal_car_paint/MeshRenderer
- - first:
- 28: 2800000
- second: Car paint_baseColor
- - first:
- 28: 2800002
- second: Car paint_normal
- - first:
- 28: 2800004
- second: Car paint_metallic
- - first:
- 28: 2800006
- second: Car paint_ambientOcclusion
- - first:
- 28: 2800008
- second: Car paint_height
- - first:
- 33: 3300000
- second: metal_car_paint/metal_car_paint/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_car_paint/metal_car_paint/SphereCollider
- - first:
- 1001: 100100000
- second: metal_car_paint
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Car paint
- prototypeName: Car paint
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n \n \n \n \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 3068890721646206586, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 16, y: 16}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 5917659159057834157, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
- scale: {x: 16, y: 16}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -3552914696322007609, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -1242281561028671816, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -1652887728991447519, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.005
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Car paint_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 1024
- textureHeight: 1024
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 3720744386649352057, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
- generatedTextures:
- - {fileID: 5917659159057834157, guid: 1c858fec5b74c7c46b1712494192b6b5, type: 3}
- - {fileID: 3068890721646206586, guid: 1c858fec5b74c7c46b1712494192b6b5, type: 3}
- - {fileID: -3552914696322007609, guid: 1c858fec5b74c7c46b1712494192b6b5, type: 3}
- - {fileID: -1242281561028671816, guid: 1c858fec5b74c7c46b1712494192b6b5, type: 3}
- - {fileID: -1652887728991447519, guid: 1c858fec5b74c7c46b1712494192b6b5, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_car_paint Magenta.sbsar b/Assets/Materials/Substance/Metal/metal_car_paint Magenta.sbsar
deleted file mode 100644
index 963310406..000000000
--- a/Assets/Materials/Substance/Metal/metal_car_paint Magenta.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbee14b278a03ed59e1df8ecd6ba2b07ab7c2b2089e5e2bc3fad5673694a9f03
-size 14971
diff --git a/Assets/Materials/Substance/Metal/metal_car_paint Magenta.sbsar.meta b/Assets/Materials/Substance/Metal/metal_car_paint Magenta.sbsar.meta
deleted file mode 100644
index c839a27b8..000000000
--- a/Assets/Materials/Substance/Metal/metal_car_paint Magenta.sbsar.meta
+++ /dev/null
@@ -1,381 +0,0 @@
-fileFormatVersion: 2
-guid: a1d39ea984432bf44b4a0686afe2bf1a
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_car_paint/metal_car_paint
- - first:
- 4: 400000
- second: metal_car_paint/metal_car_paint/Transform
- - first:
- 21: 2100000
- second: mat.Car paint
- - first:
- 23: 2300000
- second: metal_car_paint/metal_car_paint/MeshRenderer
- - first:
- 28: 2800000
- second: Car paint_baseColor
- - first:
- 28: 2800002
- second: Car paint_normal
- - first:
- 28: 2800004
- second: Car paint_metallic
- - first:
- 28: 2800006
- second: Car paint_ambientOcclusion
- - first:
- 28: 2800008
- second: Car paint_height
- - first:
- 33: 3300000
- second: metal_car_paint/metal_car_paint/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_car_paint/metal_car_paint/SphereCollider
- - first:
- 1001: 100100000
- second: metal_car_paint
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Car paint
- prototypeName: Car paint
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n \n \n \n \n \n \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 3068890721646206586, guid: a1d39ea984432bf44b4a0686afe2bf1a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 5917659159057834157, guid: a1d39ea984432bf44b4a0686afe2bf1a,
- type: 3}
- scale: {x: 2, y: 2}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -3552914696322007609, guid: a1d39ea984432bf44b4a0686afe2bf1a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -1242281561028671816, guid: a1d39ea984432bf44b4a0686afe2bf1a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -1652887728991447519, guid: a1d39ea984432bf44b4a0686afe2bf1a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 1
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 1
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Car paint_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 2048
- textureHeight: 2048
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 3720744386649352057, guid: a1d39ea984432bf44b4a0686afe2bf1a,
- type: 3}
- generatedTextures:
- - {fileID: 5917659159057834157, guid: a1d39ea984432bf44b4a0686afe2bf1a, type: 3}
- - {fileID: 3068890721646206586, guid: a1d39ea984432bf44b4a0686afe2bf1a, type: 3}
- - {fileID: -3552914696322007609, guid: a1d39ea984432bf44b4a0686afe2bf1a, type: 3}
- - {fileID: -1242281561028671816, guid: a1d39ea984432bf44b4a0686afe2bf1a, type: 3}
- - {fileID: -1652887728991447519, guid: a1d39ea984432bf44b4a0686afe2bf1a, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_car_paint red.sbsar b/Assets/Materials/Substance/Metal/metal_car_paint red.sbsar
deleted file mode 100644
index 963310406..000000000
--- a/Assets/Materials/Substance/Metal/metal_car_paint red.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbee14b278a03ed59e1df8ecd6ba2b07ab7c2b2089e5e2bc3fad5673694a9f03
-size 14971
diff --git a/Assets/Materials/Substance/Metal/metal_car_paint red.sbsar.meta b/Assets/Materials/Substance/Metal/metal_car_paint red.sbsar.meta
deleted file mode 100644
index ded098ca6..000000000
--- a/Assets/Materials/Substance/Metal/metal_car_paint red.sbsar.meta
+++ /dev/null
@@ -1,381 +0,0 @@
-fileFormatVersion: 2
-guid: 504c7bfe0d50ff64a88b8eac2ceb46f8
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_car_paint/metal_car_paint
- - first:
- 4: 400000
- second: metal_car_paint/metal_car_paint/Transform
- - first:
- 21: 2100000
- second: mat.Car paint
- - first:
- 23: 2300000
- second: metal_car_paint/metal_car_paint/MeshRenderer
- - first:
- 28: 2800000
- second: Car paint_baseColor
- - first:
- 28: 2800002
- second: Car paint_normal
- - first:
- 28: 2800004
- second: Car paint_metallic
- - first:
- 28: 2800006
- second: Car paint_ambientOcclusion
- - first:
- 28: 2800008
- second: Car paint_height
- - first:
- 33: 3300000
- second: metal_car_paint/metal_car_paint/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_car_paint/metal_car_paint/SphereCollider
- - first:
- 1001: 100100000
- second: metal_car_paint
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Car paint
- prototypeName: Car paint
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n \n \n \n \n \n \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 3068890721646206586, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 5917659159057834157, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -3552914696322007609, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -1242281561028671816, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -1652887728991447519, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.005
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Car paint_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 2048
- textureHeight: 2048
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 3720744386649352057, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8,
- type: 3}
- generatedTextures:
- - {fileID: 5917659159057834157, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8, type: 3}
- - {fileID: 3068890721646206586, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8, type: 3}
- - {fileID: -3552914696322007609, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8, type: 3}
- - {fileID: -1242281561028671816, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8, type: 3}
- - {fileID: -1652887728991447519, guid: 504c7bfe0d50ff64a88b8eac2ceb46f8, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_car_paint white.sbsar b/Assets/Materials/Substance/Metal/metal_car_paint white.sbsar
deleted file mode 100644
index 963310406..000000000
--- a/Assets/Materials/Substance/Metal/metal_car_paint white.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbee14b278a03ed59e1df8ecd6ba2b07ab7c2b2089e5e2bc3fad5673694a9f03
-size 14971
diff --git a/Assets/Materials/Substance/Metal/metal_car_paint white.sbsar.meta b/Assets/Materials/Substance/Metal/metal_car_paint white.sbsar.meta
deleted file mode 100644
index 98f20f5ea..000000000
--- a/Assets/Materials/Substance/Metal/metal_car_paint white.sbsar.meta
+++ /dev/null
@@ -1,382 +0,0 @@
-fileFormatVersion: 2
-guid: b2bec4b400153d745b2915f1c43e5c96
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_car_paint/metal_car_paint
- - first:
- 4: 400000
- second: metal_car_paint/metal_car_paint/Transform
- - first:
- 21: 2100000
- second: mat.Car paint
- - first:
- 23: 2300000
- second: metal_car_paint/metal_car_paint/MeshRenderer
- - first:
- 28: 2800000
- second: Car paint_baseColor
- - first:
- 28: 2800002
- second: Car paint_normal
- - first:
- 28: 2800004
- second: Car paint_metallic
- - first:
- 28: 2800006
- second: Car paint_ambientOcclusion
- - first:
- 28: 2800008
- second: Car paint_height
- - first:
- 33: 3300000
- second: metal_car_paint/metal_car_paint/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_car_paint/metal_car_paint/SphereCollider
- - first:
- 1001: 100100000
- second: metal_car_paint
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Car paint
- prototypeName: Car paint
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n \n \n \n \n \n \n
- \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 3068890721646206586, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 0.5, y: 0.5}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 5917659159057834157, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
- scale: {x: 0.5, y: 0.5}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -3552914696322007609, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -1242281561028671816, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -1652887728991447519, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 1
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 1
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Car paint_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Car paint - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 2048
- textureHeight: 2048
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 3720744386649352057, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
- generatedTextures:
- - {fileID: 5917659159057834157, guid: b2bec4b400153d745b2915f1c43e5c96, type: 3}
- - {fileID: 3068890721646206586, guid: b2bec4b400153d745b2915f1c43e5c96, type: 3}
- - {fileID: -3552914696322007609, guid: b2bec4b400153d745b2915f1c43e5c96, type: 3}
- - {fileID: -1242281561028671816, guid: b2bec4b400153d745b2915f1c43e5c96, type: 3}
- - {fileID: -1652887728991447519, guid: b2bec4b400153d745b2915f1c43e5c96, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_copper.sbsar b/Assets/Materials/Substance/Metal/metal_copper.sbsar
deleted file mode 100644
index b9eaa9f10..000000000
--- a/Assets/Materials/Substance/Metal/metal_copper.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e0b38479a336f09f0f273488c666a1eb025ddd9a65366da00c80179ca0a64ee
-size 7413
diff --git a/Assets/Materials/Substance/Metal/metal_copper.sbsar.meta b/Assets/Materials/Substance/Metal/metal_copper.sbsar.meta
deleted file mode 100644
index d1afb9abd..000000000
--- a/Assets/Materials/Substance/Metal/metal_copper.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 8249e9ffcbd97c84d8ce73343e156c82
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_copper/metal_copper
- - first:
- 4: 400000
- second: metal_copper/metal_copper/Transform
- - first:
- 21: 2100000
- second: mat.Copper
- - first:
- 23: 2300000
- second: metal_copper/metal_copper/MeshRenderer
- - first:
- 28: 2800000
- second: Copper_baseColor
- - first:
- 28: 2800002
- second: Copper_normal
- - first:
- 28: 2800004
- second: Copper_metallic
- - first:
- 28: 2800006
- second: Copper_ambientOcclusion
- - first:
- 28: 2800008
- second: Copper_height
- - first:
- 33: 3300000
- second: metal_copper/metal_copper/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_copper/metal_copper/SphereCollider
- - first:
- 1001: 100100000
- second: metal_copper
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Copper
- prototypeName: Copper
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -3792452219542522299, guid: 8249e9ffcbd97c84d8ce73343e156c82,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -595311359069952391, guid: 8249e9ffcbd97c84d8ce73343e156c82,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -1397886531756242709, guid: 8249e9ffcbd97c84d8ce73343e156c82,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 2236529815293478155, guid: 8249e9ffcbd97c84d8ce73343e156c82,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -1739956823984805281, guid: 8249e9ffcbd97c84d8ce73343e156c82,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Copper_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Copper - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 9219180724257492359, guid: 8249e9ffcbd97c84d8ce73343e156c82,
- type: 3}
- generatedTextures:
- - {fileID: -595311359069952391, guid: 8249e9ffcbd97c84d8ce73343e156c82, type: 3}
- - {fileID: -3792452219542522299, guid: 8249e9ffcbd97c84d8ce73343e156c82, type: 3}
- - {fileID: -1397886531756242709, guid: 8249e9ffcbd97c84d8ce73343e156c82, type: 3}
- - {fileID: 2236529815293478155, guid: 8249e9ffcbd97c84d8ce73343e156c82, type: 3}
- - {fileID: -1739956823984805281, guid: 8249e9ffcbd97c84d8ce73343e156c82, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar b/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar
deleted file mode 100644
index 24237719c..000000000
--- a/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b798bdf0e774a7d826b7080b18c91ac8000cf6ac617dc395d8cf105aba8d7da
-size 12826
diff --git a/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar.meta
deleted file mode 100644
index 3de9c9e1e..000000000
--- a/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 9d0963470d3545a4e932ed4ea95b9d62
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_corrugated_002/metal_corrugated_002
- - first:
- 4: 400000
- second: metal_corrugated_002/metal_corrugated_002/Transform
- - first:
- 21: 2100000
- second: mat.Metal Corrugated 002
- - first:
- 23: 2300000
- second: metal_corrugated_002/metal_corrugated_002/MeshRenderer
- - first:
- 28: 2800000
- second: Metal Corrugated 002_baseColor
- - first:
- 28: 2800002
- second: Metal Corrugated 002_normal
- - first:
- 28: 2800004
- second: Metal Corrugated 002_metallic
- - first:
- 28: 2800006
- second: Metal Corrugated 002_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal Corrugated 002_height
- - first:
- 33: 3300000
- second: metal_corrugated_002/metal_corrugated_002/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_corrugated_002/metal_corrugated_002/SphereCollider
- - first:
- 1001: 100100000
- second: metal_corrugated_002
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal Corrugated 002
- prototypeName: Metal Corrugated 002
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -3654691528969531916, guid: 9d0963470d3545a4e932ed4ea95b9d62,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 4818317370781631303, guid: 9d0963470d3545a4e932ed4ea95b9d62,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 5859956115695178477, guid: 9d0963470d3545a4e932ed4ea95b9d62,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -8111981235355854162, guid: 9d0963470d3545a4e932ed4ea95b9d62,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -5667621616349238808, guid: 9d0963470d3545a4e932ed4ea95b9d62,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal Corrugated 002_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Corrugated 002 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -1355354389579744761, guid: 9d0963470d3545a4e932ed4ea95b9d62,
- type: 3}
- generatedTextures:
- - {fileID: 4818317370781631303, guid: 9d0963470d3545a4e932ed4ea95b9d62, type: 3}
- - {fileID: -3654691528969531916, guid: 9d0963470d3545a4e932ed4ea95b9d62, type: 3}
- - {fileID: 5859956115695178477, guid: 9d0963470d3545a4e932ed4ea95b9d62, type: 3}
- - {fileID: -8111981235355854162, guid: 9d0963470d3545a4e932ed4ea95b9d62, type: 3}
- - {fileID: -5667621616349238808, guid: 9d0963470d3545a4e932ed4ea95b9d62, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_floor_002.sbsar b/Assets/Materials/Substance/Metal/metal_floor_002.sbsar
deleted file mode 100644
index af4adc50c..000000000
--- a/Assets/Materials/Substance/Metal/metal_floor_002.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5815e5257550f8315dd80831c4cab398a3ae7b234b25e716ecca18c9facbd9be
-size 11140
diff --git a/Assets/Materials/Substance/Metal/metal_floor_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_floor_002.sbsar.meta
deleted file mode 100644
index c100570af..000000000
--- a/Assets/Materials/Substance/Metal/metal_floor_002.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: ddc6970cc883b9845bdadc91983130c2
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_floor_002/metal_floor_002
- - first:
- 4: 400000
- second: metal_floor_002/metal_floor_002/Transform
- - first:
- 21: 2100000
- second: mat.Metal Floor 002
- - first:
- 23: 2300000
- second: metal_floor_002/metal_floor_002/MeshRenderer
- - first:
- 28: 2800000
- second: Metal Floor 002_baseColor
- - first:
- 28: 2800002
- second: Metal Floor 002_normal
- - first:
- 28: 2800004
- second: Metal Floor 002_metallic
- - first:
- 28: 2800006
- second: Metal Floor 002_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal Floor 002_height
- - first:
- 33: 3300000
- second: metal_floor_002/metal_floor_002/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_floor_002/metal_floor_002/SphereCollider
- - first:
- 1001: 100100000
- second: metal_floor_002
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal Floor 002
- prototypeName: Metal Floor 002
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 351554284034007472, guid: ddc6970cc883b9845bdadc91983130c2,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -7508666898770042810, guid: ddc6970cc883b9845bdadc91983130c2,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -4403901252400104909, guid: ddc6970cc883b9845bdadc91983130c2,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -4356325417559842052, guid: ddc6970cc883b9845bdadc91983130c2,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -3247329771169464856, guid: ddc6970cc883b9845bdadc91983130c2,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal Floor 002_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 002 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 3616699503892477274, guid: ddc6970cc883b9845bdadc91983130c2,
- type: 3}
- generatedTextures:
- - {fileID: -7508666898770042810, guid: ddc6970cc883b9845bdadc91983130c2, type: 3}
- - {fileID: 351554284034007472, guid: ddc6970cc883b9845bdadc91983130c2, type: 3}
- - {fileID: -4403901252400104909, guid: ddc6970cc883b9845bdadc91983130c2, type: 3}
- - {fileID: -4356325417559842052, guid: ddc6970cc883b9845bdadc91983130c2, type: 3}
- - {fileID: -3247329771169464856, guid: ddc6970cc883b9845bdadc91983130c2, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_floor_004.sbsar b/Assets/Materials/Substance/Metal/metal_floor_004.sbsar
deleted file mode 100644
index f7136c15b..000000000
--- a/Assets/Materials/Substance/Metal/metal_floor_004.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d30688944fced2d854f8375ebecd8ad7a6a8021cee07e89710b44ad8272addd
-size 8634
diff --git a/Assets/Materials/Substance/Metal/metal_floor_004.sbsar.meta b/Assets/Materials/Substance/Metal/metal_floor_004.sbsar.meta
deleted file mode 100644
index 031cbe6c4..000000000
--- a/Assets/Materials/Substance/Metal/metal_floor_004.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 50192727b92e0af4cbe5c773bec3537f
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_floor_004/metal_floor_004
- - first:
- 4: 400000
- second: metal_floor_004/metal_floor_004/Transform
- - first:
- 21: 2100000
- second: mat.Metal Floor 004
- - first:
- 23: 2300000
- second: metal_floor_004/metal_floor_004/MeshRenderer
- - first:
- 28: 2800000
- second: Metal Floor 004_baseColor
- - first:
- 28: 2800002
- second: Metal Floor 004_normal
- - first:
- 28: 2800004
- second: Metal Floor 004_metallic
- - first:
- 28: 2800006
- second: Metal Floor 004_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal Floor 004_height
- - first:
- 33: 3300000
- second: metal_floor_004/metal_floor_004/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_floor_004/metal_floor_004/SphereCollider
- - first:
- 1001: 100100000
- second: metal_floor_004
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal Floor 004
- prototypeName: Metal Floor 004
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 5886398526092406922, guid: 50192727b92e0af4cbe5c773bec3537f,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 1550179426837470591, guid: 50192727b92e0af4cbe5c773bec3537f,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 4385304290797446058, guid: 50192727b92e0af4cbe5c773bec3537f,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -3130265262045919237, guid: 50192727b92e0af4cbe5c773bec3537f,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 4866469902769357514, guid: 50192727b92e0af4cbe5c773bec3537f,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal Floor 004_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 004 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -1891697860355797410, guid: 50192727b92e0af4cbe5c773bec3537f,
- type: 3}
- generatedTextures:
- - {fileID: 1550179426837470591, guid: 50192727b92e0af4cbe5c773bec3537f, type: 3}
- - {fileID: 5886398526092406922, guid: 50192727b92e0af4cbe5c773bec3537f, type: 3}
- - {fileID: 4385304290797446058, guid: 50192727b92e0af4cbe5c773bec3537f, type: 3}
- - {fileID: -3130265262045919237, guid: 50192727b92e0af4cbe5c773bec3537f, type: 3}
- - {fileID: 4866469902769357514, guid: 50192727b92e0af4cbe5c773bec3537f, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_floor_006.sbsar b/Assets/Materials/Substance/Metal/metal_floor_006.sbsar
deleted file mode 100644
index 81ce60800..000000000
--- a/Assets/Materials/Substance/Metal/metal_floor_006.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9604a8c7814d09f90d8bc64061cdc39c733d9f96de43143717f9a951b1f08a0e
-size 10884
diff --git a/Assets/Materials/Substance/Metal/metal_floor_006.sbsar.meta b/Assets/Materials/Substance/Metal/metal_floor_006.sbsar.meta
deleted file mode 100644
index 91f291c9d..000000000
--- a/Assets/Materials/Substance/Metal/metal_floor_006.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 06833951ebae4cc45ad88d58cb5571de
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_floor_006/metal_floor_006
- - first:
- 4: 400000
- second: metal_floor_006/metal_floor_006/Transform
- - first:
- 21: 2100000
- second: mat.Metal Floor 006
- - first:
- 23: 2300000
- second: metal_floor_006/metal_floor_006/MeshRenderer
- - first:
- 28: 2800000
- second: Metal Floor 006_baseColor
- - first:
- 28: 2800002
- second: Metal Floor 006_normal
- - first:
- 28: 2800004
- second: Metal Floor 006_metallic
- - first:
- 28: 2800006
- second: Metal Floor 006_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal Floor 006_height
- - first:
- 33: 3300000
- second: metal_floor_006/metal_floor_006/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_floor_006/metal_floor_006/SphereCollider
- - first:
- 1001: 100100000
- second: metal_floor_006
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal Floor 006
- prototypeName: Metal Floor 006
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -2252411089510067877, guid: 06833951ebae4cc45ad88d58cb5571de,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -446378320346000722, guid: 06833951ebae4cc45ad88d58cb5571de,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 877764506763962143, guid: 06833951ebae4cc45ad88d58cb5571de,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -4232129871321120126, guid: 06833951ebae4cc45ad88d58cb5571de,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 3318615130639472310, guid: 06833951ebae4cc45ad88d58cb5571de,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal Floor 006_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Floor 006 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -6975397259061671394, guid: 06833951ebae4cc45ad88d58cb5571de,
- type: 3}
- generatedTextures:
- - {fileID: -446378320346000722, guid: 06833951ebae4cc45ad88d58cb5571de, type: 3}
- - {fileID: -2252411089510067877, guid: 06833951ebae4cc45ad88d58cb5571de, type: 3}
- - {fileID: 877764506763962143, guid: 06833951ebae4cc45ad88d58cb5571de, type: 3}
- - {fileID: -4232129871321120126, guid: 06833951ebae4cc45ad88d58cb5571de, type: 3}
- - {fileID: 3318615130639472310, guid: 06833951ebae4cc45ad88d58cb5571de, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_gold.sbsar b/Assets/Materials/Substance/Metal/metal_gold.sbsar
deleted file mode 100644
index 5aa377680..000000000
--- a/Assets/Materials/Substance/Metal/metal_gold.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29ef1a459ab7d090b32ee563d729038527c4d031595abef2a49398543d11343c
-size 7428
diff --git a/Assets/Materials/Substance/Metal/metal_gold.sbsar.meta b/Assets/Materials/Substance/Metal/metal_gold.sbsar.meta
deleted file mode 100644
index c4e7f4644..000000000
--- a/Assets/Materials/Substance/Metal/metal_gold.sbsar.meta
+++ /dev/null
@@ -1,373 +0,0 @@
-fileFormatVersion: 2
-guid: a74970be876d3554ea0f279f39314c9c
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_gold/metal_gold
- - first:
- 4: 400000
- second: metal_gold/metal_gold/Transform
- - first:
- 21: 2100000
- second: mat.Gold
- - first:
- 23: 2300000
- second: metal_gold/metal_gold/MeshRenderer
- - first:
- 28: 2800000
- second: Gold_baseColor
- - first:
- 28: 2800002
- second: Gold_normal
- - first:
- 28: 2800004
- second: Gold_metallic
- - first:
- 28: 2800006
- second: Gold_ambientOcclusion
- - first:
- 28: 2800008
- second: Gold_height
- - first:
- 33: 3300000
- second: metal_gold/metal_gold/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_gold/metal_gold/SphereCollider
- - first:
- 1001: 100100000
- second: metal_gold
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Gold
- prototypeName: Gold
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -6248678595456566848, guid: a74970be876d3554ea0f279f39314c9c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 4, y: 4}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 2039085267362074300, guid: a74970be876d3554ea0f279f39314c9c,
- type: 3}
- scale: {x: 4, y: 4}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -8783136193678078058, guid: a74970be876d3554ea0f279f39314c9c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 7384525862955468029, guid: a74970be876d3554ea0f279f39314c9c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -8934633548313413119, guid: a74970be876d3554ea0f279f39314c9c,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Gold_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Gold - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 512
- textureHeight: 512
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -905690159841262435, guid: a74970be876d3554ea0f279f39314c9c,
- type: 3}
- generatedTextures:
- - {fileID: 2039085267362074300, guid: a74970be876d3554ea0f279f39314c9c, type: 3}
- - {fileID: -6248678595456566848, guid: a74970be876d3554ea0f279f39314c9c, type: 3}
- - {fileID: -8783136193678078058, guid: a74970be876d3554ea0f279f39314c9c, type: 3}
- - {fileID: 7384525862955468029, guid: a74970be876d3554ea0f279f39314c9c, type: 3}
- - {fileID: -8934633548313413119, guid: a74970be876d3554ea0f279f39314c9c, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_nickel.sbsar b/Assets/Materials/Substance/Metal/metal_nickel.sbsar
deleted file mode 100644
index e7cf69c6b..000000000
--- a/Assets/Materials/Substance/Metal/metal_nickel.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0395691305bc49406088b12b65ea186d65d5101bc230a2e91b4ddbf2c7b65ea
-size 8935
diff --git a/Assets/Materials/Substance/Metal/metal_nickel.sbsar.meta b/Assets/Materials/Substance/Metal/metal_nickel.sbsar.meta
deleted file mode 100644
index 65531754c..000000000
--- a/Assets/Materials/Substance/Metal/metal_nickel.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: c5f2177e1f35daa499f4d7e0b7f3370a
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_nickel/metal_nickel
- - first:
- 4: 400000
- second: metal_nickel/metal_nickel/Transform
- - first:
- 21: 2100000
- second: mat.Nickel
- - first:
- 23: 2300000
- second: metal_nickel/metal_nickel/MeshRenderer
- - first:
- 28: 2800000
- second: Nickel_baseColor
- - first:
- 28: 2800002
- second: Nickel_normal
- - first:
- 28: 2800004
- second: Nickel_metallic
- - first:
- 28: 2800006
- second: Nickel_ambientOcclusion
- - first:
- 28: 2800008
- second: Nickel_height
- - first:
- 33: 3300000
- second: metal_nickel/metal_nickel/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_nickel/metal_nickel/SphereCollider
- - first:
- 1001: 100100000
- second: metal_nickel
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Nickel
- prototypeName: Nickel
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 1040180909335529060, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -3896990606402278735, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -8156577797594723071, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -7935365347593253955, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -4922792887777872198, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Nickel_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Nickel - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -443055228576417237, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
- type: 3}
- generatedTextures:
- - {fileID: -3896990606402278735, guid: c5f2177e1f35daa499f4d7e0b7f3370a, type: 3}
- - {fileID: 1040180909335529060, guid: c5f2177e1f35daa499f4d7e0b7f3370a, type: 3}
- - {fileID: -8156577797594723071, guid: c5f2177e1f35daa499f4d7e0b7f3370a, type: 3}
- - {fileID: -7935365347593253955, guid: c5f2177e1f35daa499f4d7e0b7f3370a, type: 3}
- - {fileID: -4922792887777872198, guid: c5f2177e1f35daa499f4d7e0b7f3370a, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar b/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar
deleted file mode 100644
index d764cd35f..000000000
--- a/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc8dcd55f0619c028037c7225720acb4eea87b28cc7c120125fa2b38d02f775a
-size 13628
diff --git a/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar.meta b/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar.meta
deleted file mode 100644
index 467fa07bd..000000000
--- a/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar.meta
+++ /dev/null
@@ -1,376 +0,0 @@
-fileFormatVersion: 2
-guid: b7e648471e9dfc44490bd41973711541
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_painted_steel/metal_painted_steel
- - first:
- 4: 400000
- second: metal_painted_steel/metal_painted_steel/Transform
- - first:
- 21: 2100000
- second: mat.Painted steel
- - first:
- 23: 2300000
- second: metal_painted_steel/metal_painted_steel/MeshRenderer
- - first:
- 28: 2800000
- second: Painted steel_baseColor
- - first:
- 28: 2800002
- second: Painted steel_normal
- - first:
- 28: 2800004
- second: Painted steel_metallic
- - first:
- 28: 2800006
- second: Painted steel_ambientOcclusion
- - first:
- 28: 2800008
- second: Painted steel_height
- - first:
- 33: 3300000
- second: metal_painted_steel/metal_painted_steel/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_painted_steel/metal_painted_steel/SphereCollider
- - first:
- 1001: 100100000
- second: metal_painted_steel
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Painted steel
- prototypeName: Painted steel
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -812895718602229137, guid: b7e648471e9dfc44490bd41973711541,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 4387638379454744182, guid: b7e648471e9dfc44490bd41973711541,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 5280895355680202213, guid: b7e648471e9dfc44490bd41973711541,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 1053975553097811288, guid: b7e648471e9dfc44490bd41973711541,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -5932748352949090903, guid: b7e648471e9dfc44490bd41973711541,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Painted steel_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Painted steel - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 1024
- textureHeight: 1024
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -4658142721435264040, guid: b7e648471e9dfc44490bd41973711541,
- type: 3}
- generatedTextures:
- - {fileID: 4387638379454744182, guid: b7e648471e9dfc44490bd41973711541, type: 3}
- - {fileID: -812895718602229137, guid: b7e648471e9dfc44490bd41973711541, type: 3}
- - {fileID: 5280895355680202213, guid: b7e648471e9dfc44490bd41973711541, type: 3}
- - {fileID: 1053975553097811288, guid: b7e648471e9dfc44490bd41973711541, type: 3}
- - {fileID: -5932748352949090903, guid: b7e648471e9dfc44490bd41973711541, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_panels_001.sbsar b/Assets/Materials/Substance/Metal/metal_panels_001.sbsar
deleted file mode 100644
index 2ee3b87ea..000000000
--- a/Assets/Materials/Substance/Metal/metal_panels_001.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e868f72fde8e3c55a2d8c097ebb39c05157670897d14eeb86932021feec16158
-size 11295
diff --git a/Assets/Materials/Substance/Metal/metal_panels_001.sbsar.meta b/Assets/Materials/Substance/Metal/metal_panels_001.sbsar.meta
deleted file mode 100644
index a423b3b51..000000000
--- a/Assets/Materials/Substance/Metal/metal_panels_001.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 7363fcc4a3c41a349b29de7ec34555be
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_panels_001/metal_panels_001
- - first:
- 4: 400000
- second: metal_panels_001/metal_panels_001/Transform
- - first:
- 21: 2100000
- second: mat.Metal Panels 001
- - first:
- 23: 2300000
- second: metal_panels_001/metal_panels_001/MeshRenderer
- - first:
- 28: 2800000
- second: Metal Panels 001_baseColor
- - first:
- 28: 2800002
- second: Metal Panels 001_normal
- - first:
- 28: 2800004
- second: Metal Panels 001_metallic
- - first:
- 28: 2800006
- second: Metal Panels 001_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal Panels 001_height
- - first:
- 33: 3300000
- second: metal_panels_001/metal_panels_001/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_panels_001/metal_panels_001/SphereCollider
- - first:
- 1001: 100100000
- second: metal_panels_001
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal Panels 001
- prototypeName: Metal Panels 001
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 2945532018097518028, guid: 7363fcc4a3c41a349b29de7ec34555be,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 6344665451385196243, guid: 7363fcc4a3c41a349b29de7ec34555be,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -103584793617860315, guid: 7363fcc4a3c41a349b29de7ec34555be,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -2941359408041138506, guid: 7363fcc4a3c41a349b29de7ec34555be,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 1361220934952870948, guid: 7363fcc4a3c41a349b29de7ec34555be,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal Panels 001_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 001 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 1523472303362493764, guid: 7363fcc4a3c41a349b29de7ec34555be,
- type: 3}
- generatedTextures:
- - {fileID: 6344665451385196243, guid: 7363fcc4a3c41a349b29de7ec34555be, type: 3}
- - {fileID: 2945532018097518028, guid: 7363fcc4a3c41a349b29de7ec34555be, type: 3}
- - {fileID: -103584793617860315, guid: 7363fcc4a3c41a349b29de7ec34555be, type: 3}
- - {fileID: -2941359408041138506, guid: 7363fcc4a3c41a349b29de7ec34555be, type: 3}
- - {fileID: 1361220934952870948, guid: 7363fcc4a3c41a349b29de7ec34555be, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_panels_002.sbsar b/Assets/Materials/Substance/Metal/metal_panels_002.sbsar
deleted file mode 100644
index 2cf3cd0b5..000000000
--- a/Assets/Materials/Substance/Metal/metal_panels_002.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b16e09a1b06ae6b857d9f9478af0838a31ba554a2455b9e65e9db43a125ce633
-size 7592
diff --git a/Assets/Materials/Substance/Metal/metal_panels_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_panels_002.sbsar.meta
deleted file mode 100644
index fe8ecd2b6..000000000
--- a/Assets/Materials/Substance/Metal/metal_panels_002.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 2e9a9dbacde66a446852af882f33e9e2
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_panels_002/metal_panels_002
- - first:
- 4: 400000
- second: metal_panels_002/metal_panels_002/Transform
- - first:
- 21: 2100000
- second: mat.Metal Panels 002
- - first:
- 23: 2300000
- second: metal_panels_002/metal_panels_002/MeshRenderer
- - first:
- 28: 2800000
- second: Metal Panels 002_baseColor
- - first:
- 28: 2800002
- second: Metal Panels 002_normal
- - first:
- 28: 2800004
- second: Metal Panels 002_metallic
- - first:
- 28: 2800006
- second: Metal Panels 002_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal Panels 002_height
- - first:
- 33: 3300000
- second: metal_panels_002/metal_panels_002/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_panels_002/metal_panels_002/SphereCollider
- - first:
- 1001: 100100000
- second: metal_panels_002
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal Panels 002
- prototypeName: Metal Panels 002
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -7157783387845257801, guid: 2e9a9dbacde66a446852af882f33e9e2,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 6030008930922367719, guid: 2e9a9dbacde66a446852af882f33e9e2,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -5177487458041023939, guid: 2e9a9dbacde66a446852af882f33e9e2,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -6221273311826804186, guid: 2e9a9dbacde66a446852af882f33e9e2,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -2755774738339798629, guid: 2e9a9dbacde66a446852af882f33e9e2,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal Panels 002_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Panels 002 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 3282252981698000714, guid: 2e9a9dbacde66a446852af882f33e9e2,
- type: 3}
- generatedTextures:
- - {fileID: 6030008930922367719, guid: 2e9a9dbacde66a446852af882f33e9e2, type: 3}
- - {fileID: -7157783387845257801, guid: 2e9a9dbacde66a446852af882f33e9e2, type: 3}
- - {fileID: -5177487458041023939, guid: 2e9a9dbacde66a446852af882f33e9e2, type: 3}
- - {fileID: -6221273311826804186, guid: 2e9a9dbacde66a446852af882f33e9e2, type: 3}
- - {fileID: -2755774738339798629, guid: 2e9a9dbacde66a446852af882f33e9e2, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_plate_001.sbsar b/Assets/Materials/Substance/Metal/metal_plate_001.sbsar
deleted file mode 100644
index 3d06effb9..000000000
--- a/Assets/Materials/Substance/Metal/metal_plate_001.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c9aea022bbc0138be51bb7b89314a569ad359390a0b8d1b6b2c717d317acd8b
-size 10171
diff --git a/Assets/Materials/Substance/Metal/metal_plate_001.sbsar.meta b/Assets/Materials/Substance/Metal/metal_plate_001.sbsar.meta
deleted file mode 100644
index 9a0327632..000000000
--- a/Assets/Materials/Substance/Metal/metal_plate_001.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 180b85899b4b1f848b348230339ce984
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_plate_001/metal_plate_001
- - first:
- 4: 400000
- second: metal_plate_001/metal_plate_001/Transform
- - first:
- 21: 2100000
- second: mat.Metal plate 001
- - first:
- 23: 2300000
- second: metal_plate_001/metal_plate_001/MeshRenderer
- - first:
- 28: 2800000
- second: Metal plate 001_baseColor
- - first:
- 28: 2800002
- second: Metal plate 001_normal
- - first:
- 28: 2800004
- second: Metal plate 001_metallic
- - first:
- 28: 2800006
- second: Metal plate 001_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal plate 001_height
- - first:
- 33: 3300000
- second: metal_plate_001/metal_plate_001/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_plate_001/metal_plate_001/SphereCollider
- - first:
- 1001: 100100000
- second: metal_plate_001
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal plate 001
- prototypeName: Metal plate 001
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 6805374924820727666, guid: 180b85899b4b1f848b348230339ce984,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 443512894100413061, guid: 180b85899b4b1f848b348230339ce984,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -3656363544911682969, guid: 180b85899b4b1f848b348230339ce984,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 6012193567810889268, guid: 180b85899b4b1f848b348230339ce984,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 1247009903862830065, guid: 180b85899b4b1f848b348230339ce984,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal plate 001_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 001 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -1468868417959000437, guid: 180b85899b4b1f848b348230339ce984,
- type: 3}
- generatedTextures:
- - {fileID: 443512894100413061, guid: 180b85899b4b1f848b348230339ce984, type: 3}
- - {fileID: 6805374924820727666, guid: 180b85899b4b1f848b348230339ce984, type: 3}
- - {fileID: -3656363544911682969, guid: 180b85899b4b1f848b348230339ce984, type: 3}
- - {fileID: 6012193567810889268, guid: 180b85899b4b1f848b348230339ce984, type: 3}
- - {fileID: 1247009903862830065, guid: 180b85899b4b1f848b348230339ce984, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_plate_004.sbsar b/Assets/Materials/Substance/Metal/metal_plate_004.sbsar
deleted file mode 100644
index dc0474e13..000000000
--- a/Assets/Materials/Substance/Metal/metal_plate_004.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65295627150c30fc70fe138aee16c2266bffdd0a5b1fbcbe7fe040a3d0309d39
-size 14216
diff --git a/Assets/Materials/Substance/Metal/metal_plate_004.sbsar.meta b/Assets/Materials/Substance/Metal/metal_plate_004.sbsar.meta
deleted file mode 100644
index fd4373932..000000000
--- a/Assets/Materials/Substance/Metal/metal_plate_004.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 0b5dfc86c0681a3459a57d197804191b
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_plate_004/metal_plate_004
- - first:
- 4: 400000
- second: metal_plate_004/metal_plate_004/Transform
- - first:
- 21: 2100000
- second: mat.Metal plate 004
- - first:
- 23: 2300000
- second: metal_plate_004/metal_plate_004/MeshRenderer
- - first:
- 28: 2800000
- second: Metal plate 004_baseColor
- - first:
- 28: 2800002
- second: Metal plate 004_normal
- - first:
- 28: 2800004
- second: Metal plate 004_metallic
- - first:
- 28: 2800006
- second: Metal plate 004_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal plate 004_height
- - first:
- 33: 3300000
- second: metal_plate_004/metal_plate_004/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_plate_004/metal_plate_004/SphereCollider
- - first:
- 1001: 100100000
- second: metal_plate_004
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal plate 004
- prototypeName: Metal plate 004
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -7484568915117973449, guid: 0b5dfc86c0681a3459a57d197804191b,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 1309396409266656355, guid: 0b5dfc86c0681a3459a57d197804191b,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -5781884682247363129, guid: 0b5dfc86c0681a3459a57d197804191b,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 5620992320681838871, guid: 0b5dfc86c0681a3459a57d197804191b,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 6570316561944570698, guid: 0b5dfc86c0681a3459a57d197804191b,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal plate 004_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 004 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -5894754650268316995, guid: 0b5dfc86c0681a3459a57d197804191b,
- type: 3}
- generatedTextures:
- - {fileID: 1309396409266656355, guid: 0b5dfc86c0681a3459a57d197804191b, type: 3}
- - {fileID: -7484568915117973449, guid: 0b5dfc86c0681a3459a57d197804191b, type: 3}
- - {fileID: -5781884682247363129, guid: 0b5dfc86c0681a3459a57d197804191b, type: 3}
- - {fileID: 5620992320681838871, guid: 0b5dfc86c0681a3459a57d197804191b, type: 3}
- - {fileID: 6570316561944570698, guid: 0b5dfc86c0681a3459a57d197804191b, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_plate_011.sbsar b/Assets/Materials/Substance/Metal/metal_plate_011.sbsar
deleted file mode 100644
index c1e0a3922..000000000
--- a/Assets/Materials/Substance/Metal/metal_plate_011.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:829bc422cbe5b984103972cd7cf36d207fe0a6b561a2619301dec3e684009784
-size 9674
diff --git a/Assets/Materials/Substance/Metal/metal_plate_011.sbsar.meta b/Assets/Materials/Substance/Metal/metal_plate_011.sbsar.meta
deleted file mode 100644
index 55c1cd50c..000000000
--- a/Assets/Materials/Substance/Metal/metal_plate_011.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: ca8f080ab60226e4097841eee2bfa8db
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_plate_011/metal_plate_011
- - first:
- 4: 400000
- second: metal_plate_011/metal_plate_011/Transform
- - first:
- 21: 2100000
- second: mat.Metal plate 011
- - first:
- 23: 2300000
- second: metal_plate_011/metal_plate_011/MeshRenderer
- - first:
- 28: 2800000
- second: Metal plate 011_baseColor
- - first:
- 28: 2800002
- second: Metal plate 011_normal
- - first:
- 28: 2800004
- second: Metal plate 011_metallic
- - first:
- 28: 2800006
- second: Metal plate 011_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal plate 011_height
- - first:
- 33: 3300000
- second: metal_plate_011/metal_plate_011/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_plate_011/metal_plate_011/SphereCollider
- - first:
- 1001: 100100000
- second: metal_plate_011
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal plate 011
- prototypeName: Metal plate 011
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 1206901763152500494, guid: ca8f080ab60226e4097841eee2bfa8db,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -562402163750398719, guid: ca8f080ab60226e4097841eee2bfa8db,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -8211546087015286653, guid: ca8f080ab60226e4097841eee2bfa8db,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 7355910353852850503, guid: ca8f080ab60226e4097841eee2bfa8db,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -2794334530799708578, guid: ca8f080ab60226e4097841eee2bfa8db,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal plate 011_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal plate 011 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 5028268363422298589, guid: ca8f080ab60226e4097841eee2bfa8db,
- type: 3}
- generatedTextures:
- - {fileID: -562402163750398719, guid: ca8f080ab60226e4097841eee2bfa8db, type: 3}
- - {fileID: 1206901763152500494, guid: ca8f080ab60226e4097841eee2bfa8db, type: 3}
- - {fileID: -8211546087015286653, guid: ca8f080ab60226e4097841eee2bfa8db, type: 3}
- - {fileID: 7355910353852850503, guid: ca8f080ab60226e4097841eee2bfa8db, type: 3}
- - {fileID: -2794334530799708578, guid: ca8f080ab60226e4097841eee2bfa8db, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_platinum.sbsar b/Assets/Materials/Substance/Metal/metal_platinum.sbsar
deleted file mode 100644
index ffaec19de..000000000
--- a/Assets/Materials/Substance/Metal/metal_platinum.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b880030baaf5ccc272c780265fc4b1570a55a63a8b804223ccbdc54a576b9be7
-size 5196
diff --git a/Assets/Materials/Substance/Metal/metal_platinum.sbsar.meta b/Assets/Materials/Substance/Metal/metal_platinum.sbsar.meta
deleted file mode 100644
index f39efaf0d..000000000
--- a/Assets/Materials/Substance/Metal/metal_platinum.sbsar.meta
+++ /dev/null
@@ -1,372 +0,0 @@
-fileFormatVersion: 2
-guid: 9458f33b8e7e51a42aa19686b9779d82
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_platinum/metal_platinum
- - first:
- 4: 400000
- second: metal_platinum/metal_platinum/Transform
- - first:
- 21: 2100000
- second: mat.Platinum
- - first:
- 23: 2300000
- second: metal_platinum/metal_platinum/MeshRenderer
- - first:
- 28: 2800000
- second: Platinum_baseColor
- - first:
- 28: 2800002
- second: Platinum_normal
- - first:
- 28: 2800004
- second: Platinum_metallic
- - first:
- 28: 2800006
- second: Platinum_ambientOcclusion
- - first:
- 28: 2800008
- second: Platinum_height
- - first:
- 33: 3300000
- second: metal_platinum/metal_platinum/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_platinum/metal_platinum/SphereCollider
- - first:
- 1001: 100100000
- second: metal_platinum
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Platinum
- prototypeName: Platinum
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 3498638986299907941, guid: 9458f33b8e7e51a42aa19686b9779d82,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -8172963137857357993, guid: 9458f33b8e7e51a42aa19686b9779d82,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -8040379993892829019, guid: 9458f33b8e7e51a42aa19686b9779d82,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 225164955126363719, guid: 9458f33b8e7e51a42aa19686b9779d82,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -130007606447889175, guid: 9458f33b8e7e51a42aa19686b9779d82,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Platinum_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Platinum - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 8636029498071112704, guid: 9458f33b8e7e51a42aa19686b9779d82,
- type: 3}
- generatedTextures:
- - {fileID: -8172963137857357993, guid: 9458f33b8e7e51a42aa19686b9779d82, type: 3}
- - {fileID: 3498638986299907941, guid: 9458f33b8e7e51a42aa19686b9779d82, type: 3}
- - {fileID: -8040379993892829019, guid: 9458f33b8e7e51a42aa19686b9779d82, type: 3}
- - {fileID: 225164955126363719, guid: 9458f33b8e7e51a42aa19686b9779d82, type: 3}
- - {fileID: -130007606447889175, guid: 9458f33b8e7e51a42aa19686b9779d82, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_roll_up.sbsar b/Assets/Materials/Substance/Metal/metal_roll_up.sbsar
deleted file mode 100644
index db99f183e..000000000
--- a/Assets/Materials/Substance/Metal/metal_roll_up.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a2036e21cdd2d392fdcb755d2faf982335fc4deaa8c7b913110db234fa04f3a
-size 11017
diff --git a/Assets/Materials/Substance/Metal/metal_roll_up.sbsar.meta b/Assets/Materials/Substance/Metal/metal_roll_up.sbsar.meta
deleted file mode 100644
index 3d93351e8..000000000
--- a/Assets/Materials/Substance/Metal/metal_roll_up.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 4e39297ae4fe9ee4b803c04eabb69da7
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_roll_up/metal_roll_up
- - first:
- 4: 400000
- second: metal_roll_up/metal_roll_up/Transform
- - first:
- 21: 2100000
- second: mat.Metal roll up
- - first:
- 23: 2300000
- second: metal_roll_up/metal_roll_up/MeshRenderer
- - first:
- 28: 2800000
- second: Metal roll up_baseColor
- - first:
- 28: 2800002
- second: Metal roll up_normal
- - first:
- 28: 2800004
- second: Metal roll up_metallic
- - first:
- 28: 2800006
- second: Metal roll up_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal roll up_height
- - first:
- 33: 3300000
- second: metal_roll_up/metal_roll_up/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_roll_up/metal_roll_up/SphereCollider
- - first:
- 1001: 100100000
- second: metal_roll_up
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal roll up
- prototypeName: Metal roll up
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 1258325809611119299, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -5250987364813910665, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -1897870436205287166, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 7199963334284863655, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 1153539711168243343, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal roll up_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal roll up - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 7440086527666654772, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
- type: 3}
- generatedTextures:
- - {fileID: -5250987364813910665, guid: 4e39297ae4fe9ee4b803c04eabb69da7, type: 3}
- - {fileID: 1258325809611119299, guid: 4e39297ae4fe9ee4b803c04eabb69da7, type: 3}
- - {fileID: -1897870436205287166, guid: 4e39297ae4fe9ee4b803c04eabb69da7, type: 3}
- - {fileID: 7199963334284863655, guid: 4e39297ae4fe9ee4b803c04eabb69da7, type: 3}
- - {fileID: 1153539711168243343, guid: 4e39297ae4fe9ee4b803c04eabb69da7, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_silver.sbsar b/Assets/Materials/Substance/Metal/metal_silver.sbsar
deleted file mode 100644
index 08b0ac146..000000000
--- a/Assets/Materials/Substance/Metal/metal_silver.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b18ce39a69d5e25641d53fcbe04f281c92ca7e01936e6a9b279476be8ff3255
-size 6898
diff --git a/Assets/Materials/Substance/Metal/metal_silver.sbsar.meta b/Assets/Materials/Substance/Metal/metal_silver.sbsar.meta
deleted file mode 100644
index 326559316..000000000
--- a/Assets/Materials/Substance/Metal/metal_silver.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 0be5fb1df83ac8e499a3f6a060041e49
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_silver/metal_silver
- - first:
- 4: 400000
- second: metal_silver/metal_silver/Transform
- - first:
- 21: 2100000
- second: mat.Silver
- - first:
- 23: 2300000
- second: metal_silver/metal_silver/MeshRenderer
- - first:
- 28: 2800000
- second: Silver_baseColor
- - first:
- 28: 2800002
- second: Silver_normal
- - first:
- 28: 2800004
- second: Silver_metallic
- - first:
- 28: 2800006
- second: Silver_ambientOcclusion
- - first:
- 28: 2800008
- second: Silver_height
- - first:
- 33: 3300000
- second: metal_silver/metal_silver/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_silver/metal_silver/SphereCollider
- - first:
- 1001: 100100000
- second: metal_silver
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Silver
- prototypeName: Silver
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 8947980237086559854, guid: 0be5fb1df83ac8e499a3f6a060041e49,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -1383037052668628532, guid: 0be5fb1df83ac8e499a3f6a060041e49,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 6429125567479694453, guid: 0be5fb1df83ac8e499a3f6a060041e49,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -9097439929179392311, guid: 0be5fb1df83ac8e499a3f6a060041e49,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 425190381137097012, guid: 0be5fb1df83ac8e499a3f6a060041e49,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Silver_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Silver - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 7490952440742008943, guid: 0be5fb1df83ac8e499a3f6a060041e49,
- type: 3}
- generatedTextures:
- - {fileID: -1383037052668628532, guid: 0be5fb1df83ac8e499a3f6a060041e49, type: 3}
- - {fileID: 8947980237086559854, guid: 0be5fb1df83ac8e499a3f6a060041e49, type: 3}
- - {fileID: 6429125567479694453, guid: 0be5fb1df83ac8e499a3f6a060041e49, type: 3}
- - {fileID: -9097439929179392311, guid: 0be5fb1df83ac8e499a3f6a060041e49, type: 3}
- - {fileID: 425190381137097012, guid: 0be5fb1df83ac8e499a3f6a060041e49, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_steel.sbsar b/Assets/Materials/Substance/Metal/metal_steel.sbsar
deleted file mode 100644
index 31ec34fd3..000000000
--- a/Assets/Materials/Substance/Metal/metal_steel.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d559edac51ad4c529c197d7c9a813fe8c2fa1bcb0963cd0f8bad8ab1403b3821
-size 10697
diff --git a/Assets/Materials/Substance/Metal/metal_steel.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel.sbsar.meta
deleted file mode 100644
index 172d4668b..000000000
--- a/Assets/Materials/Substance/Metal/metal_steel.sbsar.meta
+++ /dev/null
@@ -1,375 +0,0 @@
-fileFormatVersion: 2
-guid: cbc61995a46604441ab9de4f1c68e290
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_steel/metal_steel
- - first:
- 4: 400000
- second: metal_steel/metal_steel/Transform
- - first:
- 21: 2100000
- second: mat.Steel
- - first:
- 23: 2300000
- second: metal_steel/metal_steel/MeshRenderer
- - first:
- 28: 2800000
- second: Steel_baseColor
- - first:
- 28: 2800002
- second: Steel_normal
- - first:
- 28: 2800004
- second: Steel_metallic
- - first:
- 28: 2800006
- second: Steel_ambientOcclusion
- - first:
- 28: 2800008
- second: Steel_height
- - first:
- 33: 3300000
- second: metal_steel/metal_steel/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_steel/metal_steel/SphereCollider
- - first:
- 1001: 100100000
- second: metal_steel
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Steel
- prototypeName: Steel
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -3888315358723833787, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 4, y: 4}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 108215966750249586, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
- scale: {x: 4, y: 4}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 4793252353645218242, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -4384182597330533215, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 4600200897981803784, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Steel_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 512
- textureHeight: 512
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -3155047780354543793, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
- generatedTextures:
- - {fileID: 108215966750249586, guid: cbc61995a46604441ab9de4f1c68e290, type: 3}
- - {fileID: -3888315358723833787, guid: cbc61995a46604441ab9de4f1c68e290, type: 3}
- - {fileID: 4793252353645218242, guid: cbc61995a46604441ab9de4f1c68e290, type: 3}
- - {fileID: -4384182597330533215, guid: cbc61995a46604441ab9de4f1c68e290, type: 3}
- - {fileID: 4600200897981803784, guid: cbc61995a46604441ab9de4f1c68e290, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar b/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar
deleted file mode 100644
index 45c0b10b3..000000000
--- a/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf6b40453b42e050b2ce05478f1c1964d9489cdf02413f12b40f4ce1e49b4432
-size 12832
diff --git a/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar.meta
deleted file mode 100644
index d08c0d290..000000000
--- a/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar.meta
+++ /dev/null
@@ -1,370 +0,0 @@
-fileFormatVersion: 2
-guid: ea7457b9a4f0bcb43becaa33de541cbd
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_steel_brushed/metal_steel_brushed
- - first:
- 4: 400000
- second: metal_steel_brushed/metal_steel_brushed/Transform
- - first:
- 21: 2100000
- second: mat.Steel brushed
- - first:
- 23: 2300000
- second: metal_steel_brushed/metal_steel_brushed/MeshRenderer
- - first:
- 28: 2800000
- second: Steel brushed_baseColor
- - first:
- 28: 2800002
- second: Steel brushed_normal
- - first:
- 28: 2800004
- second: Steel brushed_metallic
- - first:
- 28: 2800006
- second: Steel brushed_ambientOcclusion
- - first:
- 28: 2800008
- second: Steel brushed_height
- - first:
- 33: 3300000
- second: metal_steel_brushed/metal_steel_brushed/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_steel_brushed/metal_steel_brushed/SphereCollider
- - first:
- 1001: 100100000
- second: metal_steel_brushed
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Steel brushed
- prototypeName: Steel brushed
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -4471413742775304797, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -4638397344074346932, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 5049811794194361025, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 1753668427856518731, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -3498708498072814504, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Steel brushed_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel brushed - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 7852708265981260911, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- generatedTextures:
- - {fileID: -4638397344074346932, guid: ea7457b9a4f0bcb43becaa33de541cbd, type: 3}
- - {fileID: -4471413742775304797, guid: ea7457b9a4f0bcb43becaa33de541cbd, type: 3}
- - {fileID: 5049811794194361025, guid: ea7457b9a4f0bcb43becaa33de541cbd, type: 3}
- - {fileID: 1753668427856518731, guid: ea7457b9a4f0bcb43becaa33de541cbd, type: 3}
- - {fileID: -3498708498072814504, guid: ea7457b9a4f0bcb43becaa33de541cbd, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar b/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar
deleted file mode 100644
index 6580295bb..000000000
--- a/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a9ae449451a55abd8466e8af67685a45d86fd39ea2070294dde7f2a07776bea5
-size 17275
diff --git a/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar.meta
deleted file mode 100644
index 1dd652796..000000000
--- a/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 092bdd8d243488141aeab5bb0d72429a
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_steel_bumped/metal_steel_bumped
- - first:
- 4: 400000
- second: metal_steel_bumped/metal_steel_bumped/Transform
- - first:
- 21: 2100000
- second: mat.Steel bumped
- - first:
- 23: 2300000
- second: metal_steel_bumped/metal_steel_bumped/MeshRenderer
- - first:
- 28: 2800000
- second: Steel bumped_baseColor
- - first:
- 28: 2800002
- second: Steel bumped_normal
- - first:
- 28: 2800004
- second: Steel bumped_metallic
- - first:
- 28: 2800006
- second: Steel bumped_ambientOcclusion
- - first:
- 28: 2800008
- second: Steel bumped_height
- - first:
- 33: 3300000
- second: metal_steel_bumped/metal_steel_bumped/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_steel_bumped/metal_steel_bumped/SphereCollider
- - first:
- 1001: 100100000
- second: metal_steel_bumped
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Steel bumped
- prototypeName: Steel bumped
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 3586080781697202320, guid: 092bdd8d243488141aeab5bb0d72429a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 86365302875955127, guid: 092bdd8d243488141aeab5bb0d72429a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 9208498935135840223, guid: 092bdd8d243488141aeab5bb0d72429a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 7740971908710523460, guid: 092bdd8d243488141aeab5bb0d72429a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 6493472383464308858, guid: 092bdd8d243488141aeab5bb0d72429a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Steel bumped_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel bumped - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -864409875390858066, guid: 092bdd8d243488141aeab5bb0d72429a,
- type: 3}
- generatedTextures:
- - {fileID: 86365302875955127, guid: 092bdd8d243488141aeab5bb0d72429a, type: 3}
- - {fileID: 3586080781697202320, guid: 092bdd8d243488141aeab5bb0d72429a, type: 3}
- - {fileID: 9208498935135840223, guid: 092bdd8d243488141aeab5bb0d72429a, type: 3}
- - {fileID: 7740971908710523460, guid: 092bdd8d243488141aeab5bb0d72429a, type: 3}
- - {fileID: 6493472383464308858, guid: 092bdd8d243488141aeab5bb0d72429a, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar b/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar
deleted file mode 100644
index 92bee293c..000000000
--- a/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54993a1aae47acf7e1aba24812f215e1787969016dd1f420899ab363342a7b6d
-size 9206
diff --git a/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar.meta
deleted file mode 100644
index a7cabf9ff..000000000
--- a/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: e7758cad28ae98f478940e55222419a6
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_steel_parkerized/metal_steel_parkerized
- - first:
- 4: 400000
- second: metal_steel_parkerized/metal_steel_parkerized/Transform
- - first:
- 21: 2100000
- second: mat.Steel parkerized
- - first:
- 23: 2300000
- second: metal_steel_parkerized/metal_steel_parkerized/MeshRenderer
- - first:
- 28: 2800000
- second: Steel parkerized_baseColor
- - first:
- 28: 2800002
- second: Steel parkerized_normal
- - first:
- 28: 2800004
- second: Steel parkerized_metallic
- - first:
- 28: 2800006
- second: Steel parkerized_ambientOcclusion
- - first:
- 28: 2800008
- second: Steel parkerized_height
- - first:
- 33: 3300000
- second: metal_steel_parkerized/metal_steel_parkerized/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_steel_parkerized/metal_steel_parkerized/SphereCollider
- - first:
- 1001: 100100000
- second: metal_steel_parkerized
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Steel parkerized
- prototypeName: Steel parkerized
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 885599758852769373, guid: e7758cad28ae98f478940e55222419a6,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -4474525002722929857, guid: e7758cad28ae98f478940e55222419a6,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -2334804936223627746, guid: e7758cad28ae98f478940e55222419a6,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: -8380876848358870972, guid: e7758cad28ae98f478940e55222419a6,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 172713863077875830, guid: e7758cad28ae98f478940e55222419a6,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Steel parkerized_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Steel parkerized - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -6026401407715332296, guid: e7758cad28ae98f478940e55222419a6,
- type: 3}
- generatedTextures:
- - {fileID: -4474525002722929857, guid: e7758cad28ae98f478940e55222419a6, type: 3}
- - {fileID: 885599758852769373, guid: e7758cad28ae98f478940e55222419a6, type: 3}
- - {fileID: -2334804936223627746, guid: e7758cad28ae98f478940e55222419a6, type: 3}
- - {fileID: -8380876848358870972, guid: e7758cad28ae98f478940e55222419a6, type: 3}
- - {fileID: 172713863077875830, guid: e7758cad28ae98f478940e55222419a6, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_titanium.sbsar b/Assets/Materials/Substance/Metal/metal_titanium.sbsar
deleted file mode 100644
index ede9cde4d..000000000
--- a/Assets/Materials/Substance/Metal/metal_titanium.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3aabfbcb813fef9ef20793d54c93bf5c37255573bb8ad043620f60041acd6d1
-size 5206
diff --git a/Assets/Materials/Substance/Metal/metal_titanium.sbsar.meta b/Assets/Materials/Substance/Metal/metal_titanium.sbsar.meta
deleted file mode 100644
index e4ece6915..000000000
--- a/Assets/Materials/Substance/Metal/metal_titanium.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: 58e16b7dbc1c31f4585e11544cdce127
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_titanium/metal_titanium
- - first:
- 4: 400000
- second: metal_titanium/metal_titanium/Transform
- - first:
- 21: 2100000
- second: mat.Titanium
- - first:
- 23: 2300000
- second: metal_titanium/metal_titanium/MeshRenderer
- - first:
- 28: 2800000
- second: Titanium_baseColor
- - first:
- 28: 2800002
- second: Titanium_normal
- - first:
- 28: 2800004
- second: Titanium_metallic
- - first:
- 28: 2800006
- second: Titanium_ambientOcclusion
- - first:
- 28: 2800008
- second: Titanium_height
- - first:
- 33: 3300000
- second: metal_titanium/metal_titanium/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_titanium/metal_titanium/SphereCollider
- - first:
- 1001: 100100000
- second: metal_titanium
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Titanium
- prototypeName: Titanium
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -5074057273227030627, guid: 58e16b7dbc1c31f4585e11544cdce127,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 3009319823116150993, guid: 58e16b7dbc1c31f4585e11544cdce127,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 3613456606582262254, guid: 58e16b7dbc1c31f4585e11544cdce127,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 7558371940554398246, guid: 58e16b7dbc1c31f4585e11544cdce127,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -3774795931012705877, guid: 58e16b7dbc1c31f4585e11544cdce127,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Titanium_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Titanium - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: 9178725544925813344, guid: 58e16b7dbc1c31f4585e11544cdce127,
- type: 3}
- generatedTextures:
- - {fileID: 3009319823116150993, guid: 58e16b7dbc1c31f4585e11544cdce127, type: 3}
- - {fileID: -5074057273227030627, guid: 58e16b7dbc1c31f4585e11544cdce127, type: 3}
- - {fileID: 3613456606582262254, guid: 58e16b7dbc1c31f4585e11544cdce127, type: 3}
- - {fileID: 7558371940554398246, guid: 58e16b7dbc1c31f4585e11544cdce127, type: 3}
- - {fileID: -3774795931012705877, guid: 58e16b7dbc1c31f4585e11544cdce127, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_used.sbsar b/Assets/Materials/Substance/Metal/metal_used.sbsar
deleted file mode 100644
index 5a8b87d9c..000000000
--- a/Assets/Materials/Substance/Metal/metal_used.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:03b72a9708206dd2c10aba185b507def52bbbcb713666711ed5d67926fbedd68
-size 14332
diff --git a/Assets/Materials/Substance/Metal/metal_used.sbsar.meta b/Assets/Materials/Substance/Metal/metal_used.sbsar.meta
deleted file mode 100644
index 37fcc6a20..000000000
--- a/Assets/Materials/Substance/Metal/metal_used.sbsar.meta
+++ /dev/null
@@ -1,371 +0,0 @@
-fileFormatVersion: 2
-guid: 130f566ffa0b2424fbb47de2194c136a
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_used/metal_used
- - first:
- 4: 400000
- second: metal_used/metal_used/Transform
- - first:
- 21: 2100000
- second: mat.Metal used
- - first:
- 23: 2300000
- second: metal_used/metal_used/MeshRenderer
- - first:
- 28: 2800000
- second: Metal used_baseColor
- - first:
- 28: 2800002
- second: Metal used_normal
- - first:
- 28: 2800004
- second: Metal used_metallic
- - first:
- 28: 2800006
- second: Metal used_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal used_height
- - first:
- 33: 3300000
- second: metal_used/metal_used/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_used/metal_used/SphereCollider
- - first:
- 1001: 100100000
- second: metal_used
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal used
- prototypeName: Metal used
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 8398852885706109728, guid: 130f566ffa0b2424fbb47de2194c136a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 8357651109123355072, guid: 130f566ffa0b2424fbb47de2194c136a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -435054815742279573, guid: 130f566ffa0b2424fbb47de2194c136a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 6248133906606842143, guid: 130f566ffa0b2424fbb47de2194c136a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 2780512161145013460, guid: 130f566ffa0b2424fbb47de2194c136a,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal used_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal used - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 512
- textureHeight: 512
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -890370705972978167, guid: 130f566ffa0b2424fbb47de2194c136a,
- type: 3}
- generatedTextures:
- - {fileID: 8357651109123355072, guid: 130f566ffa0b2424fbb47de2194c136a, type: 3}
- - {fileID: 8398852885706109728, guid: 130f566ffa0b2424fbb47de2194c136a, type: 3}
- - {fileID: -435054815742279573, guid: 130f566ffa0b2424fbb47de2194c136a, type: 3}
- - {fileID: 6248133906606842143, guid: 130f566ffa0b2424fbb47de2194c136a, type: 3}
- - {fileID: 2780512161145013460, guid: 130f566ffa0b2424fbb47de2194c136a, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_weapon.sbsar b/Assets/Materials/Substance/Metal/metal_weapon.sbsar
deleted file mode 100644
index d96236940..000000000
--- a/Assets/Materials/Substance/Metal/metal_weapon.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e9033843201f75f1b86df82b69fd89ee6b9aa317df18f9105d0f8904d56be8f
-size 10547
diff --git a/Assets/Materials/Substance/Metal/metal_weapon.sbsar.meta b/Assets/Materials/Substance/Metal/metal_weapon.sbsar.meta
deleted file mode 100644
index 05d1fcf4b..000000000
--- a/Assets/Materials/Substance/Metal/metal_weapon.sbsar.meta
+++ /dev/null
@@ -1,373 +0,0 @@
-fileFormatVersion: 2
-guid: 07f679eadba9fb14abac26b1e165f7d5
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_weapon/metal_weapon
- - first:
- 4: 400000
- second: metal_weapon/metal_weapon/Transform
- - first:
- 21: 2100000
- second: mat.Metal Weapon
- - first:
- 23: 2300000
- second: metal_weapon/metal_weapon/MeshRenderer
- - first:
- 28: 2800000
- second: Metal Weapon_baseColor
- - first:
- 28: 2800002
- second: Metal Weapon_normal
- - first:
- 28: 2800004
- second: Metal Weapon_metallic
- - first:
- 28: 2800006
- second: Metal Weapon_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal Weapon_height
- - first:
- 33: 3300000
- second: metal_weapon/metal_weapon/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_weapon/metal_weapon/SphereCollider
- - first:
- 1001: 100100000
- second: metal_weapon
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal Weapon
- prototypeName: Metal Weapon
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: -6635831357954291190, guid: 07f679eadba9fb14abac26b1e165f7d5,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -6402586014670071135, guid: 07f679eadba9fb14abac26b1e165f7d5,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: 854616604008364032, guid: 07f679eadba9fb14abac26b1e165f7d5,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 4606406952830974004, guid: 07f679eadba9fb14abac26b1e165f7d5,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -5822151887330517421, guid: 07f679eadba9fb14abac26b1e165f7d5,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal Weapon_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal Weapon - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -6659110875122461561, guid: 07f679eadba9fb14abac26b1e165f7d5,
- type: 3}
- generatedTextures:
- - {fileID: -6402586014670071135, guid: 07f679eadba9fb14abac26b1e165f7d5, type: 3}
- - {fileID: -6635831357954291190, guid: 07f679eadba9fb14abac26b1e165f7d5, type: 3}
- - {fileID: 854616604008364032, guid: 07f679eadba9fb14abac26b1e165f7d5, type: 3}
- - {fileID: 4606406952830974004, guid: 07f679eadba9fb14abac26b1e165f7d5, type: 3}
- - {fileID: -5822151887330517421, guid: 07f679eadba9fb14abac26b1e165f7d5, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_woven.sbsar b/Assets/Materials/Substance/Metal/metal_woven.sbsar
deleted file mode 100644
index 576f8c4a5..000000000
--- a/Assets/Materials/Substance/Metal/metal_woven.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c50e25516df1c3d2cb879d4e3e78491462296d92f05ac5774b6aa1290a777ee
-size 9445
diff --git a/Assets/Materials/Substance/Metal/metal_woven.sbsar.meta b/Assets/Materials/Substance/Metal/metal_woven.sbsar.meta
deleted file mode 100644
index 27d8bfafe..000000000
--- a/Assets/Materials/Substance/Metal/metal_woven.sbsar.meta
+++ /dev/null
@@ -1,369 +0,0 @@
-fileFormatVersion: 2
-guid: deb7e15e5f95294498d18869d9f11302
-ScriptedImporter:
- internalIDToNameTable:
- - first:
- 1: 100000
- second: metal_woven/metal_woven
- - first:
- 4: 400000
- second: metal_woven/metal_woven/Transform
- - first:
- 21: 2100000
- second: mat.Metal woven
- - first:
- 23: 2300000
- second: metal_woven/metal_woven/MeshRenderer
- - first:
- 28: 2800000
- second: Metal woven_baseColor
- - first:
- 28: 2800002
- second: Metal woven_normal
- - first:
- 28: 2800004
- second: Metal woven_metallic
- - first:
- 28: 2800006
- second: Metal woven_ambientOcclusion
- - first:
- 28: 2800008
- second: Metal woven_height
- - first:
- 33: 3300000
- second: metal_woven/metal_woven/MeshFilter
- - first:
- 114: 11400000
- second: sbsar
- - first:
- 114: 11400002
- second: graph0
- - first:
- 135: 13500000
- second: metal_woven/metal_woven/SphereCollider
- - first:
- 1001: 100100000
- second: metal_woven
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Metal woven
- prototypeName: Metal woven
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 549858149917880910, guid: deb7e15e5f95294498d18869d9f11302,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -5021036940690714266, guid: deb7e15e5f95294498d18869d9f11302,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -4741193760961545063, guid: deb7e15e5f95294498d18869d9f11302,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 4441773978818050154, guid: deb7e15e5f95294498d18869d9f11302,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: -8782013540898460330, guid: deb7e15e5f95294498d18869d9f11302,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Metal woven_glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven_diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven_baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven_normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven_specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven_roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven_metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven_ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven_height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Metal woven - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 256
- textureHeight: 256
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -1778075352807424672, guid: deb7e15e5f95294498d18869d9f11302,
- type: 3}
- generatedTextures:
- - {fileID: -5021036940690714266, guid: deb7e15e5f95294498d18869d9f11302, type: 3}
- - {fileID: 549858149917880910, guid: deb7e15e5f95294498d18869d9f11302, type: 3}
- - {fileID: -4741193760961545063, guid: deb7e15e5f95294498d18869d9f11302, type: 3}
- - {fileID: 4441773978818050154, guid: deb7e15e5f95294498d18869d9f11302, type: 3}
- - {fileID: -8782013540898460330, guid: deb7e15e5f95294498d18869d9f11302, type: 3}
diff --git a/Assets/Materials/Substance/Metal/snatched_metal.sbsar b/Assets/Materials/Substance/Metal/snatched_metal.sbsar
deleted file mode 100644
index 35980ce5c..000000000
--- a/Assets/Materials/Substance/Metal/snatched_metal.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:556e67022b660530d0afc8296e37706b09e9ef08db46b5421edbd80f0c8993f2
-size 28573
diff --git a/Assets/Materials/Substance/Metal/snatched_metal.sbsar.meta b/Assets/Materials/Substance/Metal/snatched_metal.sbsar.meta
deleted file mode 100644
index 3da7ab6e7..000000000
--- a/Assets/Materials/Substance/Metal/snatched_metal.sbsar.meta
+++ /dev/null
@@ -1,311 +0,0 @@
-fileFormatVersion: 2
-guid: 9aa51bbe4dd46874a906608c34a739e4
-ScriptedImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Snatched Metal
- prototypeName: Snatched Metal
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 8651868829797956950, guid: 9aa51bbe4dd46874a906608c34a739e4,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: 3043754869544600785, guid: 9aa51bbe4dd46874a906608c34a739e4,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -8730703347107057792, guid: 9aa51bbe4dd46874a906608c34a739e4,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 8639218750153593357, guid: 9aa51bbe4dd46874a906608c34a739e4,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 8363912540366899318, guid: 9aa51bbe4dd46874a906608c34a739e4,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambientocclusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: opacity
- identifier: opacity
- usageName: opacity
- channelStr: opacity
- label: Opacity
- usage: 2
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: opacity
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: opacity
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: opacity
- components:
- - sourceName: opacity
- from: 0
- to: 3
- textureParameters:
- - textureName: Snatched Metal - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Snatched Metal - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Snatched Metal - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Snatched Metal - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Snatched Metal - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Snatched Metal - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Snatched Metal - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Snatched Metal - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Snatched Metal - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Snatched Metal - opacity
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 512
- textureHeight: 512
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -2363654054484809406, guid: 9aa51bbe4dd46874a906608c34a739e4,
- type: 3}
- generatedTextures:
- - {fileID: 3043754869544600785, guid: 9aa51bbe4dd46874a906608c34a739e4, type: 3}
- - {fileID: 8651868829797956950, guid: 9aa51bbe4dd46874a906608c34a739e4, type: 3}
- - {fileID: -8730703347107057792, guid: 9aa51bbe4dd46874a906608c34a739e4, type: 3}
- - {fileID: 8363912540366899318, guid: 9aa51bbe4dd46874a906608c34a739e4, type: 3}
- - {fileID: 8639218750153593357, guid: 9aa51bbe4dd46874a906608c34a739e4, type: 3}
diff --git a/Assets/Materials/Substance/marble_002.sbsar b/Assets/Materials/Substance/marble_002.sbsar
deleted file mode 100644
index 728270967..000000000
--- a/Assets/Materials/Substance/marble_002.sbsar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2859e24557bccbe309d8946052849b828cabd34b8e45b933faee212eeffd462e
-size 8113
diff --git a/Assets/Materials/Substance/marble_002.sbsar.meta b/Assets/Materials/Substance/marble_002.sbsar.meta
deleted file mode 100644
index 624e0d1a6..000000000
--- a/Assets/Materials/Substance/marble_002.sbsar.meta
+++ /dev/null
@@ -1,296 +0,0 @@
-fileFormatVersion: 2
-guid: ef9a54b8dacea9f44be70da43472f701
-ScriptedImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 2
- userData:
- assetBundleName:
- assetBundleVariant:
- script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
- version: 29
- projectContext: 0
- mGraphInstanceData:
- - graphLabel: Marble 002
- prototypeName: Marble 002
- graphDescIndex: 0
- generateAllOutputs: 0
- generateMipMaps: 1
- preset: " \n \n
- \n \n \n \n"
- shaderName: Standard
- materialProperties:
- shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- shaderKeywords:
- lightmapFlags: 4
- enableInstancingVariants: 0
- doubleSidedGI: 0
- customRenderQueue: -1
- texEnvs:
- - name: _BumpMap
- texture: {fileID: 5777664804669422655, guid: ef9a54b8dacea9f44be70da43472f701,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailAlbedoMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailMask
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _DetailNormalMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _EmissionMap
- texture: {instanceID: 0}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MainTex
- texture: {fileID: -5564000130503291907, guid: ef9a54b8dacea9f44be70da43472f701,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _MetallicGlossMap
- texture: {fileID: -3258750942226492355, guid: ef9a54b8dacea9f44be70da43472f701,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _OcclusionMap
- texture: {fileID: 4985089394248351555, guid: ef9a54b8dacea9f44be70da43472f701,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- - name: _ParallaxMap
- texture: {fileID: 7116303992264550, guid: ef9a54b8dacea9f44be70da43472f701,
- type: 3}
- scale: {x: 1, y: 1}
- offset: {x: 0, y: 0}
- floats:
- - name: _BumpScale
- float: 1
- - name: _Cutoff
- float: 0.5
- - name: _DetailNormalMapScale
- float: 1
- - name: _DstBlend
- float: 0
- - name: _GlossMapScale
- float: 1
- - name: _Glossiness
- float: 0.5
- - name: _GlossyReflections
- float: 1
- - name: _Metallic
- float: 0
- - name: _Mode
- float: 0
- - name: _OcclusionStrength
- float: 1
- - name: _Parallax
- float: 0.02
- - name: _SmoothnessTextureChannel
- float: 0
- - name: _SpecularHighlights
- float: 1
- - name: _SrcBlend
- float: 1
- - name: _UVSec
- float: 0
- - name: _ZWrite
- float: 1
- colors:
- - name: _Color
- color: {r: 1, g: 1, b: 1, a: 1}
- - name: _EmissionColor
- color: {r: 0, g: 0, b: 0, a: 1}
- outputDescList:
- - outputName: diffuse
- identifier: diffuse
- usageName: diffuse
- channelStr: diffuse
- label: Diffuse
- usage: 0
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: baseColor
- identifier: basecolor
- usageName: baseColor
- channelStr: baseColor
- label: Base Color
- usage: 1
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: normal
- identifier: normal
- usageName: normal
- channelStr: normal
- label: Normal
- usage: 7
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: specular
- identifier: specular
- usageName: specular
- channelStr: specular
- label: Specular
- usage: 11
- bImage: 1
- bNumerical: 0
- bLinear: 0
- - outputName: glossiness
- identifier: glossiness
- usageName: glossiness
- channelStr: glossiness
- label: Glossiness
- usage: 14
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: roughness
- identifier: roughness
- usageName: roughness
- channelStr: roughness
- label: Roughness
- usage: 15
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: metallic
- identifier: metallic
- usageName: metallic
- channelStr: metallic
- label: Metallic
- usage: 34
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: ambientOcclusion
- identifier: ambient_occlusion
- usageName: ambientOcclusion
- channelStr: ambientOcclusion
- label: Ambient Occlusion
- usage: 5
- bImage: 1
- bNumerical: 0
- bLinear: 1
- - outputName: height
- identifier: height
- usageName: height
- channelStr: height
- label: Height
- usage: 9
- bImage: 1
- bNumerical: 0
- bLinear: 1
- texturePackingList:
- - targetName: diffuse
- components:
- - sourceName: diffuse
- from: 0
- to: 3
- - targetName: baseColor
- components:
- - sourceName: baseColor
- from: 0
- to: 3
- - targetName: normal
- components:
- - sourceName: normal
- from: 0
- to: 3
- - targetName: specular
- components:
- - sourceName: specular
- from: 0
- to: 3
- - targetName: glossiness
- components:
- - sourceName: glossiness
- from: 0
- to: 3
- - targetName: roughness
- components:
- - sourceName: roughness
- from: 0
- to: 3
- - targetName: metallic
- components:
- - sourceName: smoothness
- from: 0
- to: 3
- - targetName: ambientOcclusion
- components:
- - sourceName: ambientOcclusion
- from: 0
- to: 3
- - targetName: height
- components:
- - sourceName: height
- from: 0
- to: 3
- textureParameters:
- - textureName: Marble 002 - diffuse
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Marble 002 - baseColor
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Marble 002 - normal
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Marble 002 - specular
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Marble 002 - glossiness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Marble 002 - roughness
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Marble 002 - metallic
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Marble 002 - ambientOcclusion
- wrapMode: 0
- filterMode: 1
- aniso: 1
- - textureName: Marble 002 - height
- wrapMode: 0
- filterMode: 1
- aniso: 1
- colorSpaceList: []
- inputTextureMap: []
- targetSettingList:
- - label: Default
- bOverride: 0
- bLockRatio: 1
- textureWidth: 4096
- textureHeight: 4096
- textureFormatMode: 0
- normalCompressed: 0
- bGenerateOnLoad: 1
- material: {fileID: -4681939019719023292, guid: ef9a54b8dacea9f44be70da43472f701,
- type: 3}
- generatedTextures:
- - {fileID: -5564000130503291907, guid: ef9a54b8dacea9f44be70da43472f701, type: 3}
- - {fileID: 5777664804669422655, guid: ef9a54b8dacea9f44be70da43472f701, type: 3}
- - {fileID: -3258750942226492355, guid: ef9a54b8dacea9f44be70da43472f701, type: 3}
- - {fileID: 4985089394248351555, guid: ef9a54b8dacea9f44be70da43472f701, type: 3}
- - {fileID: 7116303992264550, guid: ef9a54b8dacea9f44be70da43472f701, type: 3}
diff --git a/Assets/Materials/Thrusters.mat b/Assets/Materials/Thrusters.mat
deleted file mode 100644
index f9b21ae83..000000000
--- a/Assets/Materials/Thrusters.mat
+++ /dev/null
@@ -1,87 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
- serializedVersion: 6
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Thrusters
- m_Shader: {fileID: 4800000, guid: d69ef48273708ef4680762f5cdcfc860, type: 3}
- m_ShaderKeywords:
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _BumpMap:
- m_Texture: {fileID: -812895718602229137, guid: b7e648471e9dfc44490bd41973711541,
- type: 3}
- m_Scale: {x: 8, y: 8}
- m_Offset: {x: 0, y: 0}
- - _DetailAlbedoMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailMask:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailNormalMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _EmissionMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MainTex:
- m_Texture: {fileID: -6057190860509678031, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
- m_Scale: {x: 8, y: 8}
- m_Offset: {x: 0, y: 0}
- - _MetallicGlossMap:
- m_Texture: {fileID: -894214952450941493, guid: 2b42584452fe0cc4fa4e8a115230b156,
- type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _OcclusionMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _ParallaxMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Floats:
- - _BumpPower: 2
- - _BumpScale: 1
- - _Cutoff: 0.5
- - _DetailNormalMapScale: 1
- - _DstBlend: 0
- - _Emission: 0
- - _EmissionFresnel: 1
- - _EmissionRoughnessFresnelPower: 0.5
- - _GlossMapScale: 1
- - _Glossiness: 1
- - _GlossyReflections: 1
- - _Metallic: 0
- - _Mode: 0
- - _OcclusionStrength: 1
- - _Parallax: 0.02
- - _ReverseRim: 0
- - _Rotation: 0
- - _SmoothnessTextureChannel: 0
- - _SpecularHighlights: 1
- - _SrcBlend: 1
- - _UVSec: 0
- - _ZWrite: 1
- m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- - _EmissionColor: {r: 0.7112653, g: 0.4292453, b: 1, a: 1}
- m_BuildTextureStacks: []
diff --git a/Assets/Materials/Thrusters.mat.meta b/Assets/Materials/Thrusters.mat.meta
deleted file mode 100644
index 5fd79a1be..000000000
--- a/Assets/Materials/Thrusters.mat.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 616adaf59c64a444f8249cc7cf13c527
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Models/Discobolus/Discobolus Bronze.mat.meta b/Assets/Models/Discobolus/Discobolus Bronze.mat.meta
deleted file mode 100644
index 4ca3a3b46..000000000
--- a/Assets/Models/Discobolus/Discobolus Bronze.mat.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 45f1ac126982c314a8471da3d264210b
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 2100000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Models/Discobolus/Discobolus Marble.mat b/Assets/Models/Discobolus/Discobolus Marble.mat
index 3c862a22c..f4331ed09 100644
--- a/Assets/Models/Discobolus/Discobolus Marble.mat
+++ b/Assets/Models/Discobolus/Discobolus Marble.mat
@@ -40,13 +40,11 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: -5564000130503291907, guid: ef9a54b8dacea9f44be70da43472f701,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
- m_Texture: {fileID: -3258750942226492355, guid: ef9a54b8dacea9f44be70da43472f701,
- type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
@@ -63,7 +61,7 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- - _Glossiness: 0.5
+ - _Glossiness: 0.45
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
@@ -75,6 +73,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0.7, g: 0.654348, b: 0.525, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Models/Zenith_Blender.fbx.meta b/Assets/Models/Zenith_Blender.fbx.meta
index 2094752dc..6f719ce83 100644
--- a/Assets/Models/Zenith_Blender.fbx.meta
+++ b/Assets/Models/Zenith_Blender.fbx.meta
@@ -8,8 +8,7 @@ ModelImporter:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Black
- second: {fileID: 3720744386649352057, guid: 1c858fec5b74c7c46b1712494192b6b5,
- type: 3}
+ second: {fileID: 2100000, guid: b9f65861b71050b4a84fe0007bedbba9, type: 2}
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
@@ -19,8 +18,7 @@ ModelImporter:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: White
- second: {fileID: -741235592913766832, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
+ second: {fileID: 2100000, guid: 39af4e3978df92f40a55e2a114aa242a, type: 2}
materials:
materialImportMode: 1
materialName: 0
diff --git a/Assets/Plugins/GPU Noise/ClassicNoise2D.cginc b/Assets/Plugins/GPU Noise/ClassicNoise2D.cginc
deleted file mode 100644
index ef6b2e96c..000000000
--- a/Assets/Plugins/GPU Noise/ClassicNoise2D.cginc
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Noise Shader Library for Unity - https://github.com/keijiro/NoiseShader
-//
-// Original work (webgl-noise) Copyright (C) 2011 Stefan Gustavson
-// Translation and modification was made by Keijiro Takahashi.
-//
-// This shader is based on the webgl-noise GLSL shader. For further details
-// of the original shader, please see the following description from the
-// original source code.
-//
-
-//
-// GLSL textureless classic 2D noise "cnoise",
-// with an RSL-style periodic variant "pnoise".
-// Author: Stefan Gustavson (stefan.gustavson@liu.se)
-// Version: 2011-08-22
-//
-// Many thanks to Ian McEwan of Ashima Arts for the
-// ideas for permutation and gradient selection.
-//
-// Copyright (c) 2011 Stefan Gustavson. All rights reserved.
-// Distributed under the MIT license. See LICENSE file.
-// https://github.com/ashima/webgl-noise
-//
-
-float4 mod(float4 x, float4 y)
-{
- return x - y * floor(x / y);
-}
-
-float4 mod289(float4 x)
-{
- return x - floor(x / 289.0) * 289.0;
-}
-
-float4 permute(float4 x)
-{
- return mod289(((x*34.0)+1.0)*x);
-}
-
-float4 taylorInvSqrt(float4 r)
-{
- return (float4)1.79284291400159 - r * 0.85373472095314;
-}
-
-float2 fade(float2 t) {
- return t*t*t*(t*(t*6.0-15.0)+10.0);
-}
-
-// Classic Perlin noise
-float cnoise(float2 P)
-{
- float4 Pi = floor(P.xyxy) + float4(0.0, 0.0, 1.0, 1.0);
- float4 Pf = frac (P.xyxy) - float4(0.0, 0.0, 1.0, 1.0);
- Pi = mod289(Pi); // To avoid truncation effects in permutation
- float4 ix = Pi.xzxz;
- float4 iy = Pi.yyww;
- float4 fx = Pf.xzxz;
- float4 fy = Pf.yyww;
-
- float4 i = permute(permute(ix) + iy);
-
- float4 gx = frac(i / 41.0) * 2.0 - 1.0 ;
- float4 gy = abs(gx) - 0.5 ;
- float4 tx = floor(gx + 0.5);
- gx = gx - tx;
-
- float2 g00 = float2(gx.x,gy.x);
- float2 g10 = float2(gx.y,gy.y);
- float2 g01 = float2(gx.z,gy.z);
- float2 g11 = float2(gx.w,gy.w);
-
- float4 norm = taylorInvSqrt(float4(dot(g00, g00), dot(g01, g01), dot(g10, g10), dot(g11, g11)));
- g00 *= norm.x;
- g01 *= norm.y;
- g10 *= norm.z;
- g11 *= norm.w;
-
- float n00 = dot(g00, float2(fx.x, fy.x));
- float n10 = dot(g10, float2(fx.y, fy.y));
- float n01 = dot(g01, float2(fx.z, fy.z));
- float n11 = dot(g11, float2(fx.w, fy.w));
-
- float2 fade_xy = fade(Pf.xy);
- float2 n_x = lerp(float2(n00, n01), float2(n10, n11), fade_xy.x);
- float n_xy = lerp(n_x.x, n_x.y, fade_xy.y);
- return 2.3 * n_xy;
-}
-
-// Classic Perlin noise, periodic variant
-float pnoise(float2 P, float2 rep)
-{
- float4 Pi = floor(P.xyxy) + float4(0.0, 0.0, 1.0, 1.0);
- float4 Pf = frac (P.xyxy) - float4(0.0, 0.0, 1.0, 1.0);
- Pi = mod(Pi, rep.xyxy); // To create noise with explicit period
- Pi = mod289(Pi); // To avoid truncation effects in permutation
- float4 ix = Pi.xzxz;
- float4 iy = Pi.yyww;
- float4 fx = Pf.xzxz;
- float4 fy = Pf.yyww;
-
- float4 i = permute(permute(ix) + iy);
-
- float4 gx = frac(i / 41.0) * 2.0 - 1.0 ;
- float4 gy = abs(gx) - 0.5 ;
- float4 tx = floor(gx + 0.5);
- gx = gx - tx;
-
- float2 g00 = float2(gx.x,gy.x);
- float2 g10 = float2(gx.y,gy.y);
- float2 g01 = float2(gx.z,gy.z);
- float2 g11 = float2(gx.w,gy.w);
-
- float4 norm = taylorInvSqrt(float4(dot(g00, g00), dot(g01, g01), dot(g10, g10), dot(g11, g11)));
- g00 *= norm.x;
- g01 *= norm.y;
- g10 *= norm.z;
- g11 *= norm.w;
-
- float n00 = dot(g00, float2(fx.x, fy.x));
- float n10 = dot(g10, float2(fx.y, fy.y));
- float n01 = dot(g01, float2(fx.z, fy.z));
- float n11 = dot(g11, float2(fx.w, fy.w));
-
- float2 fade_xy = fade(Pf.xy);
- float2 n_x = lerp(float2(n00, n01), float2(n10, n11), fade_xy.x);
- float n_xy = lerp(n_x.x, n_x.y, fade_xy.y);
- return 2.3 * n_xy;
-}
diff --git a/Assets/Plugins/GPU Noise/ClassicNoise2D.cginc.meta b/Assets/Plugins/GPU Noise/ClassicNoise2D.cginc.meta
deleted file mode 100644
index ff437e70a..000000000
--- a/Assets/Plugins/GPU Noise/ClassicNoise2D.cginc.meta
+++ /dev/null
@@ -1,5 +0,0 @@
-fileFormatVersion: 2
-guid: e1b0b5fd6a4e44923b40d856017562e1
-ShaderImporter:
- defaultTextures: []
- userData:
diff --git a/Assets/Plugins/GPU Noise/ClassicNoise3D.cginc b/Assets/Plugins/GPU Noise/ClassicNoise3D.cginc
deleted file mode 100644
index 738f6d12a..000000000
--- a/Assets/Plugins/GPU Noise/ClassicNoise3D.cginc
+++ /dev/null
@@ -1,194 +0,0 @@
-//
-// Noise Shader Library for Unity - https://github.com/keijiro/NoiseShader
-//
-// Original work (webgl-noise) Copyright (C) 2011 Stefan Gustavson
-// Translation and modification was made by Keijiro Takahashi.
-//
-// This shader is based on the webgl-noise GLSL shader. For further details
-// of the original shader, please see the following description from the
-// original source code.
-//
-
-//
-// GLSL textureless classic 3D noise "cnoise",
-// with an RSL-style periodic variant "pnoise".
-// Author: Stefan Gustavson (stefan.gustavson@liu.se)
-// Version: 2011-10-11
-//
-// Many thanks to Ian McEwan of Ashima Arts for the
-// ideas for permutation and gradient selection.
-//
-// Copyright (c) 2011 Stefan Gustavson. All rights reserved.
-// Distributed under the MIT license. See LICENSE file.
-// https://github.com/ashima/webgl-noise
-//
-
-float3 mod(float3 x, float3 y)
-{
- return x - y * floor(x / y);
-}
-
-float3 mod289(float3 x)
-{
- return x - floor(x / 289.0) * 289.0;
-}
-
-float4 mod289(float4 x)
-{
- return x - floor(x / 289.0) * 289.0;
-}
-
-float4 permute(float4 x)
-{
- return mod289(((x*34.0)+1.0)*x);
-}
-
-float4 taylorInvSqrt(float4 r)
-{
- return (float4)1.79284291400159 - r * 0.85373472095314;
-}
-
-float3 fade(float3 t) {
- return t*t*t*(t*(t*6.0-15.0)+10.0);
-}
-
-// Classic Perlin noise
-float cnoise(float3 P)
-{
- float3 Pi0 = floor(P); // Integer part for indexing
- float3 Pi1 = Pi0 + (float3)1.0; // Integer part + 1
- Pi0 = mod289(Pi0);
- Pi1 = mod289(Pi1);
- float3 Pf0 = frac(P); // Fractional part for interpolation
- float3 Pf1 = Pf0 - (float3)1.0; // Fractional part - 1.0
- float4 ix = float4(Pi0.x, Pi1.x, Pi0.x, Pi1.x);
- float4 iy = float4(Pi0.y, Pi0.y, Pi1.y, Pi1.y);
- float4 iz0 = (float4)Pi0.z;
- float4 iz1 = (float4)Pi1.z;
-
- float4 ixy = permute(permute(ix) + iy);
- float4 ixy0 = permute(ixy + iz0);
- float4 ixy1 = permute(ixy + iz1);
-
- float4 gx0 = ixy0 / 7.0;
- float4 gy0 = frac(floor(gx0) / 7.0) - 0.5;
- gx0 = frac(gx0);
- float4 gz0 = (float4)0.5 - abs(gx0) - abs(gy0);
- float4 sz0 = step(gz0, (float4)0.0);
- gx0 -= sz0 * (step((float4)0.0, gx0) - 0.5);
- gy0 -= sz0 * (step((float4)0.0, gy0) - 0.5);
-
- float4 gx1 = ixy1 / 7.0;
- float4 gy1 = frac(floor(gx1) / 7.0) - 0.5;
- gx1 = frac(gx1);
- float4 gz1 = (float4)0.5 - abs(gx1) - abs(gy1);
- float4 sz1 = step(gz1, (float4)0.0);
- gx1 -= sz1 * (step((float4)0.0, gx1) - 0.5);
- gy1 -= sz1 * (step((float4)0.0, gy1) - 0.5);
-
- float3 g000 = float3(gx0.x,gy0.x,gz0.x);
- float3 g100 = float3(gx0.y,gy0.y,gz0.y);
- float3 g010 = float3(gx0.z,gy0.z,gz0.z);
- float3 g110 = float3(gx0.w,gy0.w,gz0.w);
- float3 g001 = float3(gx1.x,gy1.x,gz1.x);
- float3 g101 = float3(gx1.y,gy1.y,gz1.y);
- float3 g011 = float3(gx1.z,gy1.z,gz1.z);
- float3 g111 = float3(gx1.w,gy1.w,gz1.w);
-
- float4 norm0 = taylorInvSqrt(float4(dot(g000, g000), dot(g010, g010), dot(g100, g100), dot(g110, g110)));
- g000 *= norm0.x;
- g010 *= norm0.y;
- g100 *= norm0.z;
- g110 *= norm0.w;
-
- float4 norm1 = taylorInvSqrt(float4(dot(g001, g001), dot(g011, g011), dot(g101, g101), dot(g111, g111)));
- g001 *= norm1.x;
- g011 *= norm1.y;
- g101 *= norm1.z;
- g111 *= norm1.w;
-
- float n000 = dot(g000, Pf0);
- float n100 = dot(g100, float3(Pf1.x, Pf0.y, Pf0.z));
- float n010 = dot(g010, float3(Pf0.x, Pf1.y, Pf0.z));
- float n110 = dot(g110, float3(Pf1.x, Pf1.y, Pf0.z));
- float n001 = dot(g001, float3(Pf0.x, Pf0.y, Pf1.z));
- float n101 = dot(g101, float3(Pf1.x, Pf0.y, Pf1.z));
- float n011 = dot(g011, float3(Pf0.x, Pf1.y, Pf1.z));
- float n111 = dot(g111, Pf1);
-
- float3 fade_xyz = fade(Pf0);
- float4 n_z = lerp(float4(n000, n100, n010, n110), float4(n001, n101, n011, n111), fade_xyz.z);
- float2 n_yz = lerp(n_z.xy, n_z.zw, fade_xyz.y);
- float n_xyz = lerp(n_yz.x, n_yz.y, fade_xyz.x);
- return 2.2 * n_xyz;
-}
-
-// Classic Perlin noise, periodic variant
-float pnoise(float3 P, float3 rep)
-{
- float3 Pi0 = mod(floor(P), rep); // Integer part, modulo period
- float3 Pi1 = mod(Pi0 + (float3)1.0, rep); // Integer part + 1, mod period
- Pi0 = mod289(Pi0);
- Pi1 = mod289(Pi1);
- float3 Pf0 = frac(P); // Fractional part for interpolation
- float3 Pf1 = Pf0 - (float3)1.0; // Fractional part - 1.0
- float4 ix = float4(Pi0.x, Pi1.x, Pi0.x, Pi1.x);
- float4 iy = float4(Pi0.y, Pi0.y, Pi1.y, Pi1.y);
- float4 iz0 = (float4)Pi0.z;
- float4 iz1 = (float4)Pi1.z;
-
- float4 ixy = permute(permute(ix) + iy);
- float4 ixy0 = permute(ixy + iz0);
- float4 ixy1 = permute(ixy + iz1);
-
- float4 gx0 = ixy0 / 7.0;
- float4 gy0 = frac(floor(gx0) / 7.0) - 0.5;
- gx0 = frac(gx0);
- float4 gz0 = (float4)0.5 - abs(gx0) - abs(gy0);
- float4 sz0 = step(gz0, (float4)0.0);
- gx0 -= sz0 * (step((float4)0.0, gx0) - 0.5);
- gy0 -= sz0 * (step((float4)0.0, gy0) - 0.5);
-
- float4 gx1 = ixy1 / 7.0;
- float4 gy1 = frac(floor(gx1) / 7.0) - 0.5;
- gx1 = frac(gx1);
- float4 gz1 = (float4)0.5 - abs(gx1) - abs(gy1);
- float4 sz1 = step(gz1, (float4)0.0);
- gx1 -= sz1 * (step((float4)0.0, gx1) - 0.5);
- gy1 -= sz1 * (step((float4)0.0, gy1) - 0.5);
-
- float3 g000 = float3(gx0.x,gy0.x,gz0.x);
- float3 g100 = float3(gx0.y,gy0.y,gz0.y);
- float3 g010 = float3(gx0.z,gy0.z,gz0.z);
- float3 g110 = float3(gx0.w,gy0.w,gz0.w);
- float3 g001 = float3(gx1.x,gy1.x,gz1.x);
- float3 g101 = float3(gx1.y,gy1.y,gz1.y);
- float3 g011 = float3(gx1.z,gy1.z,gz1.z);
- float3 g111 = float3(gx1.w,gy1.w,gz1.w);
-
- float4 norm0 = taylorInvSqrt(float4(dot(g000, g000), dot(g010, g010), dot(g100, g100), dot(g110, g110)));
- g000 *= norm0.x;
- g010 *= norm0.y;
- g100 *= norm0.z;
- g110 *= norm0.w;
- float4 norm1 = taylorInvSqrt(float4(dot(g001, g001), dot(g011, g011), dot(g101, g101), dot(g111, g111)));
- g001 *= norm1.x;
- g011 *= norm1.y;
- g101 *= norm1.z;
- g111 *= norm1.w;
-
- float n000 = dot(g000, Pf0);
- float n100 = dot(g100, float3(Pf1.x, Pf0.y, Pf0.z));
- float n010 = dot(g010, float3(Pf0.x, Pf1.y, Pf0.z));
- float n110 = dot(g110, float3(Pf1.x, Pf1.y, Pf0.z));
- float n001 = dot(g001, float3(Pf0.x, Pf0.y, Pf1.z));
- float n101 = dot(g101, float3(Pf1.x, Pf0.y, Pf1.z));
- float n011 = dot(g011, float3(Pf0.x, Pf1.y, Pf1.z));
- float n111 = dot(g111, Pf1);
-
- float3 fade_xyz = fade(Pf0);
- float4 n_z = lerp(float4(n000, n100, n010, n110), float4(n001, n101, n011, n111), fade_xyz.z);
- float2 n_yz = lerp(n_z.xy, n_z.zw, fade_xyz.y);
- float n_xyz = lerp(n_yz.x, n_yz.y, fade_xyz.x);
- return 2.2 * n_xyz;
-}
diff --git a/Assets/Plugins/GPU Noise/ClassicNoise3D.cginc.meta b/Assets/Plugins/GPU Noise/ClassicNoise3D.cginc.meta
deleted file mode 100644
index b4dd551ab..000000000
--- a/Assets/Plugins/GPU Noise/ClassicNoise3D.cginc.meta
+++ /dev/null
@@ -1,5 +0,0 @@
-fileFormatVersion: 2
-guid: 3ba1abd1cb44c47b68fbb577c6c4ba3e
-ShaderImporter:
- defaultTextures: []
- userData:
diff --git a/Assets/Plugins/GPU Noise/SimplexNoise3D.cginc b/Assets/Plugins/GPU Noise/SimplexNoise3D.cginc
deleted file mode 100644
index 0b7add240..000000000
--- a/Assets/Plugins/GPU Noise/SimplexNoise3D.cginc
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Noise Shader Library for Unity - https://github.com/keijiro/NoiseShader
-//
-// Original work (webgl-noise) Copyright (C) 2011 Ashima Arts.
-// Translation and modification was made by Keijiro Takahashi.
-//
-// This shader is based on the webgl-noise GLSL shader. For further details
-// of the original shader, please see the following description from the
-// original source code.
-//
-
-//
-// Description : Array and textureless GLSL 2D/3D/4D simplex
-// noise functions.
-// Author : Ian McEwan, Ashima Arts.
-// Maintainer : ijm
-// Lastmod : 20110822 (ijm)
-// License : Copyright (C) 2011 Ashima Arts. All rights reserved.
-// Distributed under the MIT License. See LICENSE file.
-// https://github.com/ashima/webgl-noise
-//
-
-float3 mod289(float3 x)
-{
- return x - floor(x / 289.0) * 289.0;
-}
-
-float4 mod289(float4 x)
-{
- return x - floor(x / 289.0) * 289.0;
-}
-
-float4 permute(float4 x)
-{
- return mod289((x * 34.0 + 1.0) * x);
-}
-
-float4 taylorInvSqrt(float4 r)
-{
- return 1.79284291400159 - r * 0.85373472095314;
-}
-
-float snoise(float3 v)
-{
- const float2 C = float2(1.0 / 6.0, 1.0 / 3.0);
-
- // First corner
- float3 i = floor(v + dot(v, C.yyy));
- float3 x0 = v - i + dot(i, C.xxx);
-
- // Other corners
- float3 g = step(x0.yzx, x0.xyz);
- float3 l = 1.0 - g;
- float3 i1 = min(g.xyz, l.zxy);
- float3 i2 = max(g.xyz, l.zxy);
-
- // x1 = x0 - i1 + 1.0 * C.xxx;
- // x2 = x0 - i2 + 2.0 * C.xxx;
- // x3 = x0 - 1.0 + 3.0 * C.xxx;
- float3 x1 = x0 - i1 + C.xxx;
- float3 x2 = x0 - i2 + C.yyy;
- float3 x3 = x0 - 0.5;
-
- // Permutations
- i = mod289(i); // Avoid truncation effects in permutation
- float4 p =
- permute(permute(permute(i.z + float4(0.0, i1.z, i2.z, 1.0))
- + i.y + float4(0.0, i1.y, i2.y, 1.0))
- + i.x + float4(0.0, i1.x, i2.x, 1.0));
-
- // Gradients: 7x7 points over a square, mapped onto an octahedron.
- // The ring size 17*17 = 289 is close to a multiple of 49 (49*6 = 294)
- float4 j = p - 49.0 * floor(p / 49.0); // mod(p,7*7)
-
- float4 x_ = floor(j / 7.0);
- float4 y_ = floor(j - 7.0 * x_); // mod(j,N)
-
- float4 x = (x_ * 2.0 + 0.5) / 7.0 - 1.0;
- float4 y = (y_ * 2.0 + 0.5) / 7.0 - 1.0;
-
- float4 h = 1.0 - abs(x) - abs(y);
-
- float4 b0 = float4(x.xy, y.xy);
- float4 b1 = float4(x.zw, y.zw);
-
- //float4 s0 = float4(lessThan(b0, 0.0)) * 2.0 - 1.0;
- //float4 s1 = float4(lessThan(b1, 0.0)) * 2.0 - 1.0;
- float4 s0 = floor(b0) * 2.0 + 1.0;
- float4 s1 = floor(b1) * 2.0 + 1.0;
- float4 sh = -step(h, 0.0);
-
- float4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
- float4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
-
- float3 g0 = float3(a0.xy, h.x);
- float3 g1 = float3(a0.zw, h.y);
- float3 g2 = float3(a1.xy, h.z);
- float3 g3 = float3(a1.zw, h.w);
-
- // Normalise gradients
- float4 norm = taylorInvSqrt(float4(dot(g0, g0), dot(g1, g1), dot(g2, g2), dot(g3, g3)));
- g0 *= norm.x;
- g1 *= norm.y;
- g2 *= norm.z;
- g3 *= norm.w;
-
- // Mix final noise value
- float4 m = max(0.6 - float4(dot(x0, x0), dot(x1, x1), dot(x2, x2), dot(x3, x3)), 0.0);
- m = m * m;
- m = m * m;
-
- float4 px = float4(dot(x0, g0), dot(x1, g1), dot(x2, g2), dot(x3, g3));
- return 42.0 * dot(m, px);
-}
diff --git a/Assets/Plugins/GPU Noise/SimplexNoise3D.cginc.meta b/Assets/Plugins/GPU Noise/SimplexNoise3D.cginc.meta
deleted file mode 100644
index 612bd9ef0..000000000
--- a/Assets/Plugins/GPU Noise/SimplexNoise3D.cginc.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: b577a94f58a1398409bfcfe9cd5dbf99
-timeCreated: 1448788105
-licenseType: Pro
-ShaderImporter:
- defaultTextures: []
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Plugins/GPU Noise/SimplexNoiseGrad3D.cginc b/Assets/Plugins/GPU Noise/SimplexNoiseGrad3D.cginc
deleted file mode 100644
index 4cfef835a..000000000
--- a/Assets/Plugins/GPU Noise/SimplexNoiseGrad3D.cginc
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Noise Shader Library for Unity - https://github.com/keijiro/NoiseShader
-//
-// Original work (webgl-noise) Copyright (C) 2011 Ashima Arts.
-// Translation and modification was made by Keijiro Takahashi.
-//
-// This shader is based on the webgl-noise GLSL shader. For further details
-// of the original shader, please see the following description from the
-// original source code.
-//
-
-//
-// Description : Array and textureless GLSL 2D/3D/4D simplex
-// noise functions.
-// Author : Ian McEwan, Ashima Arts.
-// Maintainer : ijm
-// Lastmod : 20110822 (ijm)
-// License : Copyright (C) 2011 Ashima Arts. All rights reserved.
-// Distributed under the MIT License. See LICENSE file.
-// https://github.com/ashima/webgl-noise
-//
-
-float3 mod289(float3 x)
-{
- return x - floor(x / 289.0) * 289.0;
-}
-
-float4 mod289(float4 x)
-{
- return x - floor(x / 289.0) * 289.0;
-}
-
-float4 permute(float4 x)
-{
- return mod289((x * 34.0 + 1.0) * x);
-}
-
-float4 taylorInvSqrt(float4 r)
-{
- return 1.79284291400159 - r * 0.85373472095314;
-}
-
-float3 snoise_grad(float3 v)
-{
- const float2 C = float2(1.0 / 6.0, 1.0 / 3.0);
-
- // First corner
- float3 i = floor(v + dot(v, C.yyy));
- float3 x0 = v - i + dot(i, C.xxx);
-
- // Other corners
- float3 g = step(x0.yzx, x0.xyz);
- float3 l = 1.0 - g;
- float3 i1 = min(g.xyz, l.zxy);
- float3 i2 = max(g.xyz, l.zxy);
-
- // x1 = x0 - i1 + 1.0 * C.xxx;
- // x2 = x0 - i2 + 2.0 * C.xxx;
- // x3 = x0 - 1.0 + 3.0 * C.xxx;
- float3 x1 = x0 - i1 + C.xxx;
- float3 x2 = x0 - i2 + C.yyy;
- float3 x3 = x0 - 0.5;
-
- // Permutations
- i = mod289(i); // Avoid truncation effects in permutation
- float4 p =
- permute(permute(permute(i.z + float4(0.0, i1.z, i2.z, 1.0))
- + i.y + float4(0.0, i1.y, i2.y, 1.0))
- + i.x + float4(0.0, i1.x, i2.x, 1.0));
-
- // Gradients: 7x7 points over a square, mapped onto an octahedron.
- // The ring size 17*17 = 289 is close to a multiple of 49 (49*6 = 294)
- float4 j = p - 49.0 * floor(p / 49.0); // mod(p,7*7)
-
- float4 x_ = floor(j / 7.0);
- float4 y_ = floor(j - 7.0 * x_); // mod(j,N)
-
- float4 x = (x_ * 2.0 + 0.5) / 7.0 - 1.0;
- float4 y = (y_ * 2.0 + 0.5) / 7.0 - 1.0;
-
- float4 h = 1.0 - abs(x) - abs(y);
-
- float4 b0 = float4(x.xy, y.xy);
- float4 b1 = float4(x.zw, y.zw);
-
- //float4 s0 = float4(lessThan(b0, 0.0)) * 2.0 - 1.0;
- //float4 s1 = float4(lessThan(b1, 0.0)) * 2.0 - 1.0;
- float4 s0 = floor(b0) * 2.0 + 1.0;
- float4 s1 = floor(b1) * 2.0 + 1.0;
- float4 sh = -step(h, 0.0);
-
- float4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
- float4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
-
- float3 g0 = float3(a0.xy, h.x);
- float3 g1 = float3(a0.zw, h.y);
- float3 g2 = float3(a1.xy, h.z);
- float3 g3 = float3(a1.zw, h.w);
-
- // Normalise gradients
- float4 norm = taylorInvSqrt(float4(dot(g0, g0), dot(g1, g1), dot(g2, g2), dot(g3, g3)));
- g0 *= norm.x;
- g1 *= norm.y;
- g2 *= norm.z;
- g3 *= norm.w;
-
- // Compute gradient of noise function at P
- float4 m = max(0.6 - float4(dot(x0, x0), dot(x1, x1), dot(x2, x2), dot(x3, x3)), 0.0);
- float4 m2 = m * m;
- float4 m3 = m2 * m;
- float4 m4 = m2 * m2;
- float3 grad =
- -6.0 * m3.x * x0 * dot(x0, g0) + m4.x * g0 +
- -6.0 * m3.y * x1 * dot(x1, g1) + m4.y * g1 +
- -6.0 * m3.z * x2 * dot(x2, g2) + m4.z * g2 +
- -6.0 * m3.w * x3 * dot(x3, g3) + m4.w * g3;
- return 42.0 * grad;
-}
diff --git a/Assets/Plugins/GPU Noise/SimplexNoiseGrad3D.cginc.meta b/Assets/Plugins/GPU Noise/SimplexNoiseGrad3D.cginc.meta
deleted file mode 100644
index 250b646fa..000000000
--- a/Assets/Plugins/GPU Noise/SimplexNoiseGrad3D.cginc.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: a7111eafc2463224faacf7be3bddb9a4
-timeCreated: 1449292284
-licenseType: Pro
-ShaderImporter:
- defaultTextures: []
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab b/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab
index 7a65a0864..7be70840f 100644
--- a/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab
+++ b/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab
@@ -103,8 +103,8 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 3720744386649352057, guid: c00b5a4f1e4743a4ca59b8030251f900, type: 3}
- - {fileID: 3720744386649352057, guid: 26a894e543f3ed44893b1620707ca62c, type: 3}
+ - {fileID: 2100000, guid: bebc82079e5d4e578a73c3ab48d2c2da, type: 2}
+ - {fileID: 2100000, guid: b9f65861b71050b4a84fe0007bedbba9, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
diff --git a/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab b/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab
index f9a477cda..4a8609c7c 100644
--- a/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab
+++ b/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab
@@ -103,8 +103,8 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 3720744386649352057, guid: c00b5a4f1e4743a4ca59b8030251f900, type: 3}
- - {fileID: 3720744386649352057, guid: 26a894e543f3ed44893b1620707ca62c, type: 3}
+ - {fileID: 2100000, guid: bebc82079e5d4e578a73c3ab48d2c2da, type: 2}
+ - {fileID: 2100000, guid: b9f65861b71050b4a84fe0007bedbba9, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
diff --git a/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab b/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab
index 4252e74cc..b80967c41 100644
--- a/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab
+++ b/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab
@@ -103,8 +103,8 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 3720744386649352057, guid: c00b5a4f1e4743a4ca59b8030251f900, type: 3}
- - {fileID: 3720744386649352057, guid: 26a894e543f3ed44893b1620707ca62c, type: 3}
+ - {fileID: 2100000, guid: bebc82079e5d4e578a73c3ab48d2c2da, type: 2}
+ - {fileID: 2100000, guid: b9f65861b71050b4a84fe0007bedbba9, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
diff --git a/Assets/Prefabs/RPG/Pickups/Octahedron.prefab b/Assets/Prefabs/RPG/Pickups/Octahedron.prefab
index 099083195..9cabd7b79 100644
--- a/Assets/Prefabs/RPG/Pickups/Octahedron.prefab
+++ b/Assets/Prefabs/RPG/Pickups/Octahedron.prefab
@@ -103,8 +103,8 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 3720744386649352057, guid: c00b5a4f1e4743a4ca59b8030251f900, type: 3}
- - {fileID: 3720744386649352057, guid: 26a894e543f3ed44893b1620707ca62c, type: 3}
+ - {fileID: 2100000, guid: bebc82079e5d4e578a73c3ab48d2c2da, type: 2}
+ - {fileID: 2100000, guid: b9f65861b71050b4a84fe0007bedbba9, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
diff --git a/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab b/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab
index 6dad19967..20f8073a7 100644
--- a/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab
+++ b/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab
@@ -103,8 +103,8 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 3720744386649352057, guid: c00b5a4f1e4743a4ca59b8030251f900, type: 3}
- - {fileID: 3720744386649352057, guid: 26a894e543f3ed44893b1620707ca62c, type: 3}
+ - {fileID: 2100000, guid: bebc82079e5d4e578a73c3ab48d2c2da, type: 2}
+ - {fileID: 2100000, guid: b9f65861b71050b4a84fe0007bedbba9, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
diff --git a/Assets/Resources/Settings.asset b/Assets/Resources/Settings.asset
index 46bee7272..7d89eea8e 100644
--- a/Assets/Resources/Settings.asset
+++ b/Assets/Resources/Settings.asset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7f09c54dfdb87dffd76fa92365d62c53ce333457b89ccf8ead09093ffffedc42
-size 12525
+oid sha256:d9d381e3b25ea04d92768f0633cb89668108229dcc17336b560d0cbbfbaed04f
+size 12397
diff --git a/Assets/Resources/Sprites/Attribution.txt b/Assets/Resources/Sprites/Attribution.txt
index 666742406..8ca89fb1b 100644
--- a/Assets/Resources/Sprites/Attribution.txt
+++ b/Assets/Resources/Sprites/Attribution.txt
@@ -2,8 +2,7 @@ Noun Project
Tornado by Bart Laubsch
Alien Abduction by Bart Laubsch
-Hurricane by icon 54 from
-Smashicons Space by Ben Davis
+Hurricane by icon 54 from Smashicons Space by Ben Davis
Space 2 - Solid by Ben Davis
Filter by Karthik Aathis
Search by il Capitano
diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity
index 4d5b15473..f583a38ec 100644
--- a/Assets/Scenes/ARPG.unity
+++ b/Assets/Scenes/ARPG.unity
@@ -21236,7 +21236,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &1396909587
RectTransform:
m_ObjectHideFlags: 0
@@ -24703,26 +24703,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: "What the fuck did you just fucking type about me, you little bitch? I\u2019ll
- have you know I graduated top of my class at MIT, and I\u2019ve been involved
- in numerous secret raids with Anonymous, and I have over 300 confirmed DDoSes.\n\nI
- am trained in online trolling and I\u2019m the top hacker in the entire world.
- You are nothing to me but just another virus host. I will wipe you the fuck out
- with precision the likes of which has never been seen before on the Internet,
- mark my fucking words. You think you can get away with typing that shit to me
- over the Internet? Think again, fucker.\n\nAs we chat over IRC I am tracing your
- IP with my damn bare hands so you better prepare for the storm, maggot. The storm
- that wipes out the pathetic little thing you call your computer. You\u2019re
- fucking dead, kid. I can be anywhere, anytime, and I can hack into your files
- in over seven hundred ways, and that\u2019s just with my bare hands.\n\nNot only
- am I extensively trained in hacking, but I have access to the entire arsenal
- of every piece of malware ever created and I will use it to its full extent to
- wipe your miserable ass off the face of the world wide web, you little shit.
- If only you could have known what unholy retribution your little \u201Cclever\u201D
- comment was about to bring down upon you, maybe you would have held your fucking
- fingers. But you couldn\u2019t, you didn\u2019t, and now you\u2019re paying the
- price, you goddamn idiot. I will shit code all over you and you will drown in
- it.\n\nYou\u2019re fucking dead, kiddo."
+ m_text: ""
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 53555f7a2d5e745428813f1b1118734f, type: 2}
m_sharedMaterial: {fileID: -2804126062856497447, guid: 53555f7a2d5e745428813f1b1118734f,
diff --git a/Assets/Scripts/Editor/ShipPrefabAuthoring.cs b/Assets/Scripts/Editor/ShipPrefabAuthoring.cs
index d2937b79d..45bbc8609 100644
--- a/Assets/Scripts/Editor/ShipPrefabAuthoring.cs
+++ b/Assets/Scripts/Editor/ShipPrefabAuthoring.cs
@@ -112,6 +112,7 @@ public static class ShipPrefabAuthoring
case "Thruster":
var emitter = DirectChild(node, "Emitter")?.GetComponent();
if (emitter == null) throw new InvalidOperationException($"{name} needs an Emitter mesh child");
+ ShipModShips.Hide(emitter, invisible);
AddOrGet(node.gameObject).Emitter = emitter;
thrusters.Add(node.GetComponent());
break;
diff --git a/Assets/Scripts/Editor/ShipPrefabAuthoringSmoke.cs b/Assets/Scripts/Editor/ShipPrefabAuthoringSmoke.cs
index 9f740f557..5342eb352 100644
--- a/Assets/Scripts/Editor/ShipPrefabAuthoringSmoke.cs
+++ b/Assets/Scripts/Editor/ShipPrefabAuthoringSmoke.cs
@@ -28,6 +28,8 @@ public static class ShipPrefabAuthoringSmoke
ShipPrefabAuthoring.Configure(root);
var ship = root.GetComponent();
Require(ship != null && ship.ThrusterHardpoints.Length == 1 && ship.ThrusterHardpoints[0].Emitter != null, "thruster emitter");
+ Require(Array.TrueForAll(ship.ThrusterHardpoints[0].Emitter.sharedMaterials, material => material == ship.InvisibleMaterial),
+ "thruster emitter drawn with the invisible material only");
Require(ship.WeaponHardpoints.Length == 1 && ship.WeaponHardpoints[0].FiringPoint.Length == 2, "weapon muzzles");
Require(ship.WeaponHardpoints[0].FiringPoint[0].name == "Muzzle.0", "numeric muzzle order");
Require(ship.RadiatorHardpoints.Length == 1 && ship.RadiatorHardpoints[0].Mesh != null, "radiator mesh");
diff --git a/Assets/Scripts/EventLog.cs b/Assets/Scripts/EventLog.cs
index 54db8dd57..967653b1d 100644
--- a/Assets/Scripts/EventLog.cs
+++ b/Assets/Scripts/EventLog.cs
@@ -13,7 +13,8 @@ public class EventLog : MonoBehaviour
private SizedQueue LogMessages;
private StringBuilder LogText;
- private void Start()
+ // Awake, not Start: a message can arrive in the frame the parent activates, before Start would run.
+ private void Awake()
{
LogMessages = new SizedQueue(LineCount);
LogText = new StringBuilder();
diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs
index a0cf3a4c1..6cfff750e 100644
--- a/Assets/Scripts/Gameplay/ActionGameManager.cs
+++ b/Assets/Scripts/Gameplay/ActionGameManager.cs
@@ -106,6 +106,9 @@ public class ActionGameManager : MonoBehaviour
}
public static Galaxy CurrentGalaxy;
+ // Whether a run is live: a failed start and a finished run both clear the galaxy, and the scene's update paths (this
+ // manager's, the renderer's) step and draw nothing without one.
+ public static bool RunLive => CurrentGalaxy != null;
// The scenario a new run starts from: MainMenu.Launch sets it, and StartGame's new-run branch consumes it once.
public static Scenario PendingScenario;
@@ -188,9 +191,6 @@ public class ActionGameManager : MonoBehaviour
//public PlayerInput Input;
- // private CinemachineFramingTransposer _transposer;
- // private CinemachineComposer _composer;
-
private bool _paused;
private float _time;
private int _zoomLevelIndex;
@@ -556,11 +556,7 @@ public class ActionGameManager : MonoBehaviour
{
FollowCamera.Follow = x.missile.transform;
FollowCamera.LookAt = x.target ? x.target : x.missile.transform;
- x.missile.OnKill += () =>
- {
- FollowCamera.LookAt = ZoneRenderer.EntityInstances[CurrentEntity].LookAtPoint;
- FollowCamera.Follow = ZoneRenderer.EntityInstances[CurrentEntity].transform;
- };
+ x.missile.OnKill += () => FrameFollow(CurrentEntity);
});
}
});
@@ -737,8 +733,7 @@ public class ActionGameManager : MonoBehaviour
Settings.ZoneSettings,
Settings.PlanetSettings,
CurrentGalaxy,
- galaxyZone,
- CurrentGalaxy.IsPrelude
+ galaxyZone
);
galaxyZone.Contents = new Zone(ItemManager, Settings.PlanetSettings, galaxyZone.PackedContents, galaxyZone, CurrentGalaxy);
}
@@ -854,21 +849,12 @@ public class ActionGameManager : MonoBehaviour
var scenario = PendingScenario;
PendingScenario = null;
var failures = new List();
- RunStart.Staged staged = null;
- try
+ var staged = RunStart.Launch(() => RunSave.Replace(CultCache, () =>
{
- staged = RunSave.Replace(CultCache, () =>
- {
- RunStart.GenerateArena(ItemManager, Settings.ZoneSettings, Settings.PlanetSettings, CurrentGalaxy, scenario);
- PopulateLevel(CurrentGalaxy.Entrance);
- return RunStart.Stage(ItemManager, Zone, scenario, Settings.StartingHullName, Settings.TutorialGenerationSettings, failures);
- });
- }
- catch (Exception exception)
- {
- Debug.LogException(exception);
- failures.Add(exception.Message);
- }
+ RunStart.GenerateArena(ItemManager, Settings.ZoneSettings, Settings.PlanetSettings, CurrentGalaxy, scenario);
+ PopulateLevel(CurrentGalaxy.Entrance);
+ return RunStart.Stage(ItemManager, Zone, scenario, Settings.StartingHullName, failures);
+ }), failures, Debug.LogException);
if (staged == null)
{
@@ -1092,9 +1078,14 @@ public class ActionGameManager : MonoBehaviour
_shipSubscriptions.Add(CurrentEntity.Zone.ShotResolved
.Where(outcome => outcome.Source == CurrentEntity)
.Subscribe(outcome => _debugLastShots[outcome.Weapon] = outcome));
+ _shipSubscriptions.Add(CurrentEntity.Zone.CargoGained
+ .Where(gain => gain.Taker == CurrentEntity)
+ .Subscribe(gain =>
+ {
+ if (EventLog != null) EventLog.LogMessage(HaulFeed.Line(gain, ItemManager), gain.Adrift > 0 ? Color.yellow : Color.white);
+ }));
- FollowCamera.LookAt = ZoneRenderer.EntityInstances[CurrentEntity].LookAtPoint;
- FollowCamera.Follow = ZoneRenderer.EntityInstances[CurrentEntity].transform;
+ FrameFollow(CurrentEntity);
_articulationGroups = CurrentEntity.Equipment
.Where(item => item.Behaviors.Any(x => x.Data is WeaponData && !(x.Data is LauncherData)))
.GroupBy(item => ZoneRenderer.EntityInstances[CurrentEntity]
@@ -1202,6 +1193,20 @@ public class ActionGameManager : MonoBehaviour
_incomingLockIndicator = (incoming, incoming.GetComponent());
}
+ private CinemachineFramingTransposer _framingTransposer;
+
+ // The one writer of the follow camera's Follow, LookAt and distance for an entity: the distance is
+ // the hull's reach (from its centre of mass, where Follow sits) times the authored ratio.
+ private void FrameFollow(Entity entity)
+ {
+ var instance = ZoneRenderer.EntityInstances[entity];
+ FollowCamera.LookAt = instance.LookAtPoint;
+ FollowCamera.Follow = instance.transform;
+ if (_framingTransposer == null)
+ _framingTransposer = FollowCamera.GetCinemachineComponent();
+ _framingTransposer.m_CameraDistance = Settings.FollowCameraDistancePerReach * Contacts.Radius(entity);
+ }
+
private void UpdatePlayerPanel()
{
ShipPanel.Display(CurrentEntity, true);
@@ -1342,6 +1347,7 @@ public class ActionGameManager : MonoBehaviour
void Update()
{
+ if (!RunLive) return;
if(!_paused)
{
_time += Time.deltaTime;
diff --git a/Assets/Scripts/Gameplay/GameSettings.cs b/Assets/Scripts/Gameplay/GameSettings.cs
index 9d89c5822..77855a148 100644
--- a/Assets/Scripts/Gameplay/GameSettings.cs
+++ b/Assets/Scripts/Gameplay/GameSettings.cs
@@ -14,6 +14,9 @@ public class GameSettings : ScriptableObject
public float HeatstrokePhasingFloor = 0;
public float HeatstrokePhasingFrequency = 5;
public float WormholeDistanceRatio;
+ // The follow camera's distance from the hull's centre of mass, as a multiple of the hull's reach
+ // (Contacts.Radius); 1.5 keeps the Longinus at about 30 m.
+ public float FollowCameraDistancePerReach = 1.5f;
public float DefaultViewDistance;
public float[] MinimapZoomLevels;
public int DefaultMinimapZoom;
@@ -22,8 +25,7 @@ public class GameSettings : ScriptableObject
public float MinimapAsteroidSize = 3;
public float MinimapIconSize = 1f / 32;
public float PlanetRotationSpeed = 1;
- public TutorialGenerationSettings TutorialGenerationSettings;
- public SectorBackgroundSettings TutorialBackgroundSettings;
+ public SectorBackgroundSettings CastBackgroundSettings;
public SectorBackgroundSettings SectorBackgroundSettings;
public SectorGenerationSettings SectorGenerationSettings;
public BodySettingsCollection[] BodySettingsCollections;
diff --git a/Assets/Scripts/Gameplay/ShipModShips.cs b/Assets/Scripts/Gameplay/ShipModShips.cs
index 89106a6b7..33f09f590 100644
--- a/Assets/Scripts/Gameplay/ShipModShips.cs
+++ b/Assets/Scripts/Gameplay/ShipModShips.cs
@@ -6,9 +6,10 @@ using GameCult.Caching;
using UnityEngine;
using Object = UnityEngine.Object;
-// Mod ships in the running game. Compose decides which mod hulls exist; Preload builds a prototype for each, keyed by the
-// hull's record key, into an inactive assembled copy that Instantiate clones synchronously, so LoadEntity never loads async.
-// A composed hull Preload cannot build is an import fault: Loading faults with ImportFault, naming every such hull's package.
+// Mod ships in the running game. Compose (Bind) is the one verdict on whether a mod hull exists, from the package's files;
+// Preload only builds a prototype for each, keyed by the hull's record key, into an inactive assembled copy that Instantiate
+// clones synchronously, so LoadEntity never loads async. ImportFault reports what the Unity importer made of a composed hull:
+// a composed hull Preload cannot build is an import fault: Loading faults with ImportFault, naming every such hull's package.
// The prototypes are cache-only: rebuilt every boot from the catalog, the mod GLBs and the template.
public static class ShipModShips
{
@@ -101,6 +102,7 @@ public static class ShipModShips
node.name = id;
return node;
}
+ // An importer report, not a verdict: Bind has already judged the file.
MeshRenderer Renderer(string id)
{
var found = Node(id).GetComponentInChildren(true);
@@ -130,9 +132,6 @@ public static class ShipModShips
var surface = AddOrGet(hullNode.gameObject);
var shieldMarker = Node(plan.Shield);
- var scale = shieldMarker.localScale;
- if (!(scale.x > 0 && scale.y > 0 && scale.z > 0))
- throw new InvalidOperationException($"{ship.Id}: the shield anchor scale must have three positive radii.");
var shield = Object.Instantiate(template.Shield.GetComponent(), shieldMarker, false);
Reset(shield.transform);
AddOrGet(shield.gameObject);
diff --git a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
index 6b899ee35..300229d3f 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
@@ -6,6 +6,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
+using GameCult.Caching;
using MessagePack;
using Newtonsoft.Json;
using CultMath;
@@ -212,4 +213,7 @@ public abstract class BehaviorData
{
return base.ToString().FormatTypeName();
}
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(37)] [CultElementId] public string Id = "";
}
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs
index b90a124da..8e44075ed 100644
--- a/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs
@@ -46,6 +46,7 @@ public class ConstantWeapon : Weapon, IProgressBehavior, IEventBehavior, IPowerC
{
get => _ammo;
}
+ public override bool HasMagazine => false;
public float Progress
{
diff --git a/Assets/Scripts/ServerShared/Behaviors/Weapon.cs b/Assets/Scripts/ServerShared/Behaviors/Weapon.cs
index 62e4f4b14..52b69d196 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Weapon.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Weapon.cs
@@ -104,6 +104,14 @@ public abstract class Weapon : ActivatedBehavior
public abstract int Ammo { get; }
// Rounds in the ship's cargo that reload this weapon's magazine: crates of AmmoType, 0 when the weapon draws none.
public int Reserve => _data.AmmoType.IsSet() ? Entity.CountItemsInCargo(_data.AmmoType.Key) : 0;
+ // Whether Ammo counts a magazine. A weapon that names an AmmoType and fires from one (InstantWeapon) does; a beam (ConstantWeapon) draws one
+ // crate per AmmoInterval straight from the cargo and has none.
+ public virtual bool HasMagazine => true;
+ // What the HUD's ammunition label shows: "magazine/reserve" for a magazine weapon, the reserve alone for one without a magazine, empty when
+ // the weapon draws no ammunition. The one rule the HUD reads, so the label cannot show a magazine a weapon does not have.
+ public string AmmoReadout => !ShowsAmmoReadout ? "" : HasMagazine ? $"{Ammo}/{Reserve}" : Reserve.ToString();
+ // Whether the HUD shows the ammunition label at all (and not the infinite-ammunition icon): the weapon names an AmmoType.
+ public bool ShowsAmmoReadout => _data.AmmoType.IsSet();
public WeaponData WeaponData => _data;
public float RangeFactor(float at) => WeaponData.RangeFactor(MinRange, EffectiveRange, Range, _data.DamageAtMaxRange, at);
diff --git a/Assets/Scripts/ServerShared/Corporations.cs b/Assets/Scripts/ServerShared/Corporations.cs
index e527606d9..680436520 100644
--- a/Assets/Scripts/ServerShared/Corporations.cs
+++ b/Assets/Scripts/ServerShared/Corporations.cs
@@ -49,7 +49,10 @@ public class Faction
// Keys 13 to 15 (overworldMusic, combatMusic, bossMusic) held Wwise ids; retired, never reuse them.
- // Key 16 is reserved for Relations (operator ruling faction-relations-field).
+ // How this faction regards each other faction; absent is Neutral. Directed: this map says how this faction regards them, theirs
+ // says how they regard it. Read only through Entity.Regard (ruling faction-relations-field).
+ [Inspectable, CultReference(typeof(Faction), many: true), JsonProperty("relations"), Key(16)]
+ public Dictionary, FactionRelationship> Relations = new Dictionary, FactionRelationship>();
// The faction's rules of engagement; null fights as FactionDoctrine.Default.
[Inspectable, JsonProperty("doctrine"), Key(17)]
@@ -58,7 +61,7 @@ public class Faction
// The maker's final assembly: the distribution every lot of theirs draws its own quality from, and the hard ceiling on each
// of its roles (quality-lean-assembly-hard-ceiling). Null is not authored: a lot of theirs assembles at AssemblyDistribution's
// defaults. assembly-from-maker derives it once at the part mean plus a tolerance margin (quality-min-tolerance-binned-assembly);
- // tune it in Studio after that. Key 16 is reserved for Relations and 18 for Livery. Key 20 was assemblyDeviation (retired); never reuse it.
+ // tune it in Studio after that. Key 18 is reserved for Livery. Key 20 was assemblyDeviation (retired); never reuse it.
[Inspectable, JsonProperty("assembly"), Key(19)]
public AssemblyDistribution Assembly;
@@ -84,5 +87,8 @@ public class FactionPlace
// treats an invalid entry as absent; AetherDb place-names refuses a table that holds one.
public static bool IsValidName(string name) =>
!string.IsNullOrEmpty(name) && name == name.Trim() && !name.StartsWith("EAC-", StringComparison.OrdinalIgnoreCase);
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(2)] [CultElementId] public string Id = "";
}
diff --git a/Assets/Scripts/ServerShared/Credits.cs b/Assets/Scripts/ServerShared/Credits.cs
new file mode 100644
index 000000000..9b7ac4226
--- /dev/null
+++ b/Assets/Scripts/ServerShared/Credits.cs
@@ -0,0 +1,189 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+// The third-party attributions the shipped game must show the player. One list, owned here: the credits screen only
+// renders it, and CreditsTests holds it against the licence files in Assets. Unity-free so the headless build checks it.
+public class Credit
+{
+ public string Name;
+ public string Licence;
+ // What the licence requires shown: copyright holders, and any change notice.
+ public string Notice;
+ // The licence file in the repo that carries the full text and that this entry answers for.
+ public string LicenceFile;
+}
+
+public static class Credits
+{
+ public const string TwemojiFile = "Assets/Fonts/Emoji/LICENSE.txt";
+ public const string PlaydeadFile = "Assets/Plugins/Playdead/LICENSE.txt";
+ public const string NounProjectFile = "Assets/Resources/Sprites/Attribution.txt";
+ public const string LiberationFile = "Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt";
+ // Fonts state their holder and licence in their own name tables; the licence texts shipped beside them are these.
+ public const string UbuntuLicenceFile = "Assets/Fonts/Ubuntu/UFL-1.0.txt";
+ public const string MontserratLicenceFile = "Assets/Fonts/Ubuntu/Montserrat-OFL-1.1.txt";
+ public const string UniRxFile = "Assets/Plugins/UniRx/ReadMe.txt";
+ public const string AmbientCgFile = "Assets/Materials/PBR/SOURCES.md";
+ public const string KdTreeFile = "Assets/Scripts/ServerShared/NIH/KDTree/KDTree.cs";
+ public const string SimplexNoiseFile = "Assets/Plugins/GPU Noise/SimplexNoise2D.cginc";
+ // Works whose notice is only a source-file header; each answers through the file whose header states it.
+ public const string UnityShaderFile = "Assets/Shaders/Particle Standard Unlit.shader";
+ public const string AdditiveUiFile = "Assets/Shaders/AdditiveUI.shader";
+ public const string AcesFile = "Assets/Shaders/CustomDoF/ACES.hlsl";
+ public const string BezierPathFile = "Assets/Plugins/com.unity.uiextensions/Runtime/Scripts/Utilities/BezierPath.cs";
+ public const string ClassicNoiseFile = "Assets/Plugins/Celestial Body/Scripts/Shaders/Includes/SimplexNoise2.cginc";
+ // The first line of the attribution file; the icon credits are the lines after it.
+ public const string NounProjectHeading = "Noun Project";
+ // Where the player build loads the Noun Project credit lines from (Resources path, no extension).
+ public const string NounProjectResource = "Sprites/Attribution";
+
+ // The full list. The Noun Project icon credits are the lines of its attribution file, whose text the caller supplies
+ // (Unity reads it as a Resources TextAsset; tests read it from disk), so the file stays the one copy of those names.
+ public static IReadOnlyList All(string nounProjectAttribution)
+ {
+ var credits = new List
+ {
+ new Credit
+ {
+ Name = "Twemoji",
+ Licence = "CC BY 4.0",
+ Notice = "Copyright (c) 2022-present Jason Sofonia & Justine De Caires; copyright (c) 2014-2021 Twitter. " +
+ "Graphics licensed under CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/). " +
+ "Converted to a colour font; the artwork itself is not edited.",
+ LicenceFile = TwemojiFile
+ },
+ new Credit
+ {
+ Name = "Playdead temporal anti-aliasing",
+ Licence = "MIT",
+ Notice = "Copyright (c) 2015 Playdead",
+ LicenceFile = PlaydeadFile
+ },
+ new Credit
+ {
+ Name = "Liberation Sans",
+ Licence = "SIL Open Font License 1.1",
+ Notice = "Digitized data copyright (c) 2010 Google Corporation with Reserved Font Arimo, Tinos and Cousine. " +
+ "Copyright (c) 2012 Red Hat, Inc. with Reserved Font Name Liberation.",
+ LicenceFile = LiberationFile
+ },
+ new Credit
+ {
+ Name = "Ubuntu and Ubuntu Mono fonts",
+ Licence = "Ubuntu Font Licence 1.0",
+ Notice = "Copyright 2011 Canonical Ltd.",
+ LicenceFile = UbuntuLicenceFile
+ },
+ new Credit
+ {
+ Name = "Montserrat",
+ Licence = "SIL Open Font License 1.1",
+ Notice = "Copyright(c) 2014 by Julieta Ulanovsky",
+ LicenceFile = MontserratLicenceFile
+ },
+ new Credit
+ {
+ Name = "UniRx",
+ Licence = "MIT",
+ Notice = "Created by Yoshifumi Kawai (neuecc)",
+ LicenceFile = UniRxFile
+ },
+ new Credit
+ {
+ Name = "KDTree",
+ Licence = "MIT",
+ Notice = "Copyright (c) 2018 Vili Volčini / viliwonka",
+ LicenceFile = KdTreeFile
+ },
+ new Credit
+ {
+ Name = "webgl-noise simplex noise",
+ Licence = "MIT",
+ Notice = "Copyright (C) 2011 Ashima Arts. Author: Ian McEwan, Ashima Arts " +
+ "(https://github.com/ashima/webgl-noise). Translated to Unity shaders and modified by Keijiro Takahashi " +
+ "(https://github.com/keijiro/NoiseShader).",
+ LicenceFile = SimplexNoiseFile
+ },
+ new Credit
+ {
+ Name = "Celestial Body noise shaders",
+ Licence = "MIT",
+ Notice = "Copyright (C) 2011 Ashima Arts. Copyright (C) 2011 by Ashima Arts (Simplex noise). " +
+ "Copyright (C) 2011 by Stefan Gustavson (Classic noise).",
+ LicenceFile = ClassicNoiseFile
+ },
+ new Credit
+ {
+ Name = "Unity built-in shaders",
+ Licence = "MIT",
+ Notice = "Copyright (c) 2016 Unity Technologies. Shader source adapted from Unity's built-in shaders " +
+ "(Particle Standard Unlit, StretchedSkybox, MaskedWorldSpaceUI, MaskedWorldSpaceAdditiveUI).",
+ LicenceFile = UnityShaderFile
+ },
+ new Credit
+ {
+ Name = "AdditiveUI shaders",
+ Licence = "MIT for the Unity Technologies portion; the Supyrb portion states no licence",
+ Notice = "Copyright (c) 2017 Supyrb. All rights reserved. Author: Johannes Deml. " +
+ "Built on Unity's built-in UI shader, copyright (c) 2016 Unity Technologies, MIT.",
+ LicenceFile = AdditiveUiFile
+ },
+ new Credit
+ {
+ Name = "ACES colour transforms",
+ Licence = "Academy Color Encoding System licence",
+ Notice = "Copyright 2015 Academy of Motion Picture Arts and Sciences (A.M.P.A.S.). " +
+ "Portions contributed by others as indicated. All rights reserved. " +
+ "Source: https://github.com/ampas/aces-dev",
+ LicenceFile = AcesFile
+ },
+ new Credit
+ {
+ Name = "Bezier path (UI Extensions)",
+ Licence = "No named licence; permissive grant in the file header",
+ Notice = "Author: Herman Tulleken, dev.mag.org.za (http://devmag.org.za/2011/04/05/bzier-curves-a-tutorial/). " +
+ "Use this code as you wish, at your own risk.",
+ LicenceFile = BezierPathFile
+ },
+ new Credit
+ {
+ Name = "ambientCG PBR materials",
+ Licence = "CC0 1.0 Universal",
+ Notice = "Texture sets from ambientCG (https://ambientcg.com), public domain",
+ LicenceFile = AmbientCgFile
+ },
+ new Credit
+ {
+ Name = "Noun Project icons",
+ Licence = "Noun Project attribution licence",
+ Notice = string.Join("\n", NounProjectLines(nounProjectAttribution)),
+ LicenceFile = NounProjectFile
+ }
+ };
+ Validate(credits);
+ return credits;
+ }
+
+ // The icon credit lines of the attribution file: everything after its "Noun Project" heading, one line per icon (the
+ // file's "Other" sub-heading and its lines follow in the same list). A file that does not open with the heading is
+ // refused rather than having its first line dropped.
+ public static IEnumerable NounProjectLines(string attribution)
+ {
+ var lines = (attribution ?? "").Split('\n').Select(line => line.Trim()).Where(line => line.Length > 0).ToArray();
+ if (lines.Length < 2 || lines[0] != NounProjectHeading)
+ throw new InvalidOperationException($"{NounProjectFile} must open with the heading '{NounProjectHeading}' followed by icon credits");
+ return lines.Skip(1);
+ }
+
+ // Throws on an entry a player-facing screen could not honestly show.
+ public static void Validate(IReadOnlyList credits)
+ {
+ foreach (var credit in credits)
+ if (string.IsNullOrWhiteSpace(credit.Name) || string.IsNullOrWhiteSpace(credit.Licence) ||
+ string.IsNullOrWhiteSpace(credit.Notice) || string.IsNullOrWhiteSpace(credit.LicenceFile))
+ throw new InvalidOperationException($"Credit '{credit.Name}' is missing its name, licence, notice or licence file");
+ var duplicate = credits.GroupBy(credit => credit.LicenceFile).FirstOrDefault(group => group.Count() > 1);
+ if (duplicate != null) throw new InvalidOperationException($"Licence file {duplicate.Key} is credited twice");
+ }
+}
diff --git a/Assets/Scripts/ServerShared/Scenarios/TutorialGalaxy.cs.meta b/Assets/Scripts/ServerShared/Credits.cs.meta
similarity index 83%
rename from Assets/Scripts/ServerShared/Scenarios/TutorialGalaxy.cs.meta
rename to Assets/Scripts/ServerShared/Credits.cs.meta
index 3f7c8777a..e88730bb6 100644
--- a/Assets/Scripts/ServerShared/Scenarios/TutorialGalaxy.cs.meta
+++ b/Assets/Scripts/ServerShared/Credits.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 94d688b37c5044dd9b67865c706d8918
+guid: b3333d3c0203441fbadd64fad27b60e5
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs
index 2394a6134..9edf45e19 100644
--- a/Assets/Scripts/ServerShared/Entity.cs
+++ b/Assets/Scripts/ServerShared/Entity.cs
@@ -1261,13 +1261,15 @@ public abstract class Entity
// This observer's stance toward `other`: its own override, else its belief. Allies (the observer's own non-null faction) are
// known by datalink; any other contact is believed by the telemetry received with its track, and unknown (never hostile)
- // without it. In a zone owned by a faction a contact is hostile when its claimed faction is the owner's and the owner does
- // not permit its presence, or when this is the owner's ship and believes the contact trespasses.
+ // without it. A contact whose claimed faction this observer's faction Hates is hostile in any zone, owned or not; Hostile to
+ // Beloved govern presence instead. In a zone owned by a faction a contact is hostile when its claimed faction is the owner's and
+ // the owner does not permit its presence, or when this is the owner's ship and believes the contact trespasses.
public bool IsHostileTo(Entity other)
{
if (_iffOverrides.TryGetValue(other, out var overrideHostile)) return overrideHostile;
if (Faction != null && other.Faction == Faction) return false;
if (!_telemetry.TryGetValue(other, out var claimed)) return false;
+ if (Regard(Faction, claimed) == FactionRelationship.Hated) return true;
var owner = Zone.GalaxyZone.Owner;
if (owner == null) return false;
return (claimed == owner && !(PresencePermitted?.Value ?? true)) || (Faction == owner && BelievesTrespassing(other));
@@ -1300,14 +1302,27 @@ public abstract class Entity
return false;
}
- // TODO: Inter-faction relationships
+ // How `faction` regards this entity's faction.
public FactionRelationship GetFactionRelationship(Faction faction)
{
if (faction == null)
return FactionRelationship.Neutral;
if (this is Ship {IsPlayerShip: true})
return Zone.Galaxy.FactionRelationships[faction];
- return faction == Faction ? FactionRelationship.Beloved : FactionRelationship.Neutral;
+ return Regard(faction, Faction);
+ }
+
+ // The one reader of Faction.Relations: how `regarding` regards `regarded`. Unset either side is Neutral, a faction regards
+ // itself Beloved, and absent from the map is Neutral. A faction the catalog does not hold has no key and is Neutral.
+ private FactionRelationship Regard(Faction regarding, Faction regarded)
+ {
+ if (regarding == null || regarded == null) return FactionRelationship.Neutral;
+ if (regarding == regarded) return FactionRelationship.Beloved;
+ if (regarding.Relations == null || regarding.Relations.Count == 0) return FactionRelationship.Neutral;
+ var key = ItemManager.ItemData.TryGetHandle(regarded)?.Key;
+ return key != null && regarding.Relations.TryGetValue(new CultRecordRef(key.Value), out var relationship)
+ ? relationship
+ : FactionRelationship.Neutral;
}
public static bool IsPresencePermitted(FactionRelationship relationship, SecurityLevel securityLevel) =>
@@ -1525,7 +1540,8 @@ public abstract class Entity
// Check whether the given item will fit when its origin is placed at the given coordinate. For hardpoint gear,
// hardpoint is the one hardpoint the item would occupy there (HardpointAt); Tool gear occupies none.
- private bool ItemFits(EquippableItemData itemData, HullData hullData, EquippableItem item, int2 hullCoord, out HardpointData hardpoint)
+ private bool ItemFits(EquippableItemData itemData, HullData hullData, EquippableItem item, int2 hullCoord, out HardpointData hardpoint,
+ EquippedItem moving = null)
{
hardpoint = null;
// Items without specific hardpoints on the ship can be freely rotated and placed anywhere
@@ -1538,49 +1554,64 @@ public abstract class Entity
// general gear may take it until hardpoint gear claims it, which is the same rule
// UnoccupiedSpace reports, so what generation is offered and what equipping accepts agree.
var itemCoord = hullCoord + itemData.Shape.Rotate(i, item.Rotation);
- if (!hullData.InteriorCells[itemCoord] || GearOccupancy[itemCoord.x, itemCoord.y] != null)
+ if (!hullData.InteriorCells[itemCoord] || !IsFree(itemCoord.x, itemCoord.y, moving))
return false;
}
}
else
{
- hardpoint = HardpointAt(itemData, hullData, hullCoord);
+ hardpoint = HardpointAt(itemData, hullData, hullCoord, item.Rotation, moving);
if (hardpoint == null) return false;
- item.Rotation = hardpoint.Rotation;
}
return true;
}
+ // A cell is free when no gear occupies it, or when the only occupant is the item being moved: a re-place of
+ // equipped gear is judged against the hull minus that item's own cells (the caller unequips, then equips).
+ private bool IsFree(int x, int y, EquippedItem moving) => GearOccupancy[x, y] == null || GearOccupancy[x, y] == moving;
+
// The one placement rule for hardpoint gear. At this origin the item lies within a hardpoint of its type, turned to
// that hardpoint's rotation (HardpointData.TakesAt, the fit rule); its own cells are free, since a hardpoint's
// leftover cells may hold general gear (operator, 2026-09-30: "saving slots in a hardpoint can be a valid tradeoff
- // for crowded ships"); and that hardpoint holds no other hardpoint item, since it holds one at most.
- private HardpointData HardpointAt(EquippableItemData itemData, HullData hullData, int2 hullCoord)
+ // for crowded ships"); and that hardpoint holds no other hardpoint item, since it holds one at most. Where several hardpoints accept the origin, the
+ // one whose rotation equals the item's own (saved) rotation is preferred, so reload seats gear where it was; an item whose
+ // rotation names none of them takes the first (stable order).
+ private HardpointData HardpointAt(EquippableItemData itemData, HullData hullData, int2 hullCoord, ItemRotation seated, EquippedItem moving)
{
- foreach (var hardpoint in hullData.Hardpoints)
+ foreach (var hardpoint in hullData.Hardpoints.OrderBy(h => h.Rotation == seated ? 0 : 1))
{
if (!hardpoint.TakesAt(itemData, hullCoord - hardpoint.Position)) continue;
var ownCellsFree = itemData.Shape.Coordinates
.Select(v => hullCoord + itemData.Shape.Rotate(v, hardpoint.Rotation))
- .All(c => GearOccupancy[c.x, c.y] == null);
+ .All(c => IsFree(c.x, c.y, moving));
var holdsAnother = hardpoint.Shape.Coordinates
.Select(v => GearOccupancy[hardpoint.Position.x + v.x, hardpoint.Position.y + v.y])
- .Any(occupant => occupant != null && occupant.Data.HardpointType != HardpointType.Tool);
+ .Any(occupant => occupant != null && occupant != moving && occupant.Data.HardpointType != HardpointType.Tool);
if (ownCellsFree && !holdsAnother) return hardpoint;
}
return null;
}
- // Check whether the given item will fit when its origin is placed at the given coordinate on the hull
- public bool ItemFits(EquippableItem item, int2 hullCoord)
+ // Check whether the given item will fit when its origin is placed at the given coordinate on the hull. An item that
+ // is already equipped here is judged without its own cells, so a gun can be moved within its own hardpoint;
+ // TryEquip stays strict (it never sees an item as its own occupant), so equipping an equipped item twice is refused.
+ public bool ItemFits(EquippableItem item, int2 hullCoord) => ItemFits(item, hullCoord, out _);
+
+ // As above, and reports the rotation TryEquip would seat the item at: its hardpoint's for hardpoint gear, otherwise
+ // its own. A probe never writes item.Rotation; TryEquip is the only seat.
+ public bool ItemFits(EquippableItem item, int2 hullCoord, out ItemRotation seated)
{
+ seated = item.Rotation;
// Don't allow equipping while deployed
if (_active) return false;
var itemData = ItemManager.GetData(item);
var hullData = ItemManager.GetData(Hull) as HullData;
- return ItemFits(itemData, hullData, item, hullCoord, out _);
+ if (!ItemFits(itemData, hullData, item, hullCoord, out var hardpoint, Equipment.FirstOrDefault(e => e.EquippableItem == item)))
+ return false;
+ seated = hardpoint?.Rotation ?? item.Rotation;
+ return true;
}
public bool TryFindSpace(EquippableItem item, out int2 hullCoord)
@@ -1653,7 +1684,9 @@ public abstract class Entity
var hullData = ItemManager.GetData(Hull) as HullData;
if (!ItemFits(itemData, hullData, item, hullCoord, out var hardpoint)) return false;
-
+ // The one seat of hardpoint gear's rotation, before EquippedItem's ctor reads it.
+ if (hardpoint != null) item.Rotation = hardpoint.Rotation;
+
EquippedItem equippedItem;
if (itemData.HardpointType == HardpointType.Tool)
{
@@ -2458,7 +2491,7 @@ public class EquippedCargoBay : EquippedItem
// For simple commodities, search for existing item stacks to add to
foreach (var cargoItem in Cargo.Keys)
{
- if (!item.Data.Key.Equals(cargoItem.Data.Key)) continue;
+ if (!item.Data.Key.Equals(cargoItem.Data.Key) || item.Lot != cargoItem.Lot) continue;
var cargoCommodity = (SimpleCommodity) cargoItem;
if (cargoCommodity.Quantity >= itemData.MaxStack) continue;
@@ -2556,7 +2589,7 @@ public class EquippedCargoBay : EquippedItem
ItemsOfType[item.Data.Key] = new List();
ItemsOfType[item.Data.Key].Add(item);
}
- else if (Occupancy[cargoCoord.x, cargoCoord.y] is SimpleCommodity cargoCommodity && cargoCommodity.Data.Key.Equals(item.Data.Key))
+ else if (Occupancy[cargoCoord.x, cargoCoord.y] is SimpleCommodity cargoCommodity && cargoCommodity.Data.Key.Equals(item.Data.Key) && cargoCommodity.Lot == item.Lot)
{
if (cargoCommodity.Quantity + item.Quantity <= itemData.MaxStack)
{
@@ -2636,7 +2669,7 @@ public class EquippedCargoBay : EquippedItem
item.Quantity -= quantity;
Mass -= itemData.Mass * quantity;
ThermalMass -= itemData.Mass * itemData.SpecificHeat * quantity;
- return new SimpleCommodity{Data = item.Data, Quantity = quantity, Rotation = item.Rotation};
+ return new SimpleCommodity{Data = item.Data, Lot = item.Lot, Quantity = quantity, Rotation = item.Rotation};
}
public void Remove(CraftedItemInstance item)
diff --git a/Assets/Scripts/ServerShared/EntitySerializer.cs b/Assets/Scripts/ServerShared/EntitySerializer.cs
index 7f0f04ebd..73656b87e 100644
--- a/Assets/Scripts/ServerShared/EntitySerializer.cs
+++ b/Assets/Scripts/ServerShared/EntitySerializer.cs
@@ -60,8 +60,8 @@ public static class EntitySerializer
&& itemManager.GetData(commodity).MaxStack >= 1)
{
var maxStack = itemManager.GetData(commodity).MaxStack;
- var first = new SimpleCommodity { Data = commodity.Data, Rotation = commodity.Rotation, Quantity = maxStack };
- var rest = new SimpleCommodity { Data = commodity.Data, Rotation = commodity.Rotation, Quantity = commodity.Quantity - maxStack };
+ var first = new SimpleCommodity { Data = commodity.Data, Lot = commodity.Lot, Rotation = commodity.Rotation, Quantity = maxStack };
+ var rest = new SimpleCommodity { Data = commodity.Data, Lot = commodity.Lot, Rotation = commodity.Rotation, Quantity = commodity.Quantity - maxStack };
if (!bay.TryStore(first, position)) rest.Quantity += first.Quantity;
spill.Add((bay, rest));
return;
@@ -82,7 +82,7 @@ public static class EntitySerializer
var remaining = rest.Quantity;
while (remaining > 0)
{
- var chunk = new SimpleCommodity { Data = rest.Data, Rotation = rest.Rotation, Quantity = Math.Min(remaining, maxStack) };
+ var chunk = new SimpleCommodity { Data = rest.Data, Lot = rest.Lot, Rotation = rest.Rotation, Quantity = Math.Min(remaining, maxStack) };
var placed = home.TryStore(chunk) || bays.Where(b => b != home).Any(b => b.TryStore(chunk));
// A refused store may still have topped up a stack; what is left in the chunk found no room.
remaining -= Math.Min(remaining, maxStack) - (placed ? 0 : chunk.Quantity);
@@ -294,4 +294,7 @@ public abstract class EntityPack
return _price;
}
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(23)] [CultElementId] public string Id = "";
}
diff --git a/Assets/Scripts/ServerShared/Extensions.cs b/Assets/Scripts/ServerShared/Extensions.cs
index 97433a299..6ac7b5186 100644
--- a/Assets/Scripts/ServerShared/Extensions.cs
+++ b/Assets/Scripts/ServerShared/Extensions.cs
@@ -32,16 +32,13 @@ public static class Extensions
// Every loadable type assignable to this one. An assembly whose dependencies are missing (a Unity plugin
// referencing UnityEngine outside Unity) still yields the types that do load.
- private static readonly Dictionary ChildClasses = new Dictionary();
- public static Type[] GetAllChildClasses(this Type type)
+ // Read from parallel loaders (catalog validation, parallel tests), so the memo is concurrent.
+ private static readonly System.Collections.Concurrent.ConcurrentDictionary ChildClasses = new System.Collections.Concurrent.ConcurrentDictionary();
+ public static Type[] GetAllChildClasses(this Type type) => ChildClasses.GetOrAdd(type, t => AppDomain.CurrentDomain.GetAssemblies().SelectMany(assembly =>
{
- if (ChildClasses.TryGetValue(type, out var children)) return children;
- return ChildClasses[type] = AppDomain.CurrentDomain.GetAssemblies().SelectMany(assembly =>
- {
- try { return assembly.GetTypes(); }
- catch (ReflectionTypeLoadException e) { return e.Types.Where(t => t != null); }
- }).Where(type.IsAssignableFrom).ToArray();
- }
+ try { return assembly.GetTypes(); }
+ catch (ReflectionTypeLoadException e) { return e.Types.Where(x => x != null); }
+ }).Where(t.IsAssignableFrom).ToArray());
public static string SplitCamelCase(this string str) =>
Regex.Replace(Regex.Replace(str, @"(\P{Ll})(\P{Ll}\p{Ll})", "$1 $2"), @"(\p{Ll})(\P{Ll})", "$1 $2");
diff --git a/Assets/Scripts/ServerShared/FactionProduct.cs b/Assets/Scripts/ServerShared/FactionProduct.cs
index 14f7af57d..87ac72f7d 100644
--- a/Assets/Scripts/ServerShared/FactionProduct.cs
+++ b/Assets/Scripts/ServerShared/FactionProduct.cs
@@ -61,6 +61,9 @@ public class ProductRole
[Inspectable, JsonProperty("standardDeviation"), Key(2)]
public float StandardDeviation = .15f;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(3)] [CultElementId] public string Id = "";
}
// A bin of one of the maker's lines (ruling maker-design-tiers-allowed): the line it bins (the same design and maker, itself
diff --git a/Assets/Scripts/ServerShared/FireControl.cs b/Assets/Scripts/ServerShared/FireControl.cs
index 1581e3457..9102b16eb 100644
--- a/Assets/Scripts/ServerShared/FireControl.cs
+++ b/Assets/Scripts/ServerShared/FireControl.cs
@@ -7,6 +7,7 @@ using System.Buffers;
using System.Collections.Generic;
using System.Linq;
using CultMath;
+using GameCult.Caching;
using static CultMath.math;
using float2 = CultMath.float2;
using float3 = CultMath.float3;
@@ -84,10 +85,10 @@ public static class FireControl
// Whether the shooter's next round from this weapon is refused: the weapons ask before they spend anything, so
// a refused round costs no ammo, energy, sound, heat, wear or visibility (operator ruling 2026-09-30). The
// answer is Solve's own -- there is no second copy of the arming test.
- public static bool Refuses(Weapon weapon, Entity shooter) => Refuses(weapon, shooter, shooter.Target.Value.Entity);
+ public static bool Refuses(Weapon weapon, Entity shooter) => Refuses(weapon, shooter, shooter.Target.Value);
// The same answer against a target the shooter's pilot has commanded but not yet applied.
- public static bool Refuses(Weapon weapon, Entity shooter, Entity target) =>
+ public static bool Refuses(Weapon weapon, Entity shooter, TargetRef target) =>
!IsMineLayer(weapon) && Solve(weapon, weapon.Item, shooter, target).Outcome == FireOutcome.Refused;
// A mine layer lays a body, not a round: it is never refused, never arc-gated, and Fire routes it to Lay.
@@ -139,27 +140,18 @@ public static class FireControl
// The one owner of a gun's solution against its subject (the designated target; ruling controls-solution-subject).
// Bears: the gun can engage the subject, so the player fires on it without the aim. Free: the aim is inside the
// arc, so the gun can fire along it. Direction: where a round from this gun travels and where its barrel points --
- // the subject's intercept when it bears, else the arc-clamped aim. A chunk subject bears through its pose and
- // flies the aim, as an untargeted round (Subject is null for it). Derived on every read and never stored: turrets
+ // the subject's intercept when it bears (a rock's too), else the arc-clamped aim. Subject is null for a rock. Derived on every read and never stored: turrets
// traverse instantly in the simulation. Traverse is the weapon's Tracking (ruling mount-arc-gun-traverse), priced in
// TrackingRate; this holds no slew state, and a rig's slew is presentation. It never prices; HitProbability is the one price.
public static GunSolution Solution(Weapon weapon, Entity shooter, TargetRef subject)
{
- var bears = false;
- if (subject.Entity != null) bears = Bears(weapon, shooter, subject.Entity, out _);
- else if (subject.Chunk is ChunkId chunk)
- {
- var at = shooter.Zone.ChunkPose(chunk.Field, chunk.Index).xy;
- bears = InArc(weapon.Item, float3(at.x, 0, at.y) - shooter.Position);
- }
+ var bears = Bears(weapon, shooter, subject, out _);
return new GunSolution
{
Subject = subject.Entity,
Bears = bears,
Free = InArc(weapon.Item, shooter.Aim),
- Direction = bears && subject.Entity != null
- ? TravelDirection(weapon, shooter, subject.Entity)
- : AimDirection(weapon.Item, shooter)
+ Direction = bears ? TravelDirection(weapon, shooter, subject) : AimDirection(weapon.Item, shooter)
};
}
@@ -224,8 +216,8 @@ public static class FireControl
return degrees(abs(offset.x * relativeVelocity.y - offset.y * relativeVelocity.x) / (range * range));
}
- public static float AngularVelocity(Entity source, Entity target) =>
- AngularVelocity((target.Position - source.Position).xz, target.Velocity - source.Velocity);
+ public static float AngularVelocity(Entity source, TargetRef target) =>
+ AngularVelocity((PositionOf(source, target) - source.Position).xz, VelocityOf(source, target) - source.Velocity);
// The gun's rate times the ship's gear over the unaided baseline (ruling tracking-per-gun, "gun times ship"): the
// one product of the two. An unauthored gun is +infinity and so is its rate whatever the gear reads: a mount with no
@@ -241,14 +233,31 @@ public static class FireControl
// be judged against another. This is the one function; CombatState (and FireControl.Fire below) both call
// it instead of touching CultMath.first_order_intercept directly. Planar: source velocity is never fed in
// (no shooter here leads its own motion into the shot), matching every existing call site this replaces.
- public static float3 PredictedIntercept(Weapon weapon, Entity source, Entity target)
+ // Mining Cut 4b: a target is an entity or a rock; its position and velocity come from PositionOf and VelocityOf.
+ public static float3 PredictedIntercept(Weapon weapon, Entity source, TargetRef target)
{
- var targetVelocity = float3(target.Velocity.x, 0, target.Velocity.y);
+ var position = PositionOf(source, target);
+ var velocity = VelocityOf(source, target);
return weapon.Velocity > .01f
- ? first_order_intercept(source.Position, float3.zero, weapon.Velocity, target.Position, targetVelocity)
- : target.Position;
+ ? first_order_intercept(source.Position, float3.zero, weapon.Velocity, position, float3(velocity.x, 0, velocity.y))
+ : position;
}
+ // Where a target is now: an entity's position, a rock's pose at the shooter's height (everything here is planar).
+ private static float3 PositionOf(Entity source, TargetRef target)
+ {
+ if (target.Chunk is ChunkId chunk)
+ {
+ var at = source.Zone.ChunkPose(chunk.Field, chunk.Index).xy;
+ return float3(at.x, source.Position.y, at.y);
+ }
+ return target.Entity.Position;
+ }
+
+ // How fast a target moves: an entity's velocity, a rock's from Zone.ChunkVelocity, the one owner.
+ private static float2 VelocityOf(Entity source, TargetRef target) =>
+ target.Chunk is ChunkId chunk ? source.Zone.ChunkVelocity(chunk) : target.Entity.Velocity;
+
// Cut 3, R1/R3: the targeting solution (0b table) -- pure, no draw, recomputed fresh on every call. AI
// reads this to decide whether a shot is worth taking; the HUD reads it to draw a number; Fire below reads
// it once, at the instant the trigger is pulled, and freezes the result into the shot (R10, Q6). Two reads
@@ -263,13 +272,13 @@ public static class FireControl
// freezes (R10), gated exactly as HitProbability gates. Nothing about the target's facing or silhouette
// enters here; that is Silhouette's and PSpread's job, priced fresh by HitProbability below and again,
// live, by Commit at the commit tick. 0 the moment any gate closes.
- private static float PFire(Weapon weapon, Entity source, Entity target) => PFire(weapon, source, target, out _, out _, out _);
+ private static float PFire(Weapon weapon, Entity source, TargetRef target) => PFire(weapon, source, target, out _, out _, out _);
// The `out range` overload is HitProbability's own gate call -- one computation of `target.Position -
// source.Position`, not two. HitProbability used to recompute its own copy for PSpread, which is exactly
// the kind of split authority Cut 3 named as the risk (two places computing the same vector, free to
// drift or to have their subtraction order flipped in only one of them).
- private static float PFire(Weapon weapon, Entity source, Entity target, out float range) =>
+ private static float PFire(Weapon weapon, Entity source, TargetRef target, out float range) =>
PFire(weapon, source, target, out range, out _, out _);
// The one answer to "does the shooter hold valid targeting data on this target": visible, in range and locked
@@ -279,25 +288,29 @@ public static class FireControl
// visible, out of range) already denies the target. Planar (R7: the simulation is 2D): the range gate, the
// burst reach and the range clamp all measure the same distance, so a target's height never moves one of
// them without the others.
- public static bool Designated(Weapon weapon, Entity source, Entity target, out float range)
+ // Mining Cut 4b: a rock is designated by the same range gates, seen when Entity.ChunkVisible says so; a
+ // LockWeapon (a launcher) is never designated on a rock (ruling Q12 = A, 2026-09-30).
+ public static bool Designated(Weapon weapon, Entity source, TargetRef target, out float range)
{
range = 0f;
- if (target == null) return false;
- range = length((target.Position - source.Position).xz);
- return source.VisibleEntities.Contains(target) && range >= weapon.MinRange && range <= weapon.Range &&
+ if (target.IsNone) return false;
+ range = length((PositionOf(source, target) - source.Position).xz);
+ var inRange = range >= weapon.MinRange && range <= weapon.Range;
+ if (target.Chunk is ChunkId chunk) return inRange && !(weapon is LockWeapon) && source.ChunkVisible(chunk);
+ return source.VisibleEntities.Contains(target.Entity) && inRange &&
!(weapon is LockWeapon lockWeapon && !lockWeapon.IsLocked);
}
// Whether this gun can engage this target: designated and inside the arc. The one test of it; PFire prices a shot
// at zero unless it holds, and Solution reads it to decide whether the gun fires on the target. `designated` is
// the answer above, kept apart for Solve's burst flight: a designated target out of arc still sets the burst range.
- public static bool Bears(Weapon weapon, Entity source, Entity target, out float range) =>
+ public static bool Bears(Weapon weapon, Entity source, TargetRef target, out float range) =>
Bears(weapon, source, target, out range, out _);
- private static bool Bears(Weapon weapon, Entity source, Entity target, out float range, out bool designated)
+ private static bool Bears(Weapon weapon, Entity source, TargetRef target, out float range, out bool designated)
{
designated = Designated(weapon, source, target, out range);
- return designated && InArc(weapon.Item, target.Position - source.Position);
+ return designated && InArc(weapon.Item, PositionOf(source, target) - source.Position);
}
// `designated` is the answer above. `inArc` is Bears, asked only once a target is designated.
@@ -305,13 +318,14 @@ public static class FireControl
// (operator rulings 2026-09-30): without valid data it has no target and bursts at max range; with data but
// out of arc it bursts at the target's range, along the aim. The HUD reads Designated and the
// arc from Solve and Inspect and decides nothing.
- private static float PFire(Weapon weapon, Entity source, Entity target, out float range, out bool designated, out bool inArc)
+ private static float PFire(Weapon weapon, Entity source, TargetRef target, out float range, out bool designated, out bool inArc)
{
inArc = Bears(weapon, source, target, out range, out designated);
if (!inArc) return 0f;
var settings = source.ItemManager.GameplaySettings;
- var info = source.EntityInfoGathered.TryGetValue(target, out var gathered) ? gathered : 0f;
+ var info = target.Chunk is ChunkId chunk ? source.ChunkInfo(chunk)
+ : source.EntityInfoGathered.TryGetValue(target.Entity, out var gathered) ? gathered : 0f;
return Accuracy(source) * PSensor(settings, Resolution(source), info);
}
@@ -364,22 +378,33 @@ public static class FireControl
return (sil, pSpread, evasion);
}
- public static float HitProbability(Weapon weapon, Entity source, Entity target) =>
+ public static float HitProbability(Weapon weapon, Entity source, TargetRef target) =>
HitProbability(weapon, source, target, (AimTarget?) null);
// Priced on `aim` rather than the source's aim slot: the aim its pilot commands this step.
- public static float HitProbability(Weapon weapon, Entity source, Entity target, AimTarget aim) =>
+ public static float HitProbability(Weapon weapon, Entity source, TargetRef target, AimTarget aim) =>
HitProbability(weapon, source, target, (AimTarget?) aim);
// A null aim reads source.ResolvedAim, after the gate, so a gated-out shot reads nothing more.
- private static float HitProbability(Weapon weapon, Entity source, Entity target, AimTarget? aim)
+ // Mining Cut 4b: a rock is priced by the same factors as a ship at equal range, precision and info -- its disc
+ // through the same integrator, its evasion 0 (a rock is not a Ship), and no aim point: the disc is aimed at.
+ private static float HitProbability(Weapon weapon, Entity source, TargetRef target, AimTarget? aim)
{
var pFire = PFire(weapon, source, target, out var range);
if (pFire <= 0f) return 0f;
- var targetHull = source.ItemManager.GetData(target.Hull) as HullData;
- var (sil, pSpread, evasion) = Forecast(weapon, source, target, targetHull, Precision(source), range, aim ?? source.ResolvedAim);
- return pFire * PMount(AngularVelocity(source, target), TrackingRate(weapon, source)) * pSpread * sil.POnHull * PDeviation(evasion, Tracking(source));
+ var pMount = PMount(AngularVelocity(source, target), TrackingRate(weapon, source));
+ if (target.Chunk is ChunkId chunk)
+ {
+ var mass = RockMass(source.Zone, chunk, Precision(source), out var span);
+ var pSpreadRock = PSpread(weapon.Spread, span, range, source.ItemManager.GameplaySettings.SchematicCellSize);
+ return pFire * pMount * pSpreadRock * mass * PDeviation(0f, Tracking(source));
+ }
+
+ var entity = target.Entity;
+ var targetHull = source.ItemManager.GetData(entity.Hull) as HullData;
+ var (sil, pSpread, evasion) = Forecast(weapon, source, entity, targetHull, Precision(source), range, aim ?? source.ResolvedAim);
+ return pFire * pMount * pSpread * sil.POnHull * PDeviation(evasion, Tracking(source));
}
// Presentation only: the debug HUD's view of exactly the factors HitProbability multiplies. It computes
@@ -457,7 +482,7 @@ public static class FireControl
// at Fire (R10); HitProbability and Inspect recompute it fresh, at the current source/target positions,
// for their forecast. Below a length of 1e-6 (point-blank, source and intercept coincide) it falls back
// to world +z, the same fallback Apply used before this cut (`:463`).
- public static float2 TravelDirection(Weapon weapon, Entity source, Entity target)
+ public static float2 TravelDirection(Weapon weapon, Entity source, TargetRef target)
{
var toIntercept = (PredictedIntercept(weapon, source, target) - source.Position).xz;
return lengthsq(toIntercept) < 1e-6f ? float2(0, 1) : normalize(toIntercept);
@@ -505,12 +530,21 @@ public static class FireControl
// The commit price's deviation: what the target has already moved off the frozen forecast, plus what it can and
// does move off the line of fire (Evasion). The second part applies at any flight time, so an instant weapon
// (flight time 0, realized deviation 0) still feels a jinking target.
- public static float DeviationProbability(PendingShot shot, float now, out float deviation)
+ // Mining Cut 4b: a rock's deviation is where its pose is now against that projection, with no evasion; its
+ // zone is the shooter's (a shot that outlives its shooter is resolved by Step, which passes the zone it runs in).
+ public static float DeviationProbability(PendingShot shot, float now, out float deviation) =>
+ DeviationProbability(shot.Source?.Zone, shot, now, out deviation);
+
+ private static float DeviationProbability(Zone zone, PendingShot shot, float now, out float deviation)
{
+ deviation = 0f;
+ if (shot.Target == null && shot.Chunk == null) return 1f;
var elapsed = now - shot.FireTime;
var predicted = shot.FireTargetPosition + shot.FireTargetVelocity * elapsed;
- deviation = shot.Target == null ? 0f : length((shot.Target.Position - predicted).xz) + Evasion(shot.Target, shot.TravelDirection);
- return shot.Target == null ? 1f : PDeviation(deviation, shot.Tracking);
+ deviation = shot.Chunk is ChunkId chunk
+ ? length(zone.ChunkPose(chunk.Field, chunk.Index).xy - predicted.xz)
+ : length((shot.Target.Position - predicted).xz) + Evasion(shot.Target, shot.TravelDirection);
+ return PDeviation(deviation, shot.Tracking);
}
// How far a target can and does move off the line of fire in the solution window: the term DeviationProbability
@@ -608,7 +642,7 @@ public static class FireControl
// BurstReach the planar distance from the shooter at which the payload is delivered (a direct round's target, a fused
// round's burst point, 0 for an untargeted direct round), which Fire's range factor reads for every outcome. Refused: a fused round whose blast
// radius (its arming distance) exceeds the weapon's Range; it cannot be fired.
- public static FireSolution Solve(Weapon weapon, EquippedItem item, Entity source, Entity target)
+ public static FireSolution Solve(Weapon weapon, EquippedItem item, Entity source, TargetRef target)
{
var pFire = PFire(weapon, source, target, out var fireRange, out var designated, out var inArc);
@@ -639,14 +673,14 @@ public static class FireControl
// that leaves the zone cancels it like any other. A round whose Range is shorter than the arming distance
// cannot be fired at all: it is refused, per round, where Range is read after Execute refreshed it (a
// burst's later rounds and a power-starved Range included).
- var engaged = fuse != null && !(designated && inArc) ? null : target;
+ var engaged = fuse != null && !(designated && inArc) ? TargetRef.None : target;
var origin = source.Position;
var travelDirection = Solution(weapon, source, target).Direction;
var arming = fuse != null ? blastRadius : 0f;
- var burstPosition = engaged != null ? engaged.Position : origin;
+ var burstPosition = !engaged.IsNone ? PositionOf(source, engaged) : origin;
var flightDistance = 0f;
- if (fuse != null && engaged != null)
+ if (fuse != null && !engaged.IsNone)
{
// Nothing bursts beyond max range: an intercept a receding target leads the round past Range is
// pulled back along its own line to Range.
@@ -662,7 +696,7 @@ public static class FireControl
burstPosition = Armed(origin, travelDirection, arming, origin + float3(travelDirection.x, 0, travelDirection.y) * reach);
flightDistance = max(reach, arming);
}
- else if (engaged != null) flightDistance = fireRange;
+ else if (!engaged.IsNone) flightDistance = fireRange;
var solution = new FireSolution
{
@@ -710,8 +744,7 @@ public static class FireControl
Lay(weapon, item, source);
return 0;
}
- // Mining Cut 3: a chunk target fires as an untargeted round until Cut 4 routes shots at chunks.
- var target = source.Target.Value.Entity;
+ var target = source.Target.Value;
var now = zone.Time - age;
// R1's engage gate and the shooter-side probability, evaluated now and frozen: nothing at commit time
@@ -721,7 +754,7 @@ public static class FireControl
var solution = Solve(weapon, item, source, target);
if (solution.Outcome == FireOutcome.Refused) return 0;
// The mount factor is frozen with the shooter-side probability: nothing at commit time re-reads the sweep.
- var pFire = solution.PFire * (solution.Engaged != null ? PMount(AngularVelocity(source, solution.Engaged), TrackingRate(weapon, source)) : 1f);
+ var pFire = solution.PFire * (!solution.Engaged.IsNone ? PMount(AngularVelocity(source, solution.Engaged), TrackingRate(weapon, source)) : 1f);
var fireRange = solution.FireRange;
var engaged = solution.Engaged;
var travelDirection = solution.TravelDirection;
@@ -732,10 +765,11 @@ public static class FireControl
var targetVelocity = float3.zero;
var targetPosition = origin;
- if (engaged != null)
+ if (!engaged.IsNone)
{
- targetVelocity = float3(engaged.Velocity.x, 0, engaged.Velocity.y);
- targetPosition = engaged.Position - targetVelocity * age;
+ var velocity = VelocityOf(source, engaged);
+ targetVelocity = float3(velocity.x, 0, velocity.y);
+ targetPosition = PositionOf(source, engaged) - targetVelocity * age;
}
var flightTime = weapon.Velocity > .01f ? solution.FlightDistance / weapon.Velocity : 0f;
@@ -746,7 +780,8 @@ public static class FireControl
{
ShotId = zone.NextShotId(),
Source = source,
- Target = engaged,
+ Target = engaged.Entity,
+ Chunk = engaged.Chunk,
Weapon = item,
Aimed = aim.Item,
AimedMount = aim.Mount,
@@ -773,7 +808,7 @@ public static class FireControl
// The commit horizon exists so the target's facing can be read late (Bearing timing). A round fired at
// nothing has no facing to read, so it commits at Fire: its burst point is decided from the poses of
// the moment it leaves, and a Contact round short of max range can arrive as early as it truly does.
- CommitTime = fuse != null && engaged == null ? now : now + max(0f, flightTime - commitHorizon),
+ CommitTime = fuse != null && engaged.IsNone ? now : now + max(0f, flightTime - commitHorizon),
BurstPosition = burstPosition,
Fuse = fuse,
BlastRadius = blastRadius,
@@ -861,7 +896,7 @@ public static class FireControl
{
var shot = shots[i];
- var targetGone = shot.Target != null && !zone.Entities.Contains(shot.Target);
+ var targetGone = TargetGone(zone, shot);
if (targetGone)
{
// Cut 11 (Soul C4): a shot whose target has left the zone resolves as a miss whichever
@@ -908,7 +943,7 @@ public static class FireControl
if (i < 0) continue;
var shot = shots[i];
- var targetGone = shot.Target != null && !zone.Entities.Contains(shot.Target);
+ var targetGone = TargetGone(zone, shot);
if (targetGone)
{
// As in the commit walk: a shot whose target left the zone in this step resolves as a miss.
@@ -930,6 +965,10 @@ public static class FireControl
}
}
+ // A shot's target has left the zone, or a rock it flies at no longer exists (broken in flight): the shot is a miss.
+ private static bool TargetGone(Zone zone, PendingShot shot) =>
+ (shot.Target != null && !zone.Entities.Contains(shot.Target)) || (shot.Chunk is ChunkId chunk && !zone.ChunkExists(chunk));
+
// R3/R4: the one roll. p_base was frozen at fire, PFire carrying the mount factor; the only thing measured live is how far the target has
// actually strayed, by now, from where a straight-line projection of its fire-time velocity said it would
// be -- forgiven by the targeting system's Tracking, likewise frozen at fire.
@@ -945,15 +984,25 @@ public static class FireControl
// (bearing) -- is read live, here, at the commit tick. The Cut 7 guard extends to cover the new factors:
// when PFire x pDeviation is already 0, no Silhouette is built. Shared by Commit's own roll and by the
// debug HUD's forecast (TheHudEstimateIsTheCommitPrice) -- one function, one commit-time price.
- public static float CommitProbability(PendingShot shot, float now, out Silhouette sil)
+ public static float CommitProbability(PendingShot shot, float now, out Silhouette sil) =>
+ CommitProbability(shot.Source?.Zone, shot, now, out sil);
+
+ // Mining Cut 4b: a rock's price is PFire x PDeviation x PSpread(span 2R) x the disc's mass; it reads no hull.
+ private static float CommitProbability(Zone zone, PendingShot shot, float now, out Silhouette sil)
{
sil = default;
- if (shot.Target == null) return 0f;
+ if (shot.Target == null && shot.Chunk == null) return 0f;
- var pDeviation = DeviationProbability(shot, now, out _);
+ var pDeviation = DeviationProbability(zone, shot, now, out _);
var p = shot.PFire * pDeviation;
if (p <= 0f) return 0f;
+ if (shot.Chunk is ChunkId chunk)
+ {
+ var mass = RockMass(zone, chunk, shot.Precision, out var span);
+ return p * PSpread(shot.Spread, span, shot.FireRange, zone.SchematicCellSize) * mass;
+ }
+
var bearing = Bearing(shot.Target, shot.TravelDirection);
var hullData = shot.Target.ItemManager.GetData(shot.Target.Hull) as HullData;
sil = Silhouette(shot.Target, hullData, shot.Aimed, bearing, shot.Precision, null, shot.AimedMount);
@@ -984,7 +1033,7 @@ public static class FireControl
// drawing once is the documented way to get a correlated first output, and a follow-up to give
// CultMath.Random a mixed-seed entry point of its own is recorded for a separate CultLib cut.
var random = new Random(SimulationDice.Mix((zone.CombatSeed * 2654435761u) ^ (uint) shot.ShotId | 1u));
- var p = CommitProbability(shot, now, out var sil);
+ var p = CommitProbability(zone, shot, now, out var sil);
var hit = p > 0f && random.NextFloat() < p;
var cell = int2.zero;
@@ -993,7 +1042,8 @@ public static class FireControl
var shielded = false;
var shieldBroken = false;
- if (hit)
+ // A rock hit has no lane and no shield: Cell, Bearing and Lateral stay zero (Apply wears the rock).
+ if (hit && shot.Chunk == null)
{
// Cut 12.2: the same silhouette pOnHull drew its mass from -- same bearing (live, at this commit
// tick), same sigma (the frozen Precision). A shot that passed the roll always lands on metal (R3:
@@ -1185,7 +1235,13 @@ public static class FireControl
// Detonate is still the one blast path.
if (shot.Outcome.Result == ShotResult.Burst || shot.Fuse == WeaponFuse.Proximity)
{
- Detonate(zone, shot.Outcome.BurstPoint, shot.BlastRadius, shot.Damage, shot.DamageType);
+ Detonate(zone, shot.Outcome.BurstPoint, shot.BlastRadius, shot.Damage, shot.DamageType, shot);
+ return;
+ }
+
+ if (shot.Chunk is ChunkId rock)
+ {
+ ApplyRockHit(zone, shot, rock);
return;
}
@@ -1201,6 +1257,28 @@ public static class FireControl
}
}
+ // Mining Cut 4b: a committed hit on a rock. A round without a fuse wears the rock by its Damage (the falloff was
+ // read at Fire) and publishes one absorb on the zone's ChunkCapabilities (through Publish, at height 0 like a blast's), at the
+ // rock's surface facing the shot and before the wear shrinks it. A contact or delayed round detonates at the rock's centre as it arrives (the
+ // arming rule kept), through Detonate, the one area owner.
+ private static void ApplyRockHit(Zone zone, PendingShot shot, ChunkId rock)
+ {
+ if (!shot.Outcome.Hit) return;
+
+ var centre = zone.ChunkPose(rock.Field, rock.Index).xy;
+ if (shot.Fuse == null)
+ {
+ var direction = float3(shot.TravelDirection.x, 0, shot.TravelDirection.y);
+ var surface = centre - shot.TravelDirection * zone.ChunkRadius(rock);
+ Publish(zone.ChunkCapabilities, AbsorbLayer.Hull, float3(surface.x, 0f, surface.y), direction, shot.Damage, shot.DamageType);
+ var absorbed = zone.Wear(rock, shot.Damage);
+ Extract(zone, rock, absorbed, shot.Source, SimulationDice.For(zone.DropSeed, SimulationDice.OreStream, (uint) shot.ShotId));
+ return;
+ }
+ var point = Armed(shot.FireOrigin, shot.TravelDirection, shot.BlastRadius, float3(centre.x, shot.FireOrigin.y, centre.y)).xz;
+ Detonate(zone, point, shot.BlastRadius, shot.Damage, shot.DamageType, shot);
+ }
+
// Cut 12.3 (docs/fire-control-cut.md, "How a direct hit travels"): replaces Entity.ApplyHit's 0.5-step
// march and Entity.DamageSchematic's even split over the whole hit shape. Spread is width (Q12-2 = A):
// 2n+1 parallel lanes, sharing the shot's damage evenly over whichever lanes actually meet metal -- the
@@ -1221,7 +1299,7 @@ public static class FireControl
if (shot.Outcome.Shielded)
{
- Publish(shot.Target, AbsorbLayer.Shield, ImpactPoint(shot.Target, shot.Outcome.Cell),
+ Publish(shot.Target.Capabilities, AbsorbLayer.Shield, ImpactPoint(shot.Target, shot.Outcome.Cell),
float3(shot.TravelDirection.x, 0, shot.TravelDirection.y), shot.Damage, shot.DamageType);
shot.Target.Shield.TakeHit(shot.DamageType, shot.Damage);
return;
@@ -1266,7 +1344,7 @@ public static class FireControl
for (var li = 0; li < laneCount; li++) ArrayPool.Shared.Return(buffers[li]);
- Publish(target, AbsorbLayer.Hull, ImpactPoint(target, shot.Outcome.Cell),
+ Publish(target.Capabilities, AbsorbLayer.Hull, ImpactPoint(target, shot.Outcome.Cell),
float3(shot.TravelDirection.x, 0, shot.TravelDirection.y), shot.Damage, shot.DamageType);
target.DamageHull(hullDamage);
}
@@ -1278,17 +1356,18 @@ public static class FireControl
return float3(world.x, target.Position.y, world.y);
}
- // The one publisher of an absorbed impact: once per receiver, on its Capabilities, before the damage it reports.
- private static void Publish(Entity receiver, AbsorbLayer layer, float3 position, float3 direction, float magnitude, DamageType damageType) =>
- receiver.Capabilities.PublishAbsorb(new AbsorbEvent(position, direction, magnitude, damageType, layer));
+ // The one publisher of an absorbed impact: once per receiver, on its CapabilityEvents (an entity's, or the zone's
+ // for a rock), before the damage it reports.
+ private static void Publish(CapabilityEvents receiver, AbsorbLayer layer, float3 position, float3 direction, float magnitude, DamageType damageType) =>
+ receiver.PublishAbsorb(new AbsorbEvent(position, direction, magnitude, damageType, layer));
- // A blast's impact on one entity: at the blast point (on the entity's height), travelling from the blast out through
- // the entity's centre, or zero when they coincide.
- private static void PublishBlast(Entity entity, float2 blast, AbsorbLayer layer, float magnitude, DamageType damageType)
+ // A blast's impact on one receiver: at the blast point (at the receiver's height), travelling from the blast out
+ // through the receiver's planar centre, or zero when they coincide. An entity and a rock go through it alike.
+ private static void PublishBlast(CapabilityEvents receiver, float2 centre, float height, float2 blast, AbsorbLayer layer, float magnitude, DamageType damageType)
{
- var away = entity.Position.xz - blast;
+ var away = centre - blast;
var direction = lengthsq(away) > 0f ? normalize(away) : float2.zero;
- Publish(entity, layer, float3(blast.x, entity.Position.y, blast.y), float3(direction.x, 0, direction.y), magnitude, damageType);
+ Publish(receiver, layer, float3(blast.x, height, blast.y), float3(direction.x, 0, direction.y), magnitude, damageType);
}
// Cut 12.4(b) (docs/fire-control-cut.md, "Where P is"): a contact or delayed blast needs a committed hit --
@@ -1336,7 +1415,7 @@ public static class FireControl
// the muzzle than the blast radius is detonated on at the radius, along the round's own flight line.
var hullPoint = target.ToWorldPoint(schematicPoint);
var worldPoint = Armed(shot.FireOrigin, shot.TravelDirection, shot.BlastRadius, float3(hullPoint.x, shot.FireOrigin.y, hullPoint.y)).xz;
- Detonate(target.Zone, worldPoint, shot.BlastRadius, shot.Damage, shot.DamageType);
+ Detonate(target.Zone, worldPoint, shot.BlastRadius, shot.Damage, shot.DamageType, shot);
}
// Cut 12.4(b) (docs/fire-control-cut.md, "The penetrator", Q12-8): the one penetration-reach owner, moved
@@ -1593,6 +1672,7 @@ public static class FireControl
ShotId = shot.ShotId,
Source = shot.Source,
Target = shot.Target,
+ Chunk = shot.Chunk,
Weapon = shot.Weapon,
Result = result,
Shielded = shielded,
@@ -1607,7 +1687,13 @@ public static class FireControl
// Cut 12.4(b) (docs/fire-control-cut.md, "Area, per entity"): the one owner of blast damage -- a blast is
// an area, not a bundle of rays (Q12-7 dissolved the ray model's remainder question along with the rays
- // themselves). Splash's signature with the point made planar (R7). Callers: Apply's three fuse branches. Nothing draws: every candidate entity in radius takes its share, unconditionally.
+ // themselves). Splash's signature with the point made planar (R7). Callers: Apply's three fuse branches and
+ // Zone's mine step. Nothing draws: every candidate entity in radius takes its share, unconditionally.
+ //
+ // Mining cut 4a (docs/mining-cut-refresh.md, Q10 = A): this is also the one owner of blast area over rocks.
+ // After the entity pass, every unbroken rock whose disc the blast disc overlaps takes its lens share of the
+ // damage -- damage * lens / (pi r^2), the cells' own normaliser -- through Zone.Wear, and publishes one absorb
+ // on Zone.ChunkCapabilities first. Overlapping bodies each take their own overlap; shares off every body are lost.
//
// For each candidate (an entity whose centre lies within radius plus half its own hull diagonal --
// CandidatesIncludeHullsWhoseCentreIsOutsideTheRadius, which Splash's centre-distance cull could not pass):
@@ -1631,7 +1717,7 @@ public static class FireControl
// call: doing so would buy no behaviour, per ProbeC in the cut doc). Leftovers -- unoccupied-cell shares,
// and whatever an item's pool does not absorb -- join one entity-wide hull total, applied through one
// DamageHull call.
- public static void Detonate(Zone zone, float2 worldPlanar, float radius, float damage, DamageType damageType)
+ public static void Detonate(Zone zone, float2 worldPlanar, float radius, float damage, DamageType damageType, PendingShot? shot = null)
{
// No distance prefilter: RectDiskOverlap is the one decider of whether the disc touches a hull. A
// prefilter measured from Position (the centre of mass) with the bounding box's half-diagonal is not a
@@ -1673,7 +1759,7 @@ public static class FireControl
{
if (shield.CanTakeHit(damageType, totalShare))
{
- PublishBlast(entity, worldPlanar, AbsorbLayer.Shield, totalShare, damageType);
+ PublishBlast(entity.Capabilities, entity.Position.xz, entity.Position.y, worldPlanar, AbsorbLayer.Shield, totalShare, damageType);
shield.TakeHit(damageType, totalShare);
continue;
}
@@ -1703,11 +1789,112 @@ public static class FireControl
for (var i = 0; i < amounts.Length; i++) hullTotal += amounts[i];
}
- PublishBlast(entity, worldPlanar, AbsorbLayer.Hull, totalShare, damageType);
+ PublishBlast(entity.Capabilities, entity.Position.xz, entity.Position.y, worldPlanar, AbsorbLayer.Hull, totalShare, damageType);
entity.DamageHull(hullTotal);
}
+
+ if (!(radius > 0f) || zone.AsteroidBelts.Count == 0) return; // no area, or no rocks to cover
+ // Rocks, through the targeting index (no observer: entities stay out of it). Reach is exact on a rock's
+ // centre, so it is the blast radius plus the widest any rock can be. Walked in (field, index) order so the
+ // order of wear -- and any later dice on it -- is fixed.
+ var rocks = _rockScratch ??= new List();
+ zone.Targets.Within(new TargetSearch(worldPlanar, radius + Zone.LargestChunkRadius(zone.Settings)), rocks);
+ rocks.RemoveAll(c => !c.Target.Chunk.HasValue);
+ rocks.Sort((a, b) =>
+ {
+ var byField = string.CompareOrdinal(a.Target.Chunk.Value.Field.Value, b.Target.Chunk.Value.Field.Value);
+ return byField != 0 ? byField : a.Target.Chunk.Value.Index.CompareTo(b.Target.Chunk.Value.Index);
+ });
+ var discArea = PI * radius * radius;
+ // Mining Cut 5a: a shot's blast pays its Source for the rocks it wears, from the shot's own dice, once for the
+ // blast, drawn in the rock order above. A mine (no shot) wears rocks and yields nothing.
+ var dice = shot != null ? SimulationDice.For(zone.DropSeed, SimulationDice.OreStream, (uint) shot.Value.ShotId) : default;
+ foreach (var rock in rocks)
+ {
+ var chunk = rock.Target.Chunk.Value;
+ if (!zone.ChunkExists(chunk)) continue;
+ var centre = zone.ChunkPose(chunk.Field, chunk.Index).xy;
+ var share = damage * CircleCircleOverlap(length(centre - worldPlanar), radius, zone.ChunkRadius(chunk)) / discArea;
+ if (!(share > 0f)) continue;
+ PublishBlast(zone.ChunkCapabilities, centre, 0f, worldPlanar, AbsorbLayer.Hull, share, damageType);
+ var absorbed = zone.Wear(chunk, share);
+ if (shot != null) Extract(zone, chunk, absorbed, shot.Value.Source, dice);
+ }
}
+ // Mining Cut 5a: the one loot owner of a rock. A worn rock pays the shooter at the wear site, at arrival or detonation,
+ // from the shot's own dice: the damage it absorbed is that fraction of its hitpoints, and the same fraction of the
+ // units its size authors (AsteroidYield), so a rock pays its whole yield however many hits break it. Whole units, and
+ // one Bernoulli draw on the fraction. Each unit draws an ore by weight: the belt's yields for this province, scaled by
+ // exp(variance x g), g a stable hash of (field, index, ore) in [-1, 1) -- a rock's composition, derived here every call
+ // and never stored. A shot with no Source (a mine) yields nothing. The units go to the shooter's cargo bays in
+ // stacks; what does not fit, or everything when the shooter has left the zone, floats at the rock (ruling
+ // mining-overflow-floats).
+ // Draw order: the Bernoulli, then one draw per unit.
+ public static void Extract(Zone zone, ChunkId chunk, float absorbed, Entity shooter, Random dice)
+ {
+ if (shooter == null || !(absorbed > 0f)) return;
+ var settings = zone.Settings;
+ var belt = zone.AsteroidBelts[chunk.Field];
+ var catalog = shooter.ItemManager.ItemData;
+ var ores = FieldKinds.Yield(belt.Data.Kind, zone.GalaxyZone?.Province?.Type ?? default, catalog);
+ if (ores.Length == 0) return;
+
+ var size = belt.Data.Asteroids[chunk.Index].Size;
+ var owed = absorbed / settings.AsteroidHitpoints.Evaluate(size) * settings.AsteroidYield.Evaluate(size);
+ var units = (int) floor(owed);
+ if (dice.NextFloat() < owed - units) units++;
+ if (units == 0) return;
+
+ var weights = new float[ores.Length];
+ var total = 0f;
+ for (var i = 0; i < ores.Length; i++)
+ {
+ var g = $"{chunk.Field.Value}:{chunk.Index}:{ores[i].Commodity.Key.Value}".StableHash() / 2147483648.0 - 1.0;
+ total += weights[i] = ores[i].Amount * (float) Math.Exp(settings.ChunkCompositionVariance * g);
+ }
+ var counts = new int[ores.Length];
+ for (var unit = 0; unit < units; unit++)
+ {
+ var pick = dice.NextFloat() * total;
+ var ore = 0;
+ while (ore < ores.Length - 1 && pick >= weights[ore]) pick -= weights[ore++];
+ counts[ore]++;
+ }
+
+ var at = zone.ChunkPose(chunk.Field, chunk.Index).xy;
+ var velocity = zone.ChunkVelocity(chunk);
+ var zoneIndex = zone.Galaxy?.Zones == null ? -1 : Array.IndexOf(zone.Galaxy.Zones, zone.GalaxyZone);
+ var present = zone.Entities.Contains(shooter);
+ for (var i = 0; i < ores.Length; i++)
+ {
+ var key = ores[i].Commodity.Key;
+ var commodity = (SimpleCommodityData) catalog.Get(ores[i].Commodity);
+ var maxStack = Math.Max(1, commodity.MaxStack);
+ var lot = counts[i] > 0 ? shooter.ItemManager.ExtractedLot(zoneIndex, chunk.Field, commodity) : 0;
+ var adrift = 0;
+ for (var left = counts[i]; left > 0; left -= maxStack)
+ {
+ var stack = new SimpleCommodity { Data = new CultRecordRef(key), Lot = lot, Quantity = Math.Min(left, maxStack) };
+ // A partial store leaves the remainder in Quantity and returns false, so the next bay is offered the rest.
+ var stored = false;
+ if (present) foreach (var bay in shooter.CargoBays) if (stored = bay.TryStore(stack)) break;
+ if (!stored)
+ {
+ adrift += stack.Quantity;
+ zone.Release(stack, at, velocity);
+ }
+ }
+ if (counts[i] > 0)
+ zone.CargoGained.OnNext(new CargoGain
+ {
+ Taker = shooter, Design = new CultRecordRef(key), Lot = lot, Stored = counts[i] - adrift, Adrift = adrift, Kind = GainKind.Mined
+ });
+ }
+ }
+
+ [ThreadStatic] private static List _rockScratch;
+
// Whether the disc reaches any occupied hull cell of the entity: Detonate's own coverage test (the same
// ToSchematicPoint, SchematicCellSize and CircleSquareOverlap), so what triggers a mine and what its blast
// reaches are one geometry.
@@ -1721,6 +1908,19 @@ public static class FireControl
return false;
}
+ // Mining cut 4a: the exact area shared by two discs at centre distance d -- the lens. Exactly zero when they are
+ // disjoint or tangent, and the smaller disc's whole area when one contains the other.
+ public static float CircleCircleOverlap(float d, float r1, float r2)
+ {
+ if (r1 <= 0f || r2 <= 0f || d >= r1 + r2) return 0f;
+ var small = min(r1, r2);
+ if (d <= abs(r1 - r2)) return PI * small * small;
+ var a = (d * d + r1 * r1 - r2 * r2) / (2f * d * r1);
+ var b = (d * d + r2 * r2 - r1 * r1) / (2f * d * r2);
+ var k = (-d + r1 + r2) * (d + r1 - r2) * (d - r1 + r2) * (d + r1 + r2);
+ return r1 * r1 * acos(clamp(a, -1f, 1f)) + r2 * r2 * acos(clamp(b, -1f, 1f)) - .5f * sqrt(max(0f, k));
+ }
+
// Cut 12.4(b) (docs/fire-control-cut.md, "Exact overlap, in float"): the exact area of a unit square,
// centred on `cell` (the unit square centred on its integer coordinate, the same convention every other
// frame rule uses), that lies inside a disc of radius `r` centred at `diskCentre` -- both in the same
@@ -1876,9 +2076,7 @@ public static class FireControl
var aimPoint = ResolveAimPoint(target, hull, aimed, mount);
var a = dot(aimPoint, ell);
- var pOnHull = 0f;
- for (var i = 0; i < count; i++)
- pOnHull += Phi((intervals[i].Hi - a) / sigma) - Phi((intervals[i].Lo - a) / sigma);
+ var pOnHull = Mass(new ReadOnlySpan(intervals, 0, count), a, sigma);
var span = count > 0 ? intervals[count - 1].Hi - intervals[0].Lo : 0f;
@@ -1894,6 +2092,27 @@ public static class FireControl
};
}
+ // The one Gaussian integrator: the mass a normal of `sigma` about `aim` puts inside the merged, disjoint
+ // `intervals`. A hull's shadow and a rock's disc (one interval about its aim) both read it.
+ private static float Mass(ReadOnlySpan intervals, float aim, float sigma)
+ {
+ var mass = 0f;
+ foreach (var interval in intervals)
+ mass += Phi((interval.Hi - aim) / sigma) - Phi((interval.Lo - aim) / sigma);
+ return mass;
+ }
+
+ // A rock is a disc of radius R schematic cells aimed at its centre: one interval [-R, R] about the aim, span 2R.
+ // The one price of it, read by HitProbability's forecast and by Commit, at the rock's radius now.
+ private static float RockMass(Zone zone, ChunkId chunk, float precision, out float span)
+ {
+ var radius = zone.ChunkCells(chunk);
+ span = 2f * radius;
+ Span disc = stackalloc Interval[1];
+ disc[0] = new Interval { Lo = -radius, Hi = radius };
+ return saturate(Mass(disc, 0f, Sigma(precision)));
+ }
+
// Phi(z) = 1/2 (1 + erf(z / sqrt(2))): the standard normal CDF, CultMath's erf the one function underneath
// every Gaussian-mass sum this cut computes.
private static float Phi(float z) => .5f * (1f + erf(z * (1f / SQRT2)));
@@ -2054,6 +2273,9 @@ public struct PendingShot
public int ShotId;
public Entity Source;
public Entity Target;
+ // Mining Cut 4b: the rock a shot flies at, frozen at Fire; at most one of Target and Chunk is set. Unity reads
+ // Target only, so a rock shot draws untargeted until the Unity follow-up (mining-unity-chunk-presentation).
+ public ChunkId? Chunk;
public EquippedItem Weapon;
public EquippedItem Aimed;
// The mount the aim was at, when it was at a mount rather than an item (Entity.ResolvedAim at Fire), frozen with Aimed:
@@ -2113,7 +2335,7 @@ public struct PendingShot
// A fused round with no target: where it bursts is decided at its commit (the first hull its aim line meets), so its
// damage reads the falloff there rather than at Fire.
- public bool DeliveredAtCommit => Fuse != null && Target == null;
+ public bool DeliveredAtCommit => Fuse != null && Target == null && Chunk == null;
}
// What a round does when fired (FireControl.Solve): Direct resolves against its target, Burst detonates at a
@@ -2147,7 +2369,7 @@ public struct FireSolution
public float FireRange;
// Whether the shooter holds valid targeting data on the target (Designated); the HUD and the agents read it here.
public bool Designated;
- public Entity Engaged;
+ public TargetRef Engaged;
public float2 TravelDirection;
public float3 BurstPosition;
public WeaponFuse? Fuse;
@@ -2313,6 +2535,7 @@ public sealed class ShotOutcome
public int ShotId;
public Entity Source;
public Entity Target;
+ public ChunkId? Chunk;
public EquippedItem Weapon;
// What the commit decided, typed: a shot rolled and missed, rolled and hit, or was a fused round with no
// target and so burst without rolling, or a proximity round whose roll missed but which detonates anyway
diff --git a/Assets/Scripts/ServerShared/Galaxy.cs b/Assets/Scripts/ServerShared/Galaxy.cs
index 797e77764..929fa3493 100644
--- a/Assets/Scripts/ServerShared/Galaxy.cs
+++ b/Assets/Scripts/ServerShared/Galaxy.cs
@@ -26,7 +26,10 @@ public class Galaxy
public GalaxyZone Exit { get; private set; }
public Dictionary FactionRelationships { get; } = new Dictionary();
private Action Log { get; }
- public bool IsPrelude { get; }
+
+ // How far each faction's authored InfluenceDistance reaches in this galaxy (InfluenceOf): the cast's InfluenceScale,
+ // 1 for a main galaxy. Carried by the save because every zone generated after Continue reads it.
+ public float InfluenceScale { get; }
// The run's seed, minted once by GalaxyStage.SeedFrom and carried by the save (SavedGame.Seed). It seeds
// generation, the run's item draws (RunStart) and the zone's drop dice (Zone.DropSeed).
@@ -51,7 +54,9 @@ public class Galaxy
public Galaxy(CultCache cultCache, SavedGame savedGame, Action log)
{
- IsPrelude = savedGame.IsTutorial;
+ InfluenceScale = savedGame.InfluenceScale > 0
+ ? savedGame.InfluenceScale
+ : throw new InvalidOperationException($"the save has no {nameof(InfluenceScale)} ({savedGame.InfluenceScale}); a run saved before InfluenceScale existed cannot be continued");
_cache = cultCache;
Log = log;
Background = savedGame.Background;
@@ -112,7 +117,7 @@ public class Galaxy
uint seed)
{
_cache = cache;
- IsPrelude = false;
+ InfluenceScale = 1;
Background = background;
Log = log;
var factions = cache.GetAll();
@@ -186,11 +191,11 @@ public class Galaxy
return _cache.GetAll().FirstOrDefault(f => f.Name.StartsWith(name, StringComparison.InvariantCultureIgnoreCase));
}
- // A cast member of a prelude galaxy, by name. A name the catalog does not hold refuses the galaxy, naming the field.
+ // A cast member of a cast galaxy, by name. A name the catalog does not hold refuses the galaxy, naming the field.
private Faction ResolveCast(string field, string name) =>
ResolveFaction(name) ?? throw new InvalidOperationException($"cast faction {name} ({field}) is not in the catalog");
- // Gives a prelude galaxy its gate: the antagonist's home is the boss zone and the exit. The only writer of Exit
+ // Gives a cast galaxy its gate: the antagonist's home is the boss zone and the exit. The only writer of Exit
// besides the constructors.
public void PlaceGate(Faction antagonist)
{
@@ -198,23 +203,24 @@ public class Galaxy
Exit = HomeZones[antagonist];
}
- // How many jumps a faction's influence reaches in this galaxy: its authored distance, halved (rounding up) in a
- // prelude. Derived, never written back to the catalog's Faction, so one galaxy's generation cannot change the next.
+ // How many jumps a faction's influence reaches in this galaxy: its authored distance scaled by the galaxy's
+ // InfluenceScale (the cast decides the scale), rounding up. Derived, never written back to the catalog's Faction,
+ // so one galaxy's generation cannot change the next.
public int InfluenceOf(Faction faction) =>
- IsPrelude ? (faction.InfluenceDistance + 1) / 2 : faction.InfluenceDistance;
+ (int) MathF.Ceiling(faction.InfluenceDistance * InfluenceScale);
public Galaxy(
- TutorialGenerationSettings settings,
+ GalaxyCast cast,
SectorBackgroundSettings background,
CultCache cache,
- PlayerSettings playerSettings,
- DirectoryInfo narrativeDirectory,
Action log,
Action progressCallback,
uint seed)
{
_cache = cache;
- IsPrelude = true;
+ InfluenceScale = cast.InfluenceScale > 0
+ ? cast.InfluenceScale
+ : throw new InvalidOperationException($"the cast's {nameof(cast.InfluenceScale)} must be positive, got {cast.InfluenceScale}");
Background = background;
Log = log;
@@ -223,32 +229,32 @@ public class Galaxy
var factions = new List();
- var protagonistFaction = ResolveCast(nameof(settings.ProtagonistFaction), settings.ProtagonistFaction);
+ var protagonistFaction = ResolveCast(nameof(cast.ProtagonistFaction), cast.ProtagonistFaction);
factions.Add(protagonistFaction);
- var antagonistFaction = ResolveCast(nameof(settings.AntagonistFaction), settings.AntagonistFaction);
+ var antagonistFaction = ResolveCast(nameof(cast.AntagonistFaction), cast.AntagonistFaction);
factions.Add(antagonistFaction);
- var bufferFaction = ResolveCast(nameof(settings.BufferFaction), settings.BufferFaction);
+ var bufferFaction = ResolveCast(nameof(cast.BufferFaction), cast.BufferFaction);
factions.Add(bufferFaction);
// A cast without a quest faction places no quest zone.
- var questFaction = string.IsNullOrEmpty(settings.QuestFaction)
+ var questFaction = string.IsNullOrEmpty(cast.QuestFaction)
? null
- : ResolveCast(nameof(settings.QuestFaction), settings.QuestFaction);
+ : ResolveCast(nameof(cast.QuestFaction), cast.QuestFaction);
if (questFaction != null) factions.Add(questFaction);
- var neutralFactions = settings.NeutralFactions
- .Select(name => ResolveCast(nameof(settings.NeutralFactions), name))
+ var neutralFactions = cast.NeutralFactions
+ .Select(name => ResolveCast(nameof(cast.NeutralFactions), name))
.ToArray();
factions.AddRange(neutralFactions);
Factions = factions.ToArray();
foreach (var faction in Factions) FactionRelationships[faction] = FactionRelationship.Neutral;
- Zones = GenerateZones(settings.ZoneCount, ref random, progressCallback);
+ Zones = GenerateZones(cast.ZoneCount, ref random, progressCallback);
- GenerateLinks(settings.LinkDensity, progressCallback);
+ GenerateLinks(cast.LinkDensity, progressCallback);
CalculateDistanceMatrix(progressCallback);
@@ -302,15 +308,11 @@ public class Galaxy
CalculateFactionInfluence(progressCallback);
- // No boss zone and no Exit yet (PlaceGate comes after): the prelude is one region.
- BuildProvinces(settings.ProvinceZones);
+ // No boss zone and no Exit yet (PlaceGate comes after): a cast galaxy is one region.
+ BuildProvinces(cast.ProvinceZones);
NamePlaces(ref random, progressCallback);
- // progressCallback?.Invoke("Weaving Narrative");
- // var processor = new StoryProcessor(playerSettings, narrativeDirectory, this, ref random, Log);
- // processor.ProcessStories();
-
progressCallback?.Invoke("Done!");
if(progressCallback!=null) Thread.Sleep(500); // Inserting Delay to make it seem like it's doing more work lmao
}
diff --git a/Assets/Scripts/ServerShared/GalaxyStage.cs b/Assets/Scripts/ServerShared/GalaxyStage.cs
index a93e25f89..4bea4d6c7 100644
--- a/Assets/Scripts/ServerShared/GalaxyStage.cs
+++ b/Assets/Scripts/ServerShared/GalaxyStage.cs
@@ -1,5 +1,4 @@
using System;
-using System.IO;
using GameCult.Caching;
using MessagePack;
using static CultMath.math;
@@ -13,11 +12,8 @@ public sealed class GalaxyStage
{
private readonly SectorGenerationSettings _sector;
private readonly SectorBackgroundSettings _sectorBackground;
- private readonly TutorialGenerationSettings _prelude;
- private readonly SectorBackgroundSettings _preludeBackground;
+ private readonly SectorBackgroundSettings _castBackground;
private readonly CultCache _cache;
- private readonly PlayerSettings _playerSettings;
- private readonly DirectoryInfo _narrativeDirectory;
private readonly Action _log;
private readonly Action _progress;
private readonly Func _clock;
@@ -25,22 +21,16 @@ public sealed class GalaxyStage
public GalaxyStage(
SectorGenerationSettings sector,
SectorBackgroundSettings sectorBackground,
- TutorialGenerationSettings prelude,
- SectorBackgroundSettings preludeBackground,
+ SectorBackgroundSettings castBackground,
CultCache cache,
- PlayerSettings playerSettings,
- DirectoryInfo narrativeDirectory,
Action log,
Action progress = null,
Func clock = null)
{
_sector = sector;
_sectorBackground = sectorBackground;
- _prelude = prelude;
- _preludeBackground = preludeBackground;
+ _castBackground = castBackground;
_cache = cache;
- _playerSettings = playerSettings;
- _narrativeDirectory = narrativeDirectory;
_log = log;
_progress = progress;
_clock = clock ?? (() => (uint) (DateTime.Now.Ticks % uint.MaxValue));
@@ -65,13 +55,10 @@ public sealed class GalaxyStage
return new Galaxy(_sector, background, _cache, _log, _progress, Seed);
}
- // A prelude galaxy: the tutorial settings and their fixed factions, centred in dense cloud.
- public Galaxy Prelude() => Prelude(_prelude);
-
- // A prelude galaxy of the given fixed cast, centred in dense cloud.
- public Galaxy Prelude(TutorialGenerationSettings cast)
+ // A galaxy of the given fixed cast, centred in dense cloud.
+ public Galaxy Cast(GalaxyCast cast)
{
- var background = Copy(_preludeBackground);
+ var background = Copy(_castBackground);
var random = new Random(Seed);
var iteration = 1;
do
@@ -79,7 +66,7 @@ public sealed class GalaxyStage
background.NoisePosition = random.NextFloat() * 1000;
_progress?.Invoke($"Finding Galaxy Position: iteration {iteration++}");
} while (background.CloudDensity(float2(.5f)) < .5f);
- return new Galaxy(cast, background, _cache, _playerSettings, _narrativeDirectory, _log, _progress, Seed);
+ return new Galaxy(cast, background, _cache, _log, _progress, Seed);
}
private static SectorBackgroundSettings Copy(SectorBackgroundSettings settings) =>
diff --git a/Assets/Scripts/ServerShared/HaulFeed.cs b/Assets/Scripts/ServerShared/HaulFeed.cs
new file mode 100644
index 000000000..b6f4055c8
--- /dev/null
+++ b/Assets/Scripts/ServerShared/HaulFeed.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Linq;
+using GameCult.Caching;
+
+public enum GainKind { Mined, Collected }
+
+// One entry into a hold: what Extract stored (and let float) of one ore, or what a pickup collected. Stored plus Adrift is
+// the units; a pickup has Adrift 0. Published on Zone.CargoGained by its two writers and read by presentations only.
+public struct CargoGain
+{
+ public Entity Taker;
+ public CultRecordRef Design;
+ public int Lot;
+ public int Stored;
+ public int Adrift;
+ public GainKind Kind;
+}
+
+// The words for a cargo gain, and the taker's hold fill. Nothing here is stored: the line and the fill are derived on
+// every call.
+public static class HaulFeed
+{
+ public static string Line(CargoGain gain, ItemManager items)
+ {
+ var name = items.ItemData.Get(gain.Design).Name;
+ var (used, total) = HoldFill(gain.Taker?.CargoBays ?? Enumerable.Empty());
+ var hold = $"(hold {used}/{total})";
+ if (gain.Kind == GainKind.Collected) return $"Collected {gain.Stored} {name} {hold}";
+ return gain.Adrift > 0
+ ? $"+{gain.Stored} {name}, {gain.Adrift} adrift {hold}"
+ : $"+{gain.Stored} {name} {hold}";
+ }
+
+ // Occupied cells over the bays' interiors, a multi-cell item counted per cell.
+ public static (int used, int total) HoldFill(IEnumerable bays)
+ {
+ int used = 0, total = 0;
+ foreach (var bay in bays)
+ foreach (var v in bay.Data.InteriorShape.AllCoordinates)
+ {
+ if (!bay.Data.InteriorShape[v]) continue;
+ total++;
+ if (bay.Occupancy[v.x, v.y] != null) used++;
+ }
+ return (used, total);
+ }
+}
diff --git a/Assets/Scripts/ServerShared/HaulFeed.cs.meta b/Assets/Scripts/ServerShared/HaulFeed.cs.meta
new file mode 100644
index 000000000..b9b4b88b6
--- /dev/null
+++ b/Assets/Scripts/ServerShared/HaulFeed.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4d3ef606ec5240119cbb3d7dd51123d9
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/ServerShared/InputLayout.cs b/Assets/Scripts/ServerShared/InputLayout.cs
index a688598b2..7e942c519 100644
--- a/Assets/Scripts/ServerShared/InputLayout.cs
+++ b/Assets/Scripts/ServerShared/InputLayout.cs
@@ -29,7 +29,10 @@ public class InputLayout
Union(0, typeof(InputLayoutRowSpacer)),
Union(1, typeof(InputLayoutKeyRow))
]
-public abstract class InputLayoutRow { }
+public abstract class InputLayoutRow {
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(1)] [CultElementId] public string Id = "";
+}
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class InputLayoutRowSpacer : InputLayoutRow
@@ -52,6 +55,9 @@ public class InputLayoutKeyRow : InputLayoutRow
public abstract class InputLayoutColumn
{
[Key(0), JsonProperty("width")] public float Width;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(5)] [CultElementId] public string Id = "";
}
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
diff --git a/Assets/Scripts/ServerShared/ItemData.cs b/Assets/Scripts/ServerShared/ItemData.cs
index 72c07fc9a..ab9c9dcfc 100644
--- a/Assets/Scripts/ServerShared/ItemData.cs
+++ b/Assets/Scripts/ServerShared/ItemData.cs
@@ -348,6 +348,9 @@ public class ItemRole
[Inspectable, JsonProperty("count"), Key(1)]
public int Count = 1;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(2)] [CultElementId] public string Id = "";
}
[CultDocument("aetheria.compoundcommoditydata", "1"), Inspectable, MessagePackObject]
@@ -635,6 +638,9 @@ public class HardpointData
}
private static Dictionary _tintColors;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(8)] [CultElementId] public string Id = "";
}
// What a PerformanceStat reads to resolve one number: the lot it prices quality against, and the per-context
@@ -680,6 +686,9 @@ public class StatTerm
// The design role whose part quality this term reads; unset reads the item's effective quality (Lot.EffectiveQuality).
// Njordr states the same rule as a derivation over dimensions; this is that rule with one dimension.
[Inspectable, JsonProperty("role"), Key(2)] public string Role;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(3)] [CultElementId] public string Id = "";
}
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
diff --git a/Assets/Scripts/ServerShared/ItemInstance.cs b/Assets/Scripts/ServerShared/ItemInstance.cs
index 80a891666..a16553b9f 100644
--- a/Assets/Scripts/ServerShared/ItemInstance.cs
+++ b/Assets/Scripts/ServerShared/ItemInstance.cs
@@ -24,6 +24,11 @@ public abstract class ItemInstance
{
[JsonProperty("data"), Key(0)] public CultRecordRef Data;
[JsonProperty("rotation"), Key(1)] public ItemRotation Rotation;
+
+ // The lot this unit was minted or mined from: crafted units' design, provenance, workmanship and role fills all
+ // live there; a mined SimpleCommodity names its Extracted lot (zone, belt, ore). Lot 0 is no lot: bought, staged
+ // and loadout commodities, and every save from before the field reached SimpleCommodity.
+ [JsonProperty("lot"), Key(11)] public int Lot;
}
[Union(0, typeof(CompoundCommodity)),
@@ -33,9 +38,7 @@ public abstract class ItemInstance
public abstract class CraftedItemInstance : ItemInstance
{
// Keys 2 (Quality), 9 (Ingredients) and 10 (Product) belonged to fields moved to Lot; do not reuse them.
-
- // The lot this unit was minted from: its design, provenance, workmanship and role fills all live there.
- [JsonProperty("lot"), Key(11)] public int Lot;
+ // Key 11 (Lot) lives on ItemInstance.
}
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
diff --git a/Assets/Scripts/ServerShared/ItemManager.cs b/Assets/Scripts/ServerShared/ItemManager.cs
index 090fe1545..d5c1e05dd 100644
--- a/Assets/Scripts/ServerShared/ItemManager.cs
+++ b/Assets/Scripts/ServerShared/ItemManager.cs
@@ -25,6 +25,11 @@ public class ItemManager
public CultCache ItemData { get; }
public ProvenanceLedger Lots { get; }
+
+ // (zone index, belt, commodity) -> the Extracted lot minted for it. Derived from Lots at construction and on mint,
+ // never persisted: a reload rebuilds it from the ledger, so the same source finds the same lot.
+ private readonly Dictionary<(int, CultRecordKey, CultRecordKey), int> _extracted =
+ new Dictionary<(int, CultRecordKey, CultRecordKey), int>();
public GameplaySettings GameplaySettings { get; }
public ItemManager(uint seed, CultCache itemData, ProvenanceLedger lots, GameplaySettings settings, Action logger)
@@ -33,10 +38,32 @@ public class ItemManager
Random = new Random(seed);
ItemData = itemData;
Lots = lots;
+ foreach (var (id, lot) in lots.Lots)
+ if (lot.Origin is Extracted extracted)
+ _extracted[(extracted.Zone, extracted.Body.Key, extracted.Commodity.Key)] = id;
GameplaySettings = settings;
_logger = logger;
}
+ // A restore point over everything building items draws or mints: the item stream and the lot ledger, which a run save
+ // persists. Rewind puts both back, so a refused build is neither a draw nor a lot.
+ public readonly struct Checkpoint
+ {
+ internal readonly Random Stream;
+ internal readonly int NextLot;
+ internal Checkpoint(Random stream, int nextLot) { Stream = stream; NextLot = nextLot; }
+ }
+
+ public Checkpoint Mark() => new Checkpoint(Random, Lots.NextLot);
+
+ public void Rewind(Checkpoint mark)
+ {
+ Random = mark.Stream;
+ foreach (var id in Lots.Lots.Keys.Where(id => id >= mark.NextLot).ToList()) Lots.Lots.Remove(id);
+ Lots.NextLot = mark.NextLot;
+ foreach (var key in _extracted.Where(entry => entry.Value >= mark.NextLot).Select(entry => entry.Key).ToList()) _extracted.Remove(key);
+ }
+
public void Log(string s)
{
_logger(s);
@@ -72,8 +99,9 @@ public class ItemManager
};
}
- // The one resolution path from a crafted instance to the lot it was minted from.
- public Lot GetLot(CraftedItemInstance item) => Lots[item.Lot];
+ // The one resolution path from an instance to the lot it was minted or mined from. Lot 0 throws: a bought or
+ // staged commodity has no lot, and the caller asks Lot != 0 first.
+ public Lot GetLot(ItemInstance item) => Lots[item.Lot];
// Returns stat when not equipped: a null-entity context with no heat, no power and no modifiers. It says so
// in its own name (UnequippedStatContext) rather than being a third quiet dialect of the arithmetic.
@@ -180,6 +208,24 @@ public class ItemManager
return Lots.Add(lot);
}
+ // Mining Cut 5b: the lot of every unit mined from one commodity in one belt of one zone, found or minted. Unbranded
+ // (Product unset) and unworked (Quality 1, no roles). FireControl.Extract is the only caller.
+ public int ExtractedLot(int zone, CultRecordKey belt, SimpleCommodityData commodity)
+ {
+ var key = (zone, belt, ItemData.RefOf(commodity).Key);
+ if (_extracted.TryGetValue(key, out var found)) return found;
+ var id = Lots.Add(new Lot
+ {
+ Design = ItemData.RefOf(commodity),
+ Origin = new Extracted
+ {
+ Zone = zone, Body = new CultRecordRef(belt), Commodity = ItemData.RefOf(commodity)
+ },
+ Quality = 1
+ });
+ return _extracted[key] = id;
+ }
+
// The one writer of a crafted instance's Data: copied from the lot's design, never independently set.
public CraftedItemInstance CreateInstance(int lot)
{
diff --git a/Assets/Scripts/ServerShared/Loadout.cs b/Assets/Scripts/ServerShared/Loadout.cs
index 4866aa406..b423eb1a0 100644
--- a/Assets/Scripts/ServerShared/Loadout.cs
+++ b/Assets/Scripts/ServerShared/Loadout.cs
@@ -28,6 +28,9 @@ public class LoadoutSlot
[Key(1)] public ItemRotation Rotation;
[Key(2)] public CultRecordRef Design;
[Key(3)] public CultRecordRef Product; // unset: design-only, chosen at materialization
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(4)] [CultElementId] public string Id = "";
}
// Why a faction has no boss Loadout to build; see Loadouts.BossOf.
diff --git a/Assets/Scripts/ServerShared/LoadoutGenerator.cs b/Assets/Scripts/ServerShared/LoadoutGenerator.cs
index fcd554efd..62e8632a1 100644
--- a/Assets/Scripts/ServerShared/LoadoutGenerator.cs
+++ b/Assets/Scripts/ServerShared/LoadoutGenerator.cs
@@ -257,8 +257,11 @@ public class LoadoutGenerator
// Whether a product is on the market at all (ruling off-market-is-unoffered-product). The one reader of NotOffered. A bin is
// offered only if both it and its line are (ruling bin-inherits-line-offered); the catalog read guarantees a bin's line exists.
- public static bool IsOffered(CultCache items, FactionProductData product) =>
- !product.NotOffered && (product.Bin == null || !items.Get(product.Bin.Line).NotOffered);
+ public static bool IsOffered(CultCache items, FactionProductData product) => IsOffered(product, line => items.Get(line));
+
+ // The same reader for a caller whose bin lines are not all in one catalog yet (ShipModCatalog.MarketFault, over a package's own products).
+ public static bool IsOffered(FactionProductData product, Func, FactionProductData> lineOf) =>
+ !product.NotOffered && (product.Bin == null || !lineOf(product.Bin.Line).NotOffered);
// How much this outfitter favors a product: its maker's preference times the product's share of it. The one weight of
// generation and of ChooseProduct. A bin takes the share of its maker's stock that would pass its floor and its line takes
diff --git a/Assets/Scripts/ServerShared/Provenance.cs b/Assets/Scripts/ServerShared/Provenance.cs
index 4121332d6..71c260496 100644
--- a/Assets/Scripts/ServerShared/Provenance.cs
+++ b/Assets/Scripts/ServerShared/Provenance.cs
@@ -92,6 +92,9 @@ public class Lot
foreach (var fill in Roles) sum += Math.Min(fill.Quality, Quality);
return sum / Roles.Count;
}
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(5)] [CultElementId] public string Id = "";
}
// One filled slot: the design's role name and how good the part that went into it turned out to be. Stats read it through
@@ -101,6 +104,9 @@ public class RoleFill
{
[Key(0)] public string Role;
[Key(1)] public float Quality;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(2)] [CultElementId] public string Id = "";
}
// Who built a lot, where, and from what. Terminus mints Attributed placeholders; Produced and Extracted are the
@@ -131,6 +137,8 @@ public class Produced : Provenance
[MessagePackObject]
public class Extracted : Provenance
{
+ // Zone is the zone's index in galaxy.Zones (SavedGame's convention), -1 with no galaxy; Body is the belt.
[Key(0)] public int Zone;
[Key(1)] public CultRecordRef Commodity;
+ [Key(2)] public CultRecordRef Body;
}
diff --git a/Assets/Scripts/ServerShared/Recipes.cs b/Assets/Scripts/ServerShared/Recipes.cs
index e434a84a5..f9aa3ee4a 100644
--- a/Assets/Scripts/ServerShared/Recipes.cs
+++ b/Assets/Scripts/ServerShared/Recipes.cs
@@ -63,6 +63,9 @@ public class CommodityCount
[JsonProperty("count"), Key(1)]
public int Count = 1;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(2)] [CultElementId] public string Id = "";
}
// A region gate's trade with the world beyond it: what the outside buys and sells, at what price and at most how fast.
@@ -96,6 +99,9 @@ public class OutsideMarketRow
[JsonProperty("ratePerHour"), Key(4)]
public float RatePerHour;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(5)] [CultElementId] public string Id = "";
}
// The one reader of recipes: which recipe makes a good, a recipe's role slots (RoleInputsOf), which commodities fill a role, and
diff --git a/Assets/Scripts/ServerShared/RunStart.cs b/Assets/Scripts/ServerShared/RunStart.cs
index cadd66bcc..6278c0cbc 100644
--- a/Assets/Scripts/ServerShared/RunStart.cs
+++ b/Assets/Scripts/ServerShared/RunStart.cs
@@ -27,42 +27,40 @@ public static class RunStart
{
SeedItems(itemManager, galaxy, ArenaStep);
return galaxy.Entrance.PackedContents = ZoneGenerator.GenerateZone(
- itemManager, zoneSettings, planetSettings, galaxy, galaxy.Entrance, galaxy.IsPrelude, scenario.Ambient);
+ itemManager, zoneSettings, planetSettings, galaxy, galaxy.Entrance, scenario.EntranceStation, scenario.Ambient);
}
- // Runs the scenario's Stage, then admits its player and everything it placed: each entity's stance set both ways
- // with the player, a pilot for each piloted one. Returns null, with every failure listed and the arena unchanged,
+ // Runs a start and answers whether it produced a run: null, with the reason in `failures`, when `start` throws or
+ // returns nothing. The caller shows the failure and clears its run; nothing past a null may run the game.
+ public static Staged Launch(Func start, List failures, Action log = null)
+ {
+ Staged staged = null;
+ try { staged = start(); }
+ catch (Exception exception)
+ {
+ log?.Invoke(exception);
+ failures.Add(exception.Message);
+ }
+ if (staged == null && failures.Count == 0) failures.Add("the start produced no run");
+ return staged;
+ }
+
+ // Runs the scenario's Stage, then has the stage admit its player and everything it placed.
+ // Returns null, with every failure listed and the arena unchanged,
// unless the whole scenario staged.
public static Staged Stage(ItemManager itemManager, Zone arena, Scenario scenario, string startingHull,
- TutorialGenerationSettings tutorialGenerationSettings, List failures)
+ List failures)
{
SeedItems(itemManager, arena.Galaxy, StageStep);
- var stage = new ScenarioStage(itemManager, arena, startingHull, tutorialGenerationSettings);
+ var stage = new ScenarioStage(itemManager, arena, startingHull);
scenario.Stage(stage);
var reported = failures.Count;
failures.AddRange(stage.Failures);
if (!stage.PlayerPlaced)
failures.Add("player: the scenario places no player");
if (failures.Count > reported) return null;
- stage.StockUnauthoredAmmunition();
-
- var player = stage.PlayerShip;
- player.IsPlayerShip = true;
- arena.Admit(player, piloted: false);
- foreach (var placed in stage.Placed)
- {
- var hostile = placed.Stance == ScenarioStance.Hostile;
- placed.Entity.SetIff(player, hostile);
- player.SetIff(placed.Entity, hostile);
- arena.Admit(placed.Entity, placed.Piloted, placed.Task);
- }
-
- // A start state includes what a pilot knows (ruling stage-states-pilot-knowledge): its anchor is tracked from the first
- // step, by the sensors' own path (info gathered past the detection threshold), so they can lose it like any track.
- foreach (var placed in stage.Placed)
- if (placed.Knows != null && placed.Piloted)
- placed.Entity.EntityInfoGathered[placed.Knows] = (itemManager.GameplaySettings.TargetDetectionInfoThreshold + 1f) / 2f;
- return new Staged { Player = player, Credits = stage.Credits, Entities = stage.Placed.Select(placed => placed.Entity).ToList() };
+ stage.Admit();
+ return new Staged { Player = stage.PlayerShip, Credits = stage.Credits, Entities = stage.Placed.Select(placed => placed.Entity).ToList() };
}
// A new run's item draws (each lot's quality, each generated fit) come from its galaxy's seed, not the process clock,
diff --git a/Assets/Scripts/ServerShared/SavedGame.cs b/Assets/Scripts/ServerShared/SavedGame.cs
index 88ff8c9bf..867714a5e 100644
--- a/Assets/Scripts/ServerShared/SavedGame.cs
+++ b/Assets/Scripts/ServerShared/SavedGame.cs
@@ -42,8 +42,7 @@ public class SavedGame
[Key(10)]
public SavedActionBarBinding[] ActionBarBindings;
- [Key(11)]
- public bool IsTutorial;
+ // Key(11): retired, do not reuse (a retired run-mode flag)
// Read only by a save written before Standings: its entries follow galaxy.Factions order, not Factions order, so
// Galaxy trusts it only when the two orders cannot differ (see Galaxy's save constructor).
@@ -68,6 +67,11 @@ public class SavedGame
// null in a save written before it, which then reads Relationships.
[Key(16)]
public List Standings;
+
+ // Galaxy.InfluenceScale: every zone generated after Continue reads it (ZoneGenerator's factionPresence). Written only
+ // by RunSave.Capture and read only by Galaxy's save constructor, which refuses a save without one (0).
+ [Key(17)]
+ public float InfluenceScale;
}
[MessagePackObject]
@@ -78,6 +82,9 @@ public class SavedStanding
[Key(1)]
public FactionRelationship Relationship;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(2)] [CultElementId] public string Id = "";
}
[MessagePackObject]
@@ -88,6 +95,9 @@ public class SavedProvince
[Key(1)]
public CultRecordRef Type;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(2)] [CultElementId] public string Id = "";
}
// The run's lifecycle over the run store. Only Commit creates SavedGame, SavedZone and ProvenanceLedger records;
@@ -116,7 +126,7 @@ public static class RunSave
CurrentZoneEntity = currentZone.Entities.IndexOf(currentEntity),
Entrance = Array.IndexOf(galaxy.Zones, galaxy.Entrance),
Exit = Array.IndexOf(galaxy.Zones, galaxy.Exit),
- IsTutorial = galaxy.IsPrelude,
+ InfluenceScale = galaxy.InfluenceScale,
ActionBarBindings = actionBar,
Credits = credits,
Seed = galaxy.Seed
@@ -216,10 +226,12 @@ public static class RunSave
.Select(stored => stored.Key)
.ToArray();
game.Zones = keys.Select(key => new CultRecordRef(key)).ToArray();
+ // Every crafted item roots, Lot 0 included: a crafted item with no lot is corruption and Reachable throws on it.
+ // A SimpleCommodity roots only when it names a lot; Lot 0 is bought, staged or loadout stock.
var roots = zones
.SelectMany(zone => zone.Contents?.Entities ?? new List())
.SelectMany(EntitySerializer.Items)
- .OfType()
+ .Where(item => item != null && (item is CraftedItemInstance || item.Lot != 0))
.Select(item => item.Lot);
cache.Commit(batch =>
{
@@ -301,6 +313,9 @@ public class SavedZone
]
public abstract class SavedActionBarBinding
{
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(2)] [CultElementId] public string Id = "";
}
[MessagePackObject]
diff --git a/Assets/Scripts/ServerShared/Scenario.cs b/Assets/Scripts/ServerShared/Scenario.cs
index 72b084866..1db6d7687 100644
--- a/Assets/Scripts/ServerShared/Scenario.cs
+++ b/Assets/Scripts/ServerShared/Scenario.cs
@@ -22,13 +22,19 @@ public abstract class Scenario
// the scenario's conditions.
public virtual bool Ambient => true;
- // Which galaxy the run is in: stage.Main() or stage.Prelude().
+ // True: the arena's zone always gets a generated faction station with a docking bay, whatever its seed rolls
+ // (ZoneGenerator). False: its stations are rolled like any other zone's.
+ public virtual bool EntranceStation => true;
+
+ // Which galaxy the run is in: stage.Main() or stage.Cast(cast).
public abstract Galaxy Generate(GalaxyStage stage);
// What the run starts with: exactly one stage.Player, and anything else the scenario places.
public abstract void Stage(ScenarioStage stage);
}
+// A run-start placement's stance toward the player. Hostile is written as an override both ways; Neutral writes nothing,
+// so the faction rule and grudges decide.
public enum ScenarioStance
{
Neutral,
diff --git a/Assets/Scripts/ServerShared/ScenarioStage.cs b/Assets/Scripts/ServerShared/ScenarioStage.cs
index a813bbf49..a39a94578 100644
--- a/Assets/Scripts/ServerShared/ScenarioStage.cs
+++ b/Assets/Scripts/ServerShared/ScenarioStage.cs
@@ -8,14 +8,18 @@ using float2 = CultMath.float2;
using float3 = CultMath.float3;
// The run half of a scenario's vocabulary (docs/scenarios-cut.md, R.4). A scenario's Stage builds its fits and places
-// them here; nothing joins the arena until Stage returns with no failure, and then RunStart admits it all at once.
+// them here; nothing joins the arena until Stage returns with no failure, and then the stage admits it all at once.
// Every verb names what it could not do instead of throwing, so one bad name in a script lists every bad name.
-// Designs, hulls and products are named as the catalog names them. Only RunStart builds a stage.
-public sealed class ScenarioStage
+// Designs, hulls and products are named as the catalog names them.
+// ZoneStage is the placement vocabulary and the admission of what it placed; Zone.Admit stays the only admission.
+// RunStart builds a ScenarioStage (a ZoneStage that also stages the player and authors stance); ZoneStage.Summon builds a
+// ZoneStage for a running zone. A ZoneStage has no Player verb and no stance, so a summon placing a player or writing who
+// fights whom is unrepresentable: a summon's stance is the faction rule's and its grudges'.
+public class ZoneStage
{
private readonly ItemManager _items;
private readonly Func _choose;
- private readonly List _failures = new List();
+ private protected readonly List _failures = new List();
private readonly List _placed = new List();
private int _placements;
// The entities this stage built from a fit (a packed fit is a saved ship, whose cargo is its own) and those whose cargo the scenario
@@ -23,13 +27,10 @@ public sealed class ScenarioStage
private readonly HashSet _fitted = new HashSet();
private readonly HashSet _cargoAuthored = new HashSet();
- internal ScenarioStage(ItemManager items, Zone arena, string startingHull, TutorialGenerationSettings tutorialGenerationSettings)
+ internal ZoneStage(ItemManager items, Zone arena)
{
_items = items;
Arena = arena;
- StartingHull = startingHull;
- TutorialGenerationSettings = tutorialGenerationSettings;
- Credits = items.GameplaySettings.StartingCredits;
// A design named without a product is chosen by the generator's ChooseProduct. The stage outfits with no faction,
// so every maker is reachable and the run's seed draws.
_choose = new LoadoutGenerator(ref items.Random, items, arena.Galaxy, arena.GalaxyZone, null, 2).ChooseProduct;
@@ -37,29 +38,21 @@ public sealed class ScenarioStage
public Galaxy Galaxy => Arena.Galaxy;
public Zone Arena { get; }
- public string StartingHull { get; }
- public TutorialGenerationSettings TutorialGenerationSettings { get; }
-
- // What the run starts with: the gameplay settings' starting credits unless the scenario sets another amount.
- public int Credits { get; set; }
internal IReadOnlyList Failures => _failures;
// Staging's last step: a fitted entity whose cargo the scenario did not author gets the crates its weapons draw, like every other
// newly built armed entity (Loadouts.StockAmmunition). Draws nothing, so it moves no item roll.
- internal void StockUnauthoredAmmunition()
+ private protected void StockUnauthoredAmmunition()
{
foreach (var entity in _fitted.Where(entity => !_cargoAuthored.Contains(entity)))
Loadouts.StockAmmunition(_items, entity);
}
- internal bool PlayerPlaced { get; private set; }
- internal Ship PlayerShip { get; private set; }
internal IReadOnlyList Placed => _placed;
internal sealed class Placement
{
public Entity Entity;
- public ScenarioStance Stance;
public bool Piloted;
public AgentTask Task;
// What the pilot already knows at the start: an entity its sensors hold a track of (Approach). Seeded through the
@@ -115,39 +108,31 @@ public sealed class ScenarioStage
public ScenarioFit Preset(string name)
{
var preset = _items.ItemData.GetAll().FirstOrDefault(loadout => loadout.Name == name);
- if (preset != null) return new ScenarioFit(preset);
- _failures.Add($"preset {name}: no such preset");
- return null;
- }
-
- // The player's ship. A run has exactly one, and it is a ship hull.
- public Ship Player(ScenarioFit fit, float2 at, float2 facing = default)
- {
- if (PlayerPlaced)
+ if (preset == null)
{
- _failures.Add("player: the scenario places a second player");
+ _failures.Add($"preset {name}: no such preset");
return null;
}
- PlayerPlaced = true;
- var entity = Build(fit, "player", at, facing);
- if (entity == null) return null;
- if (entity is Ship ship) return PlayerShip = ship;
- _failures.Add($"player: {entity.Name} is not a ship hull");
- return null;
+ // A faction's boss is the zone generator's to place (boss-hulls-exclusive): Loadouts.BossOf owns which loadout it is.
+ if (_items.ItemData.GetAll().Any(faction => Loadouts.BossOf(_items.ItemData, faction, out _)?.Name == preset.Name))
+ {
+ _failures.Add($"preset {name}: a faction's boss loadout is placed only by the zone generator");
+ return null;
+ }
+ return new ScenarioFit(preset);
}
- // Anything else in the arena. A stance holds both ways between it and the player. A piloted ship gets the zone's
- // pilot; an unpiloted entity has none and goes nowhere on its own unless it is placed moving: velocity is the planar
- // velocity it starts with, and the sim carries it from there. A turret hull stays where it is put.
- public Entity Place(ScenarioFit fit, float2 at, float2 facing = default, ScenarioStance stance = ScenarioStance.Neutral, bool piloted = false,
- float2 velocity = default)
+ // Anything else in the arena. A piloted ship gets the zone's pilot; an unpiloted entity has none and goes nowhere on its
+ // own unless it is placed moving: velocity is the planar velocity it starts with, and the sim carries it from there. A
+ // turret hull stays where it is put. It writes no stance: who fights whom is the faction rule's (stance is ScenarioStage's).
+ public Entity Place(ScenarioFit fit, float2 at, float2 facing = default, bool piloted = false, float2 velocity = default)
{
var where = $"entity {_placements++}";
var entity = Build(fit, where, at, facing);
if (entity == null) return null;
entity.Velocity = velocity;
if (piloted && !(entity is Ship)) _failures.Add($"{where}: {entity.Name} is not a ship hull, so it cannot be piloted");
- _placed.Add(new Placement { Entity = entity, Stance = stance, Piloted = piloted });
+ _placed.Add(new Placement { Entity = entity, Piloted = piloted });
return entity;
}
@@ -168,7 +153,8 @@ public sealed class ScenarioStage
}
// Items in the entity's first cargo bay, one per name. A name is an equippable or consumable design (open: the stage
- // chooses its product) or a product of one (pinned); a name that is neither is a failure.
+ // chooses its product) or a product of one (pinned), or a commodity (one unit: the crates an AmmoType weapon reloads
+ // from); a name that is none of these is a failure.
public void Cargo(Entity entity, params string[] names)
{
if (entity == null) return;
@@ -177,6 +163,13 @@ public sealed class ScenarioStage
var bay = entity.CargoBays.FirstOrDefault();
foreach (var name in names)
{
+ var commodity = _items.ItemData.GetAll().FirstOrDefault(data => data.Name == name);
+ if (commodity != null)
+ {
+ if (bay == null || !bay.TryStore(new SimpleCommodity { Data = new CultRecordRef(_items.ItemData.RefOf(commodity).Key), Quantity = 1 }))
+ _failures.Add($"{where}: no room for {name}");
+ continue;
+ }
var (data, product) = NamedOrProduct(name, where, found => found is EquippableItemData || found is ConsumableItemData);
if (data == null) continue;
var build = Loadouts.Resolve(_items, _items.ItemData.RefOf(data),
@@ -187,7 +180,42 @@ public sealed class ScenarioStage
}
}
- private Entity Build(ScenarioFit fit, string where, float2 at, float2 facing)
+ // Admits what was placed: Zone.Admit with a pilot for each piloted one. It writes no stance. A start state includes what a pilot knows (ruling stage-states-pilot-knowledge): its anchor is tracked
+ // from the first step, by the sensors' own path (info gathered past the detection threshold), so they can lose it
+ // like any track. The one owner of admitting placements.
+ private protected void AdmitPlaced()
+ {
+ foreach (var placed in _placed)
+ {
+ Arena.Admit(placed.Entity, placed.Piloted, placed.Task);
+ }
+ foreach (var placed in _placed)
+ if (placed.Knows != null && placed.Piloted)
+ placed.Entity.EntityInfoGathered[placed.Knows] = (_items.GameplaySettings.TargetDetectionInfoThreshold + 1f) / 2f;
+ }
+
+ // Places ships into a running zone through the admission a run start uses: the script places with the stage's verbs,
+ // and the entities join with a pilot when piloted and the knowledge the script stated. A summon writes no stance: the
+ // faction rule decides who fights whom, and a grudge (Entity.Provoke) turns the summoned faction on whoever attacks it.
+ // Returns the placed entities in order, or null with every failure listed and the zone and the item stream and lot ledger unchanged.
+ // It draws from the live item stream and does not reseed (a reseed would give every summon the same fits).
+ public static IReadOnlyList Summon(ItemManager items, Zone zone, Action script, List failures)
+ {
+ var mark = items.Mark();
+ var stage = new ZoneStage(items, zone);
+ script(stage);
+ failures.AddRange(stage._failures);
+ if (stage._failures.Count > 0)
+ {
+ items.Rewind(mark); // a refusal draws and mints nothing: the fits it built are discarded with it
+ return null;
+ }
+ stage.StockUnauthoredAmmunition();
+ stage.AdmitPlaced();
+ return stage._placed.Select(placed => placed.Entity).ToList();
+ }
+
+ private protected Entity Build(ScenarioFit fit, string where, float2 at, float2 facing)
{
if (fit == null) return null; // the verb that made it named why
@@ -227,8 +255,71 @@ public sealed class ScenarioStage
}
}
+// The run-start stage: a ZoneStage that also stages the player, the credits the run starts with and the hull it
+// starts in, and the one place a script authors stance: a Hostile placement is hostile both ways with the player, written
+// once at admission. Neutral writes nothing (the faction rule and grudges decide). Only RunStart builds one.
+public sealed class ScenarioStage : ZoneStage
+{
+ internal ScenarioStage(ItemManager items, Zone arena, string startingHull) : base(items, arena)
+ {
+ StartingHull = startingHull;
+ Credits = items.GameplaySettings.StartingCredits;
+ }
+
+ public string StartingHull { get; }
+
+ // What the run starts with: the gameplay settings' starting credits unless the scenario sets another amount.
+ public int Credits { get; set; }
+
+ private readonly List _hostile = new List();
+
+ // Anything else in the arena, as ZoneStage.Place, with a stance toward the player: Hostile holds both ways from the start.
+ public new Entity Place(ScenarioFit fit, float2 at, float2 facing = default, ScenarioStance stance = ScenarioStance.Neutral, bool piloted = false,
+ float2 velocity = default)
+ {
+ var entity = base.Place(fit, at, facing, piloted, velocity);
+ if (entity != null && stance == ScenarioStance.Hostile) _hostile.Add(entity);
+ return entity;
+ }
+
+ internal bool PlayerPlaced { get; private set; }
+ internal Ship PlayerShip { get; private set; }
+
+ // The player's ship. A run has exactly one, and it is a ship hull.
+ public Ship Player(ScenarioFit fit, float2 at, float2 facing = default)
+ {
+ if (PlayerPlaced)
+ {
+ _failures.Add("player: the scenario places a second player");
+ return null;
+ }
+ PlayerPlaced = true;
+ var entity = Build(fit, "player", at, facing);
+ if (entity == null) return null;
+ if (entity is Ship ship) return PlayerShip = ship;
+ _failures.Add($"player: {entity.Name} is not a ship hull");
+ return null;
+ }
+
+ // Run start's admission: stock unauthored ammunition, the player, then everything placed. Nothing at admission or
+ // activation reads cargo (ammunition is read when a weapon fires), so stocking is not ordered by admission; it keeps
+ // the run start's order.
+ internal void Admit()
+ {
+ StockUnauthoredAmmunition();
+ PlayerShip.IsPlayerShip = true;
+ Arena.Admit(PlayerShip, piloted: false);
+ foreach (var entity in _hostile)
+ {
+ entity.SetIff(PlayerShip, true);
+ PlayerShip.SetIff(entity, true);
+ }
+ AdmitPlaced();
+ }
+}
+
// What a scenario places: a fit built from named designs or a preset, or a ship generated as the game generates them.
-// Only ScenarioStage makes one.
+// Only a ZoneStage makes one.
public sealed class ScenarioFit
{
internal readonly Loadout Loadout;
diff --git a/Assets/Scripts/ServerShared/Scenarios/AiFusedDiscipline.cs b/Assets/Scripts/ServerShared/Scenarios/AiFusedDiscipline.cs
index beb4235da..bdfc153fd 100644
--- a/Assets/Scripts/ServerShared/Scenarios/AiFusedDiscipline.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/AiFusedDiscipline.cs
@@ -13,7 +13,7 @@ public sealed class AiFusedDiscipline : Scenario
public static readonly CultMath.float2 Hostile = float2(0, 700), Neutral = float2(500, 300);
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude(DemoTerminus.Cast);
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
diff --git a/Assets/Scripts/ServerShared/Scenarios/Arcs.cs b/Assets/Scripts/ServerShared/Scenarios/Arcs.cs
index f0c3f5553..6da63b0e2 100644
--- a/Assets/Scripts/ServerShared/Scenarios/Arcs.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/Arcs.cs
@@ -1,3 +1,4 @@
+using System.Linq;
using static CultMath.math;
using static ItemRotation;
@@ -20,7 +21,12 @@ public sealed class Arcs : Scenario
public static readonly CultMath.float2 Bow = float2(0, 400), Stern = float2(0, -400), Turret = float2(600, 300),
Port = float2(-400, 0), Starboard = float2(400, 0);
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude();
+ // Crates of ammunition each shooter's hold is stocked with: the measured draw over a run (ScenarioAmmunitionRunTests: at most ten minutes of play, and in
+ // practice the ~260 s a shooter holding every gun down lasts before it dies of heat; a pilot who vents heat is unmeasured) plus half again and one. The turret drew 14 Ammo with the player in its range; the player drew 27 Ammo
+ // holding every gun down. The guided launchers fire only on a lock, which that run cannot give them, so they carry the default three crates.
+ public const int TurretAmmoCrates = 22, PlayerAmmoCrates = 42, PlayerMissileCrates = 3;
+
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
@@ -40,7 +46,8 @@ public sealed class Arcs : Scenario
("not if i see you first", int2(5, 10), None), // Compact Sensor
("Panopticon Prime", int2(3, 6), Clockwise), // Fire Control Array
("🫳🔫", int2(8, 4), Clockwise), // Autocannon
- ("ChargeBlast SG", int2(0, 4), CounterClockwise)); // Charged Scatter Blaster
+ ("ChargeBlast SG", int2(0, 4), CounterClockwise), // Charged Scatter Blaster
+ ("Store-All Plus", int2(4, 8), None)); // Cargo Bay: the only 2x2 the hull has free
var turret = stage.Fit("Turret",
("ClearPath", int2(1, 2), None), // Light Machine Gun
("ClearPath", int2(5, 2), None), // Light Machine Gun
@@ -49,12 +56,15 @@ public sealed class Arcs : Scenario
("Compact Reactor", int2(3, 3), None),
("Turret Control Module", int2(3, 5), None),
("not if i see you first", int2(4, 5), None), // Compact Sensor
- ("Panopticon Prime", int2(3, 6), None)); // Fire Control Array
+ ("Panopticon Prime", int2(3, 6), None), // Fire Control Array
+ ("Store-All Plus", int2(3, 1), None)); // Cargo Bay: the only 2x2 the turret hull has free
- stage.Player(fighter, float2(0, 0), facing: float2(0, 1));
+ var player = stage.Player(fighter, float2(0, 0), facing: float2(0, 1));
+ stage.Cargo(player, Enumerable.Repeat("Ammo", PlayerAmmoCrates).Concat(Enumerable.Repeat("Missiles", PlayerMissileCrates)).ToArray());
stage.Place(stage.Bare("Longinus"), Bow);
stage.Place(stage.Bare("Longinus"), Stern);
- stage.Place(turret, Turret, stance: ScenarioStance.Hostile);
+ // The turret's guns reload from its hold, a crate of Ammo per magazine.
+ stage.Cargo(stage.Place(turret, Turret, stance: ScenarioStance.Hostile), Enumerable.Repeat("Ammo", TurretAmmoCrates).ToArray());
stage.Place(stage.Bare("Longinus"), Port);
stage.Place(stage.Bare("Longinus"), Starboard);
}
diff --git a/Assets/Scripts/ServerShared/Scenarios/Belt.cs b/Assets/Scripts/ServerShared/Scenarios/Belt.cs
index 50c815f6d..7058b993b 100644
--- a/Assets/Scripts/ServerShared/Scenarios/Belt.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/Belt.cs
@@ -17,7 +17,7 @@ public sealed class Belt : Scenario
public override uint Seed => 86;
public override bool Ambient => false;
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude(DemoTerminus.Cast);
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
diff --git a/Assets/Scripts/ServerShared/Scenarios/Crossing.cs b/Assets/Scripts/ServerShared/Scenarios/Crossing.cs
index 61529d6d9..be5a1fe06 100644
--- a/Assets/Scripts/ServerShared/Scenarios/Crossing.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/Crossing.cs
@@ -6,8 +6,8 @@ public sealed class Crossing : Scenario
public override string Name => "Crossing";
public override string Id => "crossing";
public override string Brief => "A Lightning Projector at the starboard gun and a Cell Blaster at the port gun, an unpiloted Djinni coasting across the bow " +
- "close ahead and an unpiloted one waiting at range. The crosser is launched to port at 50 m/s and only coasts: nothing steers it, " +
- "its hull drag slows it to about 25 m/s at the bow line, and it does not shoot back. Make the pass coasting: give no throttle until the Djinni has crossed the bow, then fly freely " +
+ "close ahead and an unpiloted one waiting at range. The crosser is launched to port at 25 m/s and only coasts: nothing steers it, " +
+ "a hull coasts at its launch speed below its top speed, and it does not shoot back. Make the pass coasting: give no throttle until the Djinni has crossed the bow, then fly freely " +
"(thrusting from the start carries you past it). Verify: as the Djinni crosses close, FastBlast lands some and projector " +
"almost none; against the Djinni at range both land. Fly it again without the Fire Control Array: " +
"with it the small gun lands more.";
@@ -16,13 +16,15 @@ public sealed class Crossing : Scenario
// Where the Djinni sit: the player is at Origin facing +z. Origin is 250 m or more from every body, where the zone's
// pull is weakest (about 1.4 u/s^2; the sum of the wells never drops to nothing, and at the old origin the player sat on the star).
- // The crosser is unpiloted and placed moving at the Djinni's 50 m/s cap, so its pass is ballistic: bent by the field and slowed
- // by hull drag (it reaches the bow line at about 25 m/s relative to the player, 3.6 s in), and nothing steers it.
+ // The crosser is unpiloted and placed moving at 25 m/s, well under the Djinni's 50 m/s top speed, so its pass is ballistic: a hull
+ // coasts below its top speed (aetheria-gravity:ruling:no-drag-below-top-speed) and only the field bends it, so it reaches the
+ // bow line at 25 m/s relative to the player, 3.6 s in, and nothing steers it. (Launched at the cap with drag slowing it to 25 m/s,
+ // as this scenario was first tuned, it would now hold 50 m/s and cross in 2.6 s.)
// CrosserAt is the centre of the start window in which the pass holds: shifting it by 10 m along either axis keeps the pass
// inside the test's time and distance windows (CrossingHoldsAcrossTheStartWindow).
// The waiting Djinni sits inside the Lightning Projector's arc at 80% of its Range.
public static readonly CultMath.float2 Origin = float2(724, 124);
- public static readonly CultMath.float2 CrosserAt = Origin + float2(-128, 45), CrosserFacing = float2(1, 0), CrosserVelocity = float2(50, 0);
+ public static readonly CultMath.float2 CrosserAt = Origin + float2(-90, 45), CrosserFacing = float2(1, 0), CrosserVelocity = float2(25, 0);
// The fighter is staged at this quality, so its gear and the range below do not ride the item stream.
public const float StagedQuality = .6f;
// The Lightning Projector's Range in metres at the staged fit: 996.99 after the three seconds the test settles for
@@ -31,7 +33,7 @@ public sealed class Crossing : Scenario
public const float ProjectorRange = 997f;
public static readonly CultMath.float2 Waiting = Origin + float2(0, ProjectorRange * .8f);
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude(DemoTerminus.Cast);
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
diff --git a/Assets/Scripts/ServerShared/Scenarios/DemoTerminus.cs b/Assets/Scripts/ServerShared/Scenarios/DemoTerminus.cs
index f4dce7be7..7d8fbe330 100644
--- a/Assets/Scripts/ServerShared/Scenarios/DemoTerminus.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/DemoTerminus.cs
@@ -2,10 +2,10 @@ using float2 = CultMath.float2;
// The demo: one gate, one region and one boss, with a fixed cast. The Pirates are the protagonist's ostensible
// employer, Zhestokost the antagonist whose home is the boss zone and the exit, Lucent Media and Aeronautics Unlimited
-// the neutrals. A prelude galaxy of that cast; the player, who is not a Pirate, flies the base Longinus.
+// the neutrals. A galaxy of that cast at half influence; the player, who is not a Pirate, flies the base Longinus.
public sealed class DemoTerminus : Scenario
{
- public static readonly TutorialGenerationSettings Cast = new TutorialGenerationSettings
+ public static readonly GalaxyCast Cast = new GalaxyCast
{
ProtagonistFaction = "Pirates",
AntagonistFaction = "Zhe",
@@ -13,7 +13,8 @@ public sealed class DemoTerminus : Scenario
NeutralFactions = new[] { "Aero" },
QuestFaction = null,
ZoneCount = 64,
- LinkDensity = .5f
+ LinkDensity = .5f,
+ InfluenceScale = .5f
};
public override string Name => "Terminus (Demo)";
@@ -23,7 +24,7 @@ public sealed class DemoTerminus : Scenario
public override Galaxy Generate(GalaxyStage stage)
{
- var galaxy = stage.Prelude(Cast);
+ var galaxy = stage.Cast(Cast);
galaxy.PlaceGate(galaxy.ResolveFaction(Cast.AntagonistFaction));
return galaxy;
}
diff --git a/Assets/Scripts/ServerShared/Scenarios/DjinniShakedown.cs b/Assets/Scripts/ServerShared/Scenarios/DjinniShakedown.cs
index 43d23d0b3..1b853571c 100644
--- a/Assets/Scripts/ServerShared/Scenarios/DjinniShakedown.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/DjinniShakedown.cs
@@ -14,7 +14,7 @@ public sealed class DjinniShakedown : Scenario
// Where the targets sit: the ballistic mount faces +z, so Ahead is inside its arc and Abeam outside it.
public static readonly float2 Ahead = new float2(0, 400), Abeam = new float2(400, 0);
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude();
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
diff --git a/Assets/Scripts/ServerShared/Scenarios/Duel.cs b/Assets/Scripts/ServerShared/Scenarios/Duel.cs
index 67bca118d..508277643 100644
--- a/Assets/Scripts/ServerShared/Scenarios/Duel.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/Duel.cs
@@ -10,7 +10,7 @@ public sealed class Duel : Scenario
public override uint Seed => 104;
public override bool Ambient => false;
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude();
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
diff --git a/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs b/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs
index 7498465c3..8f3fd024e 100644
--- a/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs
@@ -26,7 +26,7 @@ public sealed class FusedRounds : Scenario
// The shooter is staged at this quality, so the damage its Cluster Cannon deals does not ride the item stream.
public const float StagedQuality = .6f;
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude(DemoTerminus.Cast);
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
diff --git a/Assets/Scripts/ServerShared/Scenarios/LauncherAngles.cs b/Assets/Scripts/ServerShared/Scenarios/LauncherAngles.cs
index 61a798b1c..efd13e1aa 100644
--- a/Assets/Scripts/ServerShared/Scenarios/LauncherAngles.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/LauncherAngles.cs
@@ -10,7 +10,7 @@ public sealed class LauncherAngles : Scenario
public override uint Seed => 105;
public override bool Ambient => false;
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude();
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
diff --git a/Assets/Scripts/ServerShared/Scenarios/LockOn.cs b/Assets/Scripts/ServerShared/Scenarios/LockOn.cs
index 4f8c4dfa9..8e14c3ff6 100644
--- a/Assets/Scripts/ServerShared/Scenarios/LockOn.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/LockOn.cs
@@ -35,7 +35,7 @@ public sealed class LockOn : Scenario
_quality = quality;
}
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude(DemoTerminus.Cast);
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
diff --git a/Assets/Scripts/ServerShared/Scenarios/LongHaul.cs b/Assets/Scripts/ServerShared/Scenarios/LongHaul.cs
index 18e158247..692a5adbc 100644
--- a/Assets/Scripts/ServerShared/Scenarios/LongHaul.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/LongHaul.cs
@@ -8,7 +8,7 @@ public sealed class LongHaul : Scenario
"warp, quit and Continue keep items, tier and brand; death disables Continue.";
public override uint Seed => 106;
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude();
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage) =>
stage.Player(stage.Generated(stage.StartingHull), float2.zero);
diff --git a/Assets/Scripts/ServerShared/Scenarios/MainGalaxy.cs b/Assets/Scripts/ServerShared/Scenarios/MainGalaxy.cs
index 3e4482d3c..d8a484b7b 100644
--- a/Assets/Scripts/ServerShared/Scenarios/MainGalaxy.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/MainGalaxy.cs
@@ -7,6 +7,8 @@ public sealed class MainGalaxy : Scenario
public override string Id => "main-galaxy";
public override string Brief => "The full galaxy: factions drawn at random, bosses guarding the road to the exit.";
+ public override bool EntranceStation => false;
+
public override Galaxy Generate(GalaxyStage stage) => stage.Main();
public override void Stage(ScenarioStage stage) =>
diff --git a/Assets/Scripts/ServerShared/Scenarios/Pursuit.cs b/Assets/Scripts/ServerShared/Scenarios/Pursuit.cs
index d6d630a88..7bde23745 100644
--- a/Assets/Scripts/ServerShared/Scenarios/Pursuit.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/Pursuit.cs
@@ -1,3 +1,4 @@
+using System.Linq;
using static CultMath.math;
using static ItemRotation;
@@ -7,6 +8,11 @@ public sealed class Pursuit : Scenario
// cloud breaking a sensor's lock, and well outside the 40 at which AStrongCloseSensorBurnsThrough shows a close
// sensor burning through.
private const float Astern = 300;
+ // Crates each shooter's hold is stocked with: the measured draw over a run (ScenarioAmmunitionRunTests: at most ten minutes of play, and in
+ // practice the ~250-270 s a shooter holding every gun down lasts before it dies of heat; a pilot who vents heat is unmeasured) plus half again and one where the hold has room. The player laid four crates of Mines and drew
+ // 33 Ammo; its hold takes 54 crates after five consumables and Mines, so its Ammo stops at 39. The pursuer drew 31 Ammo and one Missiles. A launcher
+ // that drew under a reload carries the default three crates.
+ public const int MineCrates = 7, PlayerAmmoCrates = 39, PlayerMissileCrates = 3, PursuerAmmoCrates = 47, PursuerMissileCrates = 3;
public override string Name => "Pursuit";
public override string Id => "pursuit";
@@ -16,7 +22,7 @@ public sealed class Pursuit : Scenario
public override uint Seed => 111;
public override bool Ambient => false;
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude(DemoTerminus.Cast);
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
@@ -55,7 +61,9 @@ public sealed class Pursuit : Scenario
("Store-All Plus", int2(2, 8), None)); // Cargo Bay
var player = stage.Player(layer, float2(0, 0), facing: float2(0, 1));
- stage.Cargo(player, "Morning Fog", "Morning Fog", "Morning Fog", "send it", "send it");
- stage.Place(pursuer, float2(0, -Astern), facing: float2(0, 1), stance: ScenarioStance.Hostile, piloted: true);
+ stage.Cargo(player, new[] { "Morning Fog", "Morning Fog", "Morning Fog", "send it", "send it" }
+ .Concat(Enumerable.Repeat("Mines", MineCrates)).Concat(Enumerable.Repeat("Ammo", PlayerAmmoCrates)).Concat(Enumerable.Repeat("Missiles", PlayerMissileCrates)).ToArray());
+ var hostile = stage.Place(pursuer, float2(0, -Astern), facing: float2(0, 1), stance: ScenarioStance.Hostile, piloted: true);
+ stage.Cargo(hostile, Enumerable.Repeat("Ammo", PursuerAmmoCrates).Concat(Enumerable.Repeat("Missiles", PursuerMissileCrates)).ToArray());
}
}
diff --git a/Assets/Scripts/ServerShared/Scenarios/RefusedRounds.cs b/Assets/Scripts/ServerShared/Scenarios/RefusedRounds.cs
index 88cdd3fdb..384a7f286 100644
--- a/Assets/Scripts/ServerShared/Scenarios/RefusedRounds.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/RefusedRounds.cs
@@ -15,7 +15,7 @@ public sealed class RefusedRounds : Scenario
// The one target, ahead of the nose: inside every forward mount's arc.
public static readonly CultMath.float2 Target = float2(0, 300);
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude(DemoTerminus.Cast);
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
diff --git a/Assets/Scripts/ServerShared/Scenarios/Scenarios.cs b/Assets/Scripts/ServerShared/Scenarios/Scenarios.cs
index 752b33e28..60d291985 100644
--- a/Assets/Scripts/ServerShared/Scenarios/Scenarios.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/Scenarios.cs
@@ -5,7 +5,7 @@ public static class Scenarios
{
public static readonly Scenario[] Modes = { new DemoTerminus() };
- public static readonly Scenario[] Development = { new TutorialGalaxy(), new MainGalaxy() };
+ public static readonly Scenario[] Development = { new MainGalaxy() };
public static readonly Scenario[] Tests =
{
diff --git a/Assets/Scripts/ServerShared/Scenarios/StarvedReactor.cs b/Assets/Scripts/ServerShared/Scenarios/StarvedReactor.cs
index 2f3dff97b..ccef7e151 100644
--- a/Assets/Scripts/ServerShared/Scenarios/StarvedReactor.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/StarvedReactor.cs
@@ -10,7 +10,7 @@ public sealed class StarvedReactor : Scenario
public override uint Seed => 102;
public override bool Ambient => false;
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude();
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
diff --git a/Assets/Scripts/ServerShared/Scenarios/TutorialGalaxy.cs b/Assets/Scripts/ServerShared/Scenarios/TutorialGalaxy.cs
deleted file mode 100644
index 1ff521865..000000000
--- a/Assets/Scripts/ServerShared/Scenarios/TutorialGalaxy.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using float2 = CultMath.float2;
-
-// New Game as it has always been: a prelude galaxy, entered in the starting hull of the protagonist faction.
-public sealed class TutorialGalaxy : Scenario
-{
- public override string Name => "Tutorial Galaxy";
- public override string Id => "tutorial-galaxy";
- public override string Brief => "A small galaxy of fixed factions, entered in a ship of the protagonist faction.";
-
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude();
-
- public override void Stage(ScenarioStage stage)
- {
- var protagonist = stage.Galaxy.ResolveFaction(stage.TutorialGenerationSettings.ProtagonistFaction);
- stage.Player(stage.Generated(stage.StartingHull, protagonist), float2.zero);
- }
-}
diff --git a/Assets/Scripts/ServerShared/Scenarios/WeaponFeel.cs b/Assets/Scripts/ServerShared/Scenarios/WeaponFeel.cs
index 0817cfa80..f6f8eb337 100644
--- a/Assets/Scripts/ServerShared/Scenarios/WeaponFeel.cs
+++ b/Assets/Scripts/ServerShared/Scenarios/WeaponFeel.cs
@@ -14,7 +14,7 @@ public sealed class WeaponFeel : Scenario
// The one target, ahead of the nose: inside every forward mount's arc.
public static readonly CultMath.float2 Target = float2(0, 400);
- public override Galaxy Generate(GalaxyStage stage) => stage.Prelude(DemoTerminus.Cast);
+ public override Galaxy Generate(GalaxyStage stage) => stage.Cast(DemoTerminus.Cast);
public override void Stage(ScenarioStage stage)
{
diff --git a/Assets/Scripts/ServerShared/Settings.cs b/Assets/Scripts/ServerShared/Settings.cs
index 8326f76da..523e773f1 100644
--- a/Assets/Scripts/ServerShared/Settings.cs
+++ b/Assets/Scripts/ServerShared/Settings.cs
@@ -29,6 +29,11 @@ public class PlanetSettings
public ExponentialLerp AsteroidSize;
public ExponentialLerp AsteroidHitpoints;
public ExponentialLerp AsteroidRespawnTime;
+ // Units of ore a whole rock of normalized size s gives (FireControl.Extract), however many hits break it.
+ public ExponentialLerp AsteroidYield;
+ // How far a rock's mix of its belt's ores strays from the kind's ratio: each ore's weight is scaled by
+ // exp(variance x g), g in [-1, 1) a stable hash of (rock, ore). Zero reads the kind's ratio.
+ public float ChunkCompositionVariance;
public float SecureAreaRadiusMultiplier = .45f;
@@ -89,8 +94,10 @@ public class SectorGenerationSettings
public int BossCount;
}
-[Serializable, MessagePackObject(keyAsPropertyName:true), JsonObject]
-public class TutorialGenerationSettings
+// The fixed cast of a galaxy a scenario generates through GalaxyStage.Cast: who plays which part, how big the galaxy is,
+// and how far the factions' authored influence reaches (Galaxy.InfluenceOf). Held by the scenario that casts it; no
+// asset or store holds one.
+public class GalaxyCast
{
public string ProtagonistFaction;
public string AntagonistFaction;
@@ -101,6 +108,8 @@ public class TutorialGenerationSettings
public int ZoneCount = 32;
// Zones per resource province (Provinces.Partition): calibration, not a gate.
public int ProvinceZones = Provinces.DefaultZonesPerProvince;
+ // Multiplies every faction's authored InfluenceDistance in this galaxy (rounding up); 1 leaves them as authored.
+ public float InfluenceScale = 1;
}
[Serializable, MessagePackObject(keyAsPropertyName:true), JsonObject]
diff --git a/Assets/Scripts/ServerShared/ShipAuthoring.cs b/Assets/Scripts/ServerShared/ShipAuthoring.cs
index 3962fa468..8441d0332 100644
--- a/Assets/Scripts/ServerShared/ShipAuthoring.cs
+++ b/Assets/Scripts/ServerShared/ShipAuthoring.cs
@@ -33,6 +33,9 @@ public sealed class ShipJoint
[Key(2)] public float[] Axes;
[Key(3)] public float[] Min;
[Key(4)] public float[] Max;
+
+ // Element identity, derived from the bone id so it never changes across rewrites.
+ [Key(5)] [CultElementId(nameof(Id))] public string ElementId = "";
}
[MessagePackObject]
@@ -50,6 +53,9 @@ public sealed class ShipAnchor
[Key(4)] public int Order;
// On a weapon-mount anchor: the id of the nearest joint above its node in the model; null or empty is a fixed mount.
[Key(5)] public string Joint;
+
+ // Element identity, derived from the anchor id so it never changes across rewrites.
+ [Key(6)] [CultElementId(nameof(Id))] public string ElementId = "";
}
// Evaluated or baked Grease Pencil stroke coordinates in Blender's right-handed Z-up
@@ -64,6 +70,9 @@ public sealed class ShipPolyline
[Key(4)] public float[] Opacities;
[Key(5)] public bool Cyclic;
[Key(6)] public float[] Color;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(7)] [CultElementId] public string Id = "";
}
public static class ShipAuthoringStore
diff --git a/Assets/Scripts/ServerShared/ShipModCatalog.cs b/Assets/Scripts/ServerShared/ShipModCatalog.cs
index e9ed613a2..91bbc296d 100644
--- a/Assets/Scripts/ServerShared/ShipModCatalog.cs
+++ b/Assets/Scripts/ServerShared/ShipModCatalog.cs
@@ -4,6 +4,7 @@ using System.IO;
using System.Linq;
using GameCult.Caching;
using Newtonsoft.Json.Linq;
+using System.Numerics;
using System.Text;
// Builds the one catalog snapshot CultCache needs. Sources remain the shipped catalog and each
@@ -110,6 +111,7 @@ public static class ShipModCatalog
if (shipIds.Contains(ship.Id))
Exclude(directory, $"ship ID collides with an existing catalog ship authoring record.");
if (StationKinds.HullKindFault(cache, hull) is { } kindFault) Exclude(directory, kindFault);
+ if (MarketFault(cache, ship, package.Products) is { } marketFault) Exclude(directory, marketFault);
foreach (var product in package.Products)
{
if (!factionKeys.Contains(product.Manufacturer.Key))
@@ -157,6 +159,26 @@ public static class ShipModCatalog
}
}
+ // Why a package's products cannot join the catalog, or null; the one judgement Compose and `ship-authoring validate` share.
+ // `items` is the shipped catalog. A product's bin may name only a product line the shipped catalog holds or one of the
+ // package's own products (and that line must not be a bin itself): the catalog read refuses any other bin, and a line in
+ // another package is no promise, since packages compose independently. With every bin resolved, a hull offered through any of its
+ // products is drawn on the map and the schematic by its lines (ShipModVisual.BuildLineMesh builds nothing from none), so an
+ // offered hull without any is refused; an unoffered stand-in is left alone. Offered is LoadoutGenerator.IsOffered, the one
+ // reader of NotOffered (ruling off-market-is-unoffered-product), resolving a line among the package's own products too.
+ public static string MarketFault(CultCache items, ShipAuthoring ship, FactionProductData[] products)
+ {
+ var own = new Dictionary();
+ foreach (var product in products) own[ProductKey(ship.Id, product.Manufacturer.Key)] = product;
+ FactionProductData LineOf(CultRecordRef line) => items.Get(line) ?? (own.TryGetValue(line.Key, out var found) ? found : null);
+ foreach (var product in products.Where(product => product.Bin != null))
+ if (LineOf(product.Bin.Line) is not { } line || line.Bin != null)
+ return $"{ship.Id}: product '{product.Name}' bins a line that is neither an unbinned shipped product nor an unbinned product of this package.";
+ if (ship.SchematicLines != null && ship.SchematicLines.Any(line => line?.Points != null && line.Points.Length > 0)) return null;
+ return products.Any(product => LoadoutGenerator.IsOffered(product, LineOf))
+ ? $"{ship.Id}: the hull is offered on the market but has no schematic lines." : null;
+ }
+
public static Package ReadPackage(string shipPath)
{
var path = Path.GetFullPath(shipPath);
@@ -251,17 +273,19 @@ public static class ShipModCatalog
foreach (var anchor in ship.Anchors)
if (!modelNodes.ContainsKey(anchor.ModelNodeId))
throw new InvalidOperationException($"{ship.Id}: model has no node with aetheria.id={anchor.ModelNodeId} for anchor {anchor.Id}.");
- // Assemble reads a renderer or collider mesh from these anchors' nodes and refuses without one, and reads the shield
- // node's scale as three positive radii (ruling thrusters-radiators-are-meshes). These refusals stand in for Assemble's
- // throws, so a package Compose includes is one the importer's assembler can build; the exhaust emission surface and
- // the glowing radiator are meshes by that same ruling. A weapon mount and a tractor may be empties.
+ // Assemble reads a renderer or collider mesh from these anchors' nodes, and the shield node's scale as three positive
+ // radii (ruling thrusters-radiators-are-meshes). These refusals cover everything the package's files say about whether
+ // the importer can build a node (skin, dangling or empty mesh, not only "names a mesh") and are Assemble's only judge,
+ // so a package Compose includes is one the importer's assembler can build; the exhaust emission surface and the
+ // glowing radiator are meshes by that same ruling. A weapon mount and a tractor may be empties.
foreach (var anchor in ship.Anchors)
if ((anchor.Role == "thruster-emitter" || anchor.Role == "radiator-mesh" || anchor.Role == "map-icon" || anchor.Role == "hull-collider") &&
!modelNodes[anchor.ModelNodeId].HasMesh)
- throw new InvalidOperationException($"{ship.Id}: {anchor.Role} anchor {anchor.Id} needs a mesh, but model node {anchor.ModelNodeId} has none.");
+ throw new InvalidOperationException($"{ship.Id}: {anchor.Role} anchor {anchor.Id} needs a mesh, but model node {anchor.ModelNodeId} has none the importer can build.");
foreach (var anchor in ship.Anchors)
if (anchor.Role == "shield" && !modelNodes[anchor.ModelNodeId].PositiveScale)
throw new InvalidOperationException($"{ship.Id}: shield anchor {anchor.Id} needs three positive scale radii on model node {anchor.ModelNodeId}, with no matrix.");
+ BindExhaust(hull, ship, modelNodes, modelPath);
BindRig(ship, modelNodes);
CultRecordRefs.Validate(hull);
return new Package
@@ -271,6 +295,166 @@ public static class ShipModCatalog
};
}
+ // A thruster emitter's mesh is the surface its exhaust is born from, along each triangle's normal, so the mesh has to face
+ // the way the exhaust goes. Every thruster is a directional thruster today: its Rotation faces its exhaust, the push
+ // is the opposite way, and an emitter triangle whose normal has a non-negative dot with the push would fire exhaust
+ // along it (a closed box fires both ways). A thruster of another class, a ring thruster whose exhaust leaves radially,
+ // is not this rule's to judge: it would come with its own class on the hardpoint and its own rule beside this one.
+ private static void BindExhaust(HullData hull, ShipAuthoring ship, Dictionary nodes, string modelPath)
+ {
+ var emitters = ship.Anchors.Where(anchor => anchor.Role == "thruster-emitter").ToArray();
+ if (emitters.Length == 0) return;
+ var model = GlbGeometry.Read(modelPath);
+ foreach (var anchor in emitters)
+ {
+ var hardpoint = hull.Hardpoints.FirstOrDefault(candidate => candidate.Type == HardpointType.Thruster && candidate.Transform == anchor.Id);
+ // An emitter anchor with no thruster hardpoint is already a package fault: ShipAuthoringStore.Validate (run by Read and
+ // PackageOf before Bind) refuses a mount-role anchor that is not the mount of a hardpoint of its type.
+ if (hardpoint == null) continue;
+ var facing = hardpoint.Rotation.Direction();
+ // The model's frame is glTF's, nose toward +Z and port toward +X (the Blender kit's nose at -Y and port at +X,
+ // through the exporter's Y-up conversion): a hardpoint facing (x, y) in the grid faces (-x, 0, y) in the model.
+ var push = -new Vector3(-facing.x, 0f, facing.y);
+ var wrong = model.Normals((int)nodes[anchor.ModelNodeId].Index).Count(normal => Vector3.Dot(normal, push) >= 0f);
+ if (wrong > 0)
+ throw new InvalidOperationException($"{ship.Id}: thruster emitter {anchor.Id} has {wrong} face or vertex normal(s) that do not face its exhaust " +
+ $"({hardpoint.Rotation}); a directional thruster's emitter fires only along its exhaust, so it must be one-sided, not a closed box.");
+ }
+ }
+
+ // The triangles of a GLB as the node tree places them, read for the one question the emitter rule asks: which way each
+ // face points. Float positions and normals, indices of 1, 2 or 4 bytes or none, no sparse, no compression: a model the
+ // exporter writes. Anything else is refused as unreadable rather than guessed at.
+ private sealed class GlbGeometry
+ {
+ private readonly JObject _json;
+ private readonly byte[] _bin;
+ private readonly string _path;
+
+ private GlbGeometry(JObject json, byte[] bin, string path) { _json = json; _bin = bin; _path = path; }
+
+ public static GlbGeometry Read(string path)
+ {
+ var bytes = File.ReadAllBytes(path);
+ var jsonLength = (int)BitConverter.ToUInt32(bytes, 12);
+ var json = JObject.Parse(Encoding.UTF8.GetString(bytes, 20, jsonLength));
+ var at = 20 + jsonLength;
+ var bin = at + 8 <= bytes.Length && BitConverter.ToUInt32(bytes, at + 4) == 0x004E4942u
+ ? bytes.Skip(at + 8).Take((int)BitConverter.ToUInt32(bytes, at)).ToArray() : Array.Empty();
+ return new GlbGeometry(json, bin, path);
+ }
+
+ // Unit normals in the model frame: each triangle's face normal (its winding, flipped when the node's world transform
+ // mirrors, as glTF says) and each vertex normal the primitive carries.
+ public IEnumerable Normals(int node)
+ {
+ var world = World(node);
+ var mirrored = world.GetDeterminant() < 0f;
+ var meshIndex = (int?)_json["nodes"][node]["mesh"];
+ if (meshIndex == null) yield break;
+ foreach (var primitive in (JArray)_json["meshes"][meshIndex.Value]["primitives"])
+ {
+ var attributes = (JObject)primitive["attributes"];
+ if (primitive["extensions"] is JObject extensions && extensions.Properties().Any(p => HidesGeometry(p.Name)))
+ throw Unreadable($"mesh {meshIndex} is compressed by {extensions.Properties().First(p => HidesGeometry(p.Name)).Name}");
+ var normalMatrix = Matrix4x4.Invert(world, out var inverse) ? Matrix4x4.Transpose(inverse) : throw Unreadable($"node {node} has a transform that cannot be inverted");
+ var positions = Vectors((int)attributes["POSITION"]).Select(point => Vector3.Transform(point, world)).ToArray();
+ var indices = primitive["indices"] == null ? Enumerable.Range(0, positions.Length).ToArray() : Indices((int)primitive["indices"]);
+ for (var i = 0; i + 2 < indices.Length; i += 3)
+ {
+ var face = Vector3.Cross(positions[indices[i + 1]] - positions[indices[i]], positions[indices[i + 2]] - positions[indices[i]]);
+ if (face.LengthSquared() < 1e-12f) continue;
+ yield return Vector3.Normalize(mirrored ? -face : face);
+ }
+ if (attributes["NORMAL"] != null)
+ foreach (var normal in Vectors((int)attributes["NORMAL"]))
+ if (normal.LengthSquared() > 1e-12f) yield return Vector3.Normalize(Vector3.TransformNormal(normal, normalMatrix));
+ }
+ }
+
+ // Row-vector matrices, so a child's world is its local times its parent's world.
+ private Matrix4x4 World(int node)
+ {
+ var parents = new Dictionary();
+ var nodes = (JArray)_json["nodes"];
+ for (var parent = 0; parent < nodes.Count; parent++)
+ foreach (var child in nodes[parent]["children"]?.Select(token => (int)token) ?? Enumerable.Empty()) parents[child] = parent;
+ var world = Matrix4x4.Identity;
+ for (int at = node, steps = 0; steps <= nodes.Count; steps++)
+ {
+ world *= Local((JObject)nodes[at]);
+ if (!parents.TryGetValue(at, out at)) break;
+ }
+ return world;
+ }
+
+ private static Matrix4x4 Local(JObject node)
+ {
+ if (node["matrix"] is JArray m)
+ {
+ var v = m.Select(token => (float)token).ToArray();
+ return new Matrix4x4(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9], v[10], v[11], v[12], v[13], v[14], v[15]);
+ }
+ float[] Of(string key, float[] fallback) => node[key] is JArray a ? a.Select(token => (float)token).ToArray() : fallback;
+ var scale = Of("scale", new[] { 1f, 1f, 1f });
+ var rotation = Of("rotation", new[] { 0f, 0f, 0f, 1f });
+ var translation = Of("translation", new[] { 0f, 0f, 0f });
+ return Matrix4x4.CreateScale(scale[0], scale[1], scale[2]) *
+ Matrix4x4.CreateFromQuaternion(new Quaternion(rotation[0], rotation[1], rotation[2], rotation[3])) *
+ Matrix4x4.CreateTranslation(translation[0], translation[1], translation[2]);
+ }
+
+ // The bytes an accessor reads from: its view's slice of the BIN chunk, at the view's stride.
+ private (int Offset, int Stride, int Count, int Component, string Type) Locate(int accessor)
+ {
+ var a = (JObject)_json["accessors"][accessor];
+ if (a["sparse"] != null || a["bufferView"] == null) throw Unreadable($"accessor {accessor} is sparse or has no buffer view");
+ var view = (JObject)_json["bufferViews"][(int)a["bufferView"]];
+ if (view["extensions"] is JObject viewExtensions && viewExtensions.Properties().Any(p => HidesGeometry(p.Name)))
+ throw Unreadable($"accessor {accessor} is compressed by {viewExtensions.Properties().First(p => HidesGeometry(p.Name)).Name}");
+ var component = (int)a["componentType"];
+ var type = (string)a["type"];
+ var width = (component == 5126 || component == 5125 ? 4 : component == 5123 ? 2 : 1) * (type == "VEC3" ? 3 : 1);
+ var offset = ((int?)view["byteOffset"] ?? 0) + ((int?)a["byteOffset"] ?? 0);
+ var stride = (int?)view["byteStride"] ?? width;
+ var count = (int)a["count"];
+ if (offset < 0 || count < 0 || (count > 0 && offset + (long)(count - 1) * stride + width > _bin.Length)) throw Unreadable($"accessor {accessor} reaches past the BIN chunk");
+ return (offset, stride, count, component, type);
+ }
+
+ private Vector3[] Vectors(int accessor)
+ {
+ var (offset, stride, count, component, type) = Locate(accessor);
+ if (component != 5126 || type != "VEC3") throw Unreadable($"accessor {accessor} is not float VEC3");
+ var result = new Vector3[count];
+ for (var i = 0; i < count; i++)
+ {
+ var at = offset + i * stride;
+ result[i] = new Vector3(BitConverter.ToSingle(_bin, at), BitConverter.ToSingle(_bin, at + 4), BitConverter.ToSingle(_bin, at + 8));
+ }
+ return result;
+ }
+
+ private int[] Indices(int accessor)
+ {
+ var (offset, stride, count, component, type) = Locate(accessor);
+ if (type != "SCALAR" || component != 5121 && component != 5123 && component != 5125) throw Unreadable($"accessor {accessor} is not an index accessor");
+ var result = new int[count];
+ for (var i = 0; i < count; i++)
+ {
+ var at = offset + i * stride;
+ result[i] = component == 5121 ? _bin[at] : component == 5123 ? BitConverter.ToUInt16(_bin, at) : (int)BitConverter.ToUInt32(_bin, at);
+ }
+ return result;
+ }
+
+ // The extensions that store geometry in a form this reader does not decode; any other (materials, variants) leaves the
+ // positions and normals where the accessors say.
+ private static bool HidesGeometry(string extension) => extension == "KHR_draco_mesh_compression" || extension == "EXT_meshopt_compression";
+
+ private InvalidOperationException Unreadable(string reason) => new InvalidOperationException($"{_path}: emitter geometry is unreadable: {reason}.");
+ }
+
// The rig the record states must be the rig the model has: every joint is a node, each joint's Parent and each mount's
// Joint is the nearest joint above its node, ancestors without an id being walked through by ReadNodeIds, and a radiator
// mesh sits under no joint.
@@ -309,7 +493,23 @@ public static class ShipModCatalog
private static bool PositiveScale(JObject node) =>
node["matrix"] == null && (node["scale"] == null || node["scale"].Select(component => (double)component).All(component => component > 0));
- // GLB is the xenos asset boundary. Only its node extras, whether each node names a mesh, and its nearest identified ancestor's node index
+ // A mesh the importer builds as a plain mesh node: no skin (glTFast makes a skinned node a SkinnedMeshRenderer, which
+ // Assemble's MeshRenderer/MeshFilter reads cannot see), a mesh index inside meshes, at least one primitive, and every
+ // primitive with POSITION and a mode absent or 4 (triangles). Geometry accessors and buffers are not read.
+ private static bool BuildsMesh(JObject json, JObject node)
+ {
+ if (node["skin"] != null && node["skin"].Type != JTokenType.Null) return false;
+ var meshes = json["meshes"] as JArray;
+ if (node["mesh"] == null || node["mesh"].Type != JTokenType.Integer || meshes == null) return false;
+ var index = (long)node["mesh"];
+ if (index < 0 || index >= meshes.Count) return false;
+ var primitives = (meshes[(int)index] as JObject)?["primitives"] as JArray;
+ return primitives != null && primitives.Count > 0 && primitives.All(primitive =>
+ primitive is JObject p && p["attributes"]?["POSITION"] != null &&
+ (p["mode"] == null || (p["mode"].Type == JTokenType.Integer && (int)p["mode"] == 4)));
+ }
+
+ // GLB is the xenos asset boundary. Only its node extras, whether each node carries a mesh the importer builds as a plain mesh node, and its nearest identified ancestor's node index
// (-1 for none) are read here, plus whether the node's scale is three positive radii with no matrix; geometry belongs to the runtime importer.
public static Dictionary ReadNodeIds(string path)
{
@@ -333,7 +533,7 @@ public static class ShipModCatalog
{
var id = (string)node["extras"]?["aetheria.id"];
if (string.IsNullOrEmpty(id)) { index++; continue; }
- if (!ids.TryAdd(id, (index, node["mesh"] != null && node["mesh"].Type != JTokenType.Null, IdentifiedAncestor(parents, nodes, (int)index), PositiveScale(node))))
+ if (!ids.TryAdd(id, (index, BuildsMesh(json, node), IdentifiedAncestor(parents, nodes, (int)index), PositiveScale(node))))
throw new InvalidOperationException($"{path}: duplicate GLB node aetheria.id={id}.");
index++;
}
diff --git a/Assets/Scripts/ServerShared/SimulationDice.cs b/Assets/Scripts/ServerShared/SimulationDice.cs
index adc440299..c8cb9e759 100644
--- a/Assets/Scripts/ServerShared/SimulationDice.cs
+++ b/Assets/Scripts/ServerShared/SimulationDice.cs
@@ -18,6 +18,9 @@ public static class SimulationDice
// seed (CombatSeed): the run seed feeds drops and mines only (ruling run-seed-drops-only), and placement never rides
// ItemManager.Random.
public const uint ScatterStream = 5;
+ // The ore a shot's wear of rocks pays, ordinal the shot's ShotId, on the zone's DropSeed (mined ore is a drop):
+ // FireControl.Extract is the one reader.
+ public const uint OreStream = 6;
// 9.1 (docs/fire-control-cut.md): fmix32, MurmurHash3's 32-bit finalizer -- xor-shift, multiply,
// xor-shift, multiply, xor-shift. Diffuses a structured seed (a zone seed XORed with a small,
diff --git a/Assets/Scripts/ServerShared/StationKinds.cs b/Assets/Scripts/ServerShared/StationKinds.cs
index dad1ce2aa..eb2662eee 100644
--- a/Assets/Scripts/ServerShared/StationKinds.cs
+++ b/Assets/Scripts/ServerShared/StationKinds.cs
@@ -35,6 +35,9 @@ public class StationKindStandIn
// The kind whose model this faction builds in place of the owning kind's.
[JsonProperty("kind"), Key(1)]
public CultRecordRef Kind;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(2)] [CultElementId] public string Id = "";
}
// The one owner of which kinds a faction builds, which kind a station gets, and which hull kind stands in.
diff --git a/Assets/Scripts/ServerShared/StationServices.cs b/Assets/Scripts/ServerShared/StationServices.cs
index 153fc595d..dace9288e 100644
--- a/Assets/Scripts/ServerShared/StationServices.cs
+++ b/Assets/Scripts/ServerShared/StationServices.cs
@@ -94,19 +94,50 @@ public static class StationServices
public static int BuyableQuantity(ItemManager items, SimpleCommodity stock, int typed, int credits) =>
Math.Max(1, Math.Min(Math.Min(typed, credits / BuyPrice(items, stock)), stock.Quantity));
- // The sale: the item leaves the bay for one of the station's cargo bays and the station pays SellPrice. False,
- // with the item in its bay and the credits unchanged, when no station bay can take it.
+ // The sale: the item leaves the bay and the station pays SellPrice. A crafted item goes to one of the station's
+ // cargo bays; false, with the item in its bay and the credits unchanged, when no bay can take it. A simple
+ // commodity always sells (aetheria-release:ruling:station-market-absorbs-sold-commodity): the bays take as much of
+ // the stack as fits and the market absorbs the rest, at the full price.
public static bool TrySell(EquippedCargoBay from, Entity station, ItemInstance item, ref int credits)
{
var price = SellPrice(station.ItemManager, item);
- var moved = item is SimpleCommodity commodity
- ? station.CargoBays.Any(bay => from.TryTransferItem(bay, commodity, commodity.Quantity))
- : station.CargoBays.Any(bay => from.TryTransferItem(bay, (CraftedItemInstance) item));
- if (!moved) return false;
+ if (item is SimpleCommodity commodity)
+ {
+ if (!from.Cargo.ContainsKey(commodity)) return false;
+ var offered = commodity.Quantity;
+ for (var quantity = offered; quantity >= 1; quantity--)
+ if (station.CargoBays.Any(bay => from.TryTransferItem(bay, commodity, quantity))) break;
+ if (from.Cargo.ContainsKey(commodity)) from.Remove(commodity, commodity.Quantity);
+ }
+ else if (!station.CargoBays.Any(bay => from.TryTransferItem(bay, (CraftedItemInstance) item))) return false;
credits += price;
return true;
}
+ // The mined stacks of the bays: simple commodities with a lot whose origin is Extracted. Ammunition and consumables are
+ // simple commodities too, and a bought or staged commodity has Lot 0, which GetLot cannot resolve.
+ private static ItemInstance[] OreStacks(ItemManager items, IEnumerable bays) =>
+ bays.SelectMany(bay => bay.Cargo.Keys.OfType().Where(stack => stack.Lot != 0 && items.GetLot(stack).Origin is Extracted).Select(stack => (ItemInstance) stack)).ToArray();
+
+ // What the station pays for every mined stack of the bays: the sum of SellPrice over the stacks TrySellOre sells.
+ public static int OreValue(ItemManager items, IEnumerable bays) =>
+ (int) Math.Min(OreStacks(items, bays).Sum(stack => (long) SellPrice(items, stack)), int.MaxValue);
+
+ // Sells every mined stack of the bays, each through TrySell, so the market's absorb rule and the price are the
+ // single-stack path's. Returns the units sold.
+ public static int TrySellOre(IEnumerable bays, Entity station, ref int credits)
+ {
+ var bayList = bays.ToArray();
+ var units = 0;
+ foreach (var stack in OreStacks(station.ItemManager, bayList))
+ {
+ var quantity = ((SimpleCommodity) stack).Quantity;
+ var from = bayList.First(bay => bay.Cargo.ContainsKey(stack));
+ if (TrySell(from, station, stack, ref credits)) units += quantity;
+ }
+ return units;
+ }
+
// The repair: armour and every durability go back to design and the station charges RepairCost. False, with
// nothing restored, when the credits fall short.
public static bool TryRepair(Entity entity, ref int credits)
diff --git a/Assets/Scripts/ServerShared/Targeting/BeltTargets.cs b/Assets/Scripts/ServerShared/Targeting/BeltTargets.cs
index 3e12536c3..a64e0c624 100644
--- a/Assets/Scripts/ServerShared/Targeting/BeltTargets.cs
+++ b/Assets/Scripts/ServerShared/Targeting/BeltTargets.cs
@@ -48,8 +48,7 @@ public sealed class BeltTargets : ITargetProvider
_zone = zone;
_field = field;
_data = data;
- var size = settings.AsteroidSize;
- _largestRadius = size.Exponent > 0 ? max(abs(size.Minimum), abs(size.Maximum)) : float.PositiveInfinity;
+ _largestRadius = Zone.LargestChunkRadius(settings);
var count = data.Asteroids.Length;
_periods = new double[count];
diff --git a/Assets/Scripts/ServerShared/VerseGrammar.cs b/Assets/Scripts/ServerShared/VerseGrammar.cs
index 00e24833d..1219e70b6 100644
--- a/Assets/Scripts/ServerShared/VerseGrammar.cs
+++ b/Assets/Scripts/ServerShared/VerseGrammar.cs
@@ -40,6 +40,9 @@ public class VerseRole
{
[Key(1)] public string Name;
[Key(2)] public VerseReferentKind Binds;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(3)] [CultElementId] public string Id = "";
}
// The actor is the invoking subject and is never a role.
diff --git a/Assets/Scripts/ServerShared/Zone.cs b/Assets/Scripts/ServerShared/Zone.cs
index 6ba9ef7d7..74d1486c3 100644
--- a/Assets/Scripts/ServerShared/Zone.cs
+++ b/Assets/Scripts/ServerShared/Zone.cs
@@ -62,6 +62,9 @@ public class Zone
// the entities, and one provider per belt. The reticle, cycling and any range query over rocks go through it;
// nothing else scans a belt.
public readonly TargetingIndex Targets = new TargetingIndex();
+ // Mining cut 4a: the receiver of every rock impact FireControl.Detonate publishes. Notification only: a presenter
+ // subscribes once per zone, and nothing in ServerShared reads it.
+ public readonly CapabilityEvents ChunkCapabilities = new CapabilityEvents();
private readonly List _suns = new List();
private HashSet _updatedOrbits = new HashSet();
@@ -87,6 +90,8 @@ public class Zone
public Subject ShotResolved = new Subject();
// Contacts.Step publishes each hull-on-hull contact it resolves; presentations are the only readers.
public Subject Contacted = new Subject();
+ // Published by FireControl.Extract and TryPickUp once ore or an item enters (or is offered to) a hold; read by presentations only.
+ public Subject CargoGained = new Subject();
private int _nextShotId;
public int NextShotId() => ++_nextShotId;
@@ -438,8 +443,16 @@ public class Zone
{
var floating = FloatingItems.FirstOrDefault(f => f.Id.Equals(id));
if (floating == null || (floating.Holder != null && !ReferenceEquals(floating.Holder, taker))) return false;
+ // The quantity is read before the store: a store that merges into a part-filled stack and spills the rest into a
+ // new cell rewrites the item's Quantity.
+ var stored = floating.Item is SimpleCommodity stack ? stack.Quantity : 1;
if (!taker.CargoBays.Any(bay => bay.TryStore(floating.Item))) return false;
FloatingItems.Remove(floating);
+ CargoGained.OnNext(new CargoGain
+ {
+ Taker = taker, Design = floating.Item.Data, Lot = floating.Item.Lot, Kind = GainKind.Collected,
+ Stored = stored
+ });
return true;
}
@@ -674,16 +687,25 @@ public class Zone
return belt.DamagedSize(chunk.Index, wear.Damage, Settings);
}
- // Cut 2: the only writer of chunk wear. Returns whether this hit broke the chunk. The break threshold is
+ // No rock of any belt, whole or worn, is wider than this (AsteroidSize's bound over every argument, so over the
+ // Asteroid.Size range the generator writes). The index's visibility bound and a blast's query reach both use it.
+ public static float LargestChunkRadius(PlanetSettings settings)
+ {
+ var size = settings.AsteroidSize;
+ return size.Exponent > 0 ? max(abs(size.Minimum), abs(size.Maximum)) : float.PositiveInfinity;
+ }
+
+ // Cut 2: the only writer of chunk wear. Returns the damage the rock absorbed: the damage, or the hitpoints it had
+ // left when the hit broke it; 0 on a chunk that is already broken. Whether it broke is ChunkExists. The break threshold is
// strictly greater-than, matching the deleted per-tick miner's own comparison against accumulated damage:
// damage exactly equal to hitpoints does not yet break the chunk, only damage that exceeds them does.
- // A chunk that is currently broken (zone time < BrokenUntil) absorbs nothing: this hit did not break it
- // (it was already broken), and its wear stays zeroed until it respawns and starts fresh.
- public bool Wear(ChunkId chunk, float damage)
+ // A chunk that is currently broken (zone time < BrokenUntil) absorbs nothing, and its wear stays zeroed until it
+ // respawns and starts fresh.
+ public float Wear(ChunkId chunk, float damage)
{
_wear.TryGetValue(chunk, out var wear);
if (wear.BrokenUntil.HasValue && wear.BrokenUntil.Value > _time)
- return false;
+ return 0f;
var beltData = (AsteroidBeltData) Planets[chunk.Field];
var size = beltData.Asteroids[chunk.Index].Size;
@@ -695,11 +717,11 @@ public class Zone
{
var respawnTime = Settings.AsteroidRespawnTime.Evaluate(size);
_wear[chunk] = new ChunkWear { Damage = 0f, BrokenUntil = _time + respawnTime };
- return true;
+ return max(hitpoints - wear.Damage, 0f);
}
_wear[chunk] = new ChunkWear { Damage = newDamage, BrokenUntil = null };
- return false;
+ return damage;
}
// Cut 1 (docs/mining-cut.md): a chunk's pose is a pure function of zone time, computed when asked. No stored
@@ -715,6 +737,20 @@ public class Zone
return AsteroidBelts[belt].Pose(index, time, parentPosition, size);
}
+ // Mining Cut 4b: the one owner of a chunk's planar velocity, the central difference of the pose function at zone
+ // time. Derived on every read, never stored: the intercept, the fire-time projection and the mount's sweep all
+ // read it here.
+ public float2 ChunkVelocity(ChunkId chunk)
+ {
+ const double h = .05;
+ var ahead = ChunkPose(chunk.Field, chunk.Index, _time + h).xy;
+ var behind = ChunkPose(chunk.Field, chunk.Index, _time - h).xy;
+ return (ahead - behind) / (float) (2 * h);
+ }
+
+ // A chunk's radius in schematic cells: what visibility and a shot's silhouette both measure it in.
+ public float ChunkCells(ChunkId chunk) => ChunkRadius(chunk) / SchematicCellSize;
+
// Mining Cut 3 (docs/mining-cut-refresh.md): how bright a chunk is -- Reflector's rule (cross-section × the light
// on it), with the field kind's reflectivity per schematic cell times the chunk's area in cells. Computed when
// asked; nothing about it is stored. A worn chunk shrinks and dims; a broken one, or one of a kindless belt, is dark.
@@ -723,7 +759,7 @@ public class Zone
if (!ChunkExists(chunk)) return 0f;
var kind = _itemManager.ItemData.Get(((AsteroidBeltData) Planets[chunk.Field]).Kind);
if (kind == null) return 0f;
- var cells = ChunkRadius(chunk) / _itemManager.GameplaySettings.SchematicCellSize;
+ var cells = ChunkCells(chunk);
return kind.CrossSection * PI * cells * cells * GetLight(ChunkPose(chunk.Field, chunk.Index).xy);
}
diff --git a/Assets/Scripts/ServerShared/ZoneData.cs b/Assets/Scripts/ServerShared/ZoneData.cs
index a08895aaa..e76963a43 100644
--- a/Assets/Scripts/ServerShared/ZoneData.cs
+++ b/Assets/Scripts/ServerShared/ZoneData.cs
@@ -67,6 +67,9 @@ public class ChunkWearPack
[JsonProperty("brokenUntil"), Key(3)]
public double? BrokenUntil;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(4)] [CultElementId] public string Id = "";
}
[JsonObject(MemberSerialization.OptIn)]
@@ -149,6 +152,9 @@ public class FieldYield
[JsonProperty("regional"), Key(2)]
public bool Regional;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(3)] [CultElementId] public string Id = "";
}
// Ore geography (rulings provinces-within-regions, ores-are-regional): a kind of ground, authored. A region deals its
@@ -182,6 +188,9 @@ public class ProvinceKindWeight
[JsonProperty("weight"), Key(1)]
public float Weight = 1;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(2)] [CultElementId] public string Id = "";
}
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
@@ -192,6 +201,9 @@ public class ProvinceOre
[JsonProperty("weight"), Key(1)]
public float Weight = 1;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(2)] [CultElementId] public string Id = "";
}
// Mining Cut 3 (Q16 B): the one owner of which kind a belt is. Ore geography: and of what it yields.
@@ -485,6 +497,9 @@ public class Asteroid
[JsonProperty("rotationSpeed"), Key(3)]
public float RotationSpeed;
+
+ // Element identity: minted by the cache on write; "" means unset.
+ [Key(4)] [CultElementId] public string Id = "";
}
[CultDocument("aetheria.orbitdata", "1"), MessagePackObject, JsonObject(MemberSerialization.OptIn)]
diff --git a/Assets/Scripts/ServerShared/ZoneGenerator.cs b/Assets/Scripts/ServerShared/ZoneGenerator.cs
index 5b82a9a1a..42c4c15c0 100644
--- a/Assets/Scripts/ServerShared/ZoneGenerator.cs
+++ b/Assets/Scripts/ServerShared/ZoneGenerator.cs
@@ -43,7 +43,7 @@ public static class ZoneGenerator
PlanetSettings planetSettings,
Galaxy galaxy,
GalaxyZone galaxyZone,
- bool isTutorial = false,
+ bool entranceStation = false,
bool ambient = true)
{
var pack = new ZonePack();
@@ -294,15 +294,15 @@ public static class ZoneGenerator
var storyStations = galaxyZone.Locations.Where(story => story.Type == LocationType.Station).ToArray();
var stationCount = (int)(random.NextFloat() * (factionPresence + 1)) + storyStations.Length;
- // Enemy count below is based on this pre-override value, so the tutorial entrance doesn't gain an enemy
+ // Enemy count below is based on this pre-override value, so the entrance station zone doesn't gain an enemy
// just because its station got forced.
var baseStationCount = stationCount;
- // Operator ruling, 2026-09-25 (docs/locomotion-cut.md, "Tutorial station"): the entrance zone always
- // gets a generated faction station with a docking bay, deterministically. Galaxy.cs halves influence and
- // picks the lowest-influence unowned zone for Entrance, which otherwise rolls stationCount 0 on every
- // seed. galaxy.Entrance is reference-identity, not a name comparison.
- var isTutorialEntrance = isTutorial && galaxyZone == galaxy.Entrance;
- if (isTutorialEntrance && stationCount < 1) stationCount = 1;
+ // Operator ruling, 2026-09-25 (docs/locomotion-cut.md): a scenario that declares an entrance station
+ // (Scenario.EntranceStation) gets a generated faction station with a docking bay in its entrance zone,
+ // deterministically. A cast galaxy's halved influence and its lowest-influence unowned Entrance otherwise roll
+ // stationCount 0 on every seed. galaxy.Entrance is reference-identity, not a name comparison.
+ var isEntranceStation = entranceStation && galaxyZone == galaxy.Entrance;
+ if (isEntranceStation && stationCount < 1) stationCount = 1;
// A station's source is a well-bearing body alone on its ring whose rail clears every massive sibling's extent (the
// sibling's support, or its Roche margin if more) and the largest reach of any station or turret hull: whatever hull
// is built there, its Lagrange orbit then sits clear of any other body.
@@ -318,7 +318,7 @@ public static class ZoneGenerator
// (the rail, how far a body on it keeps others out, whether it is a station's own orbit rather than a base's)
var sources = candidates.Skip(candidates.Length / 2).Take(stationCount)
.Select(p => (orbit: orbitMap[p], extent: Extent(p), direct: false)).ToArray();
- if (isTutorialEntrance && candidates.Length == 0)
+ if (isEntranceStation && candidates.Length == 0)
{
// The entrance gets a station whatever its bodies: it orbits a root node beyond its ring group (or, for a body, its
// whole family), never at a ring member's distance, and sits there, not at a Lagrange point.
@@ -326,7 +326,7 @@ public static class ZoneGenerator
var rootNode = roots.FirstOrDefault(p => p.Children.Count > 0) ?? (roots.Count > 1 ? roots.OrderByDescending(p => p.Mass).First() : null);
if (rootNode == null)
throw new InvalidOperationException(
- "The tutorial entrance zone must always get a station, but it has no candidate orbit at all -- every planet in the zone is a parentless root.");
+ "The entrance station zone must always get a station, but it has no candidate orbit at all -- every planet in the zone is a parentless root.");
var distance = rootNode.Empty
? (1 + GravityField.RingReach) * GravityField.Beta * rootNode.Children.Where(Massive).Min(c => c.Distance)
: Extent(rootNode);
@@ -445,9 +445,9 @@ public static class ZoneGenerator
StationKinds.Choose(cache, nearestFaction, $"{seed}:station:{i}", itemManager.Log));
if (station == null)
{
- if (isTutorialEntrance)
+ if (isEntranceStation)
throw new InvalidOperationException(
- $"The tutorial entrance zone must always get a station, but {nearestFaction?.Name} has no station loadout to generate.");
+ $"The entrance station zone must always get a station, but {nearestFaction?.Name} has no station loadout to generate.");
continue;
}
station.Orbit = cache.RefOf(lagrangeOrbit);
diff --git a/Assets/Scripts/UI/HUD/SchematicDisplay.cs b/Assets/Scripts/UI/HUD/SchematicDisplay.cs
index 526a83c80..90b4271d3 100644
--- a/Assets/Scripts/UI/HUD/SchematicDisplay.cs
+++ b/Assets/Scripts/UI/HUD/SchematicDisplay.cs
@@ -132,8 +132,8 @@ public class SchematicDisplay : MonoBehaviour
//x.ListElement.Label.text = x.Item.EquippableItem.Name;
if (!_enemy)
{
- x.ListElement.InfiniteAmmoIcon.gameObject.SetActive(!x.Weapon.WeaponData.AmmoType.IsSet());
- x.ListElement.AmmoLabel.gameObject.SetActive(x.Weapon.WeaponData.AmmoType.IsSet());
+ x.ListElement.InfiniteAmmoIcon.gameObject.SetActive(!x.Weapon.ShowsAmmoReadout);
+ x.ListElement.AmmoLabel.gameObject.SetActive(x.Weapon.ShowsAmmoReadout);
}
}
}
@@ -233,8 +233,8 @@ public class SchematicDisplay : MonoBehaviour
if (x.Cooldown != null)
x.ListElement.CooldownFill.anchorMax = new Vector2(x.Cooldown.Progress, 1);
x.ListElement.DurabilityLabel.text = $"{(int)(x.Row.Item.EquippableItem.Durability / itemData.Durability * 100)}%";
- if (x.Weapon.WeaponData.AmmoType.IsSet())
- x.ListElement.AmmoLabel.text = $"{x.Weapon.Ammo}/{x.Weapon.Reserve}";
+ if (x.Weapon.ShowsAmmoReadout)
+ x.ListElement.AmmoLabel.text = x.Weapon.AmmoReadout;
}
if (x.ListElement.RangeLabel)
diff --git a/Assets/Scripts/UI/MainMenu.cs b/Assets/Scripts/UI/MainMenu.cs
index 9eef387ca..f867b9e8c 100644
--- a/Assets/Scripts/UI/MainMenu.cs
+++ b/Assets/Scripts/UI/MainMenu.cs
@@ -7,7 +7,9 @@ using System.Threading;
using System.Threading.Tasks;
using TMPro;
using UniRx;
+using UniRx.Triggers;
using UnityEngine;
+using UnityEngine.EventSystems;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using static CultMath.math;
@@ -118,9 +120,14 @@ public class MainMenu : MonoBehaviour
Debug.Log("run store has no SavedGame; Continue disabled");
_nextMenu.panel.AddButton("Continue", saved == null ? (Action) null : () =>
{
- try { RunSave.RequireDesigns(cache, saved); }
+ Galaxy galaxy;
+ try
+ {
+ RunSave.RequireDesigns(cache, saved);
+ galaxy = new Galaxy(cache, saved, Debug.Log);
+ }
catch (InvalidOperationException error) { Refuse("Cannot continue this run", error.Message); return; }
- ActionGameManager.CurrentGalaxy = new Galaxy(cache, saved, Debug.Log);
+ ActionGameManager.CurrentGalaxy = galaxy;
EnterGame();
});
}
@@ -136,9 +143,79 @@ public class MainMenu : MonoBehaviour
ShowSettings();
Fade(true);
});
+ _nextMenu.panel.AddButton("Credits",
+ () =>
+ {
+ if (ShowCredits()) Fade(true);
+ });
_nextMenu.panel.AddButton("Quit", Application.Quit);
}
+ // The third-party attributions the build must show, one button per entry; the selected entry's name, licence and one
+ // row per notice line fill the detail pane. The list is Credits.All; this only renders it. The screen follows the
+ // New Game screen: list rows are out of automatic navigation, the focused Back button takes Up and Down to step the
+ // selection and Cancel to leave, and a click on empty space does not drop that focus.
+ // False when the list could not be built and a dialog says why; the menu stays where it was.
+ private bool ShowCredits()
+ {
+ var attribution = Resources.Load(Credits.NounProjectResource);
+ if (attribution == null)
+ {
+ Refuse("Credits are unavailable", $"{Credits.NounProjectResource} is missing from this build.");
+ return false;
+ }
+ IReadOnlyList credits;
+ try { credits = Credits.All(attribution.text); }
+ catch (InvalidOperationException error)
+ {
+ Refuse("Credits are unavailable", error.Message);
+ return false;
+ }
+ Next("credits");
+ var list = _nextMenu.panel;
+ var detail = _nextMenu.detail;
+ detail.gameObject.SetActive(true);
+ var focus = new FocusHold();
+ var selected = -1;
+ Button back = null;
+ void Leave()
+ {
+ FocusHold.Focus(null);
+ focus.Release();
+ ShowMain();
+ Fade(false);
+ }
+ void Select(int index)
+ {
+ selected = Mathf.Clamp(index, 0, credits.Count - 1);
+ var credit = credits[selected];
+ detail.Clear();
+ detail.Title.text = list.Title.text;
+ detail.Title.color = Color.clear;
+ detail.AddProperty(() => credit.Name);
+ detail.AddProperty(() => credit.Licence);
+ detail.AddSpacer();
+ foreach (var line in credit.Notice.Split('\n')) detail.AddProperty(() => line);
+ FocusHold.Focus(back.gameObject);
+ }
+ for (var i = 0; i < credits.Count; i++)
+ {
+ var index = i;
+ list.AddButton(credits[i].Name, () => Select(index)).Button.navigation = new Navigation { mode = Navigation.Mode.None };
+ }
+ back = list.AddButton("Back", Leave).Button;
+ back.navigation = new Navigation { mode = Navigation.Mode.None };
+ back.OnMoveAsObservable().Subscribe(move =>
+ {
+ if (move.moveDir == MoveDirection.Up) Select(selected - 1);
+ else if (move.moveDir == MoveDirection.Down) Select(selected + 1);
+ });
+ back.OnCancelAsObservable().Subscribe(_ => Leave());
+ focus.Hold();
+ Select(0);
+ return true;
+ }
+
// New Game: every way to set up a run, each with its brief. A release build lists only the modes; the other ways
// to set up a run and the test arenas are listed only in editor and development builds.
private void ShowScenarios()
@@ -174,11 +251,8 @@ public class MainMenu : MonoBehaviour
var stage = new GalaxyStage(
Settings.SectorGenerationSettings,
Settings.SectorBackgroundSettings,
- Settings.TutorialGenerationSettings,
- Settings.TutorialBackgroundSettings,
+ Settings.CastBackgroundSettings,
ActionGameManager.CultCache,
- ActionGameManager.PlayerSettings,
- ActionGameManager.GameDataDirectory.CreateSubdirectory("Narrative"),
Debug.Log,
state => generatorState = state);
Task.Run(() => RunStart.Generate(scenario, stage)).ContinueWith(generation =>
diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs
index 2087a3870..eaa6212ac 100644
--- a/Assets/Scripts/UI/Menu/InventoryPanel.cs
+++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs
@@ -386,11 +386,11 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
var itemData = GameManager.ItemManager.GetData(item);
if (!(item is EquippableItem equippableItem)) return;
var placementPosition = v + itemDragObject.OriginCellOffset;
- if (entity.ItemFits(equippableItem, placementPosition))
+ if (entity.ItemFits(equippableItem, placementPosition, out var seated))
{
//foreach (var cell in _dragCells) cell.gameObject.SetActive(false);
FakeItem = item;
- FakeOccupancy = hullData.Shape.Inset(itemData.Shape, placementPosition, item.Rotation);
+ FakeOccupancy = hullData.Shape.Inset(itemData.Shape, placementPosition, seated);
RefreshCells();
GameManager.RegisterDragTarget(drag =>
{
diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs
index 13345f88a..5f4123ff2 100644
--- a/Assets/Scripts/UI/Menu/TradeMenu.cs
+++ b/Assets/Scripts/UI/Menu/TradeMenu.cs
@@ -312,6 +312,17 @@ public class TradeMenu : MonoBehaviour
Dialog.MoveToCursor();
}
+ // Sells every mined stack of the player's ships' bays in one step; the station pays through TrySell, so nothing refuses.
+ private void SellOre()
+ {
+ StationServices.TrySellOre(PlayerBays(), GameManager.DockedEntity, ref GameManager.Credits);
+ UpdateCreditsLabel();
+ Populate();
+ }
+
+ private IEnumerable PlayerBays() =>
+ GameManager.CurrentEntity.Parent.Children.Where(e => e is Ship {IsPlayerShip: true}).SelectMany(s => s.CargoBays);
+
private void Repair()
{
if (StationServices.TryRepair(GameManager.CurrentEntity, ref GameManager.Credits))
@@ -398,6 +409,8 @@ public class TradeMenu : MonoBehaviour
});
var repairCost = StationServices.RepairCost(GameManager.ItemManager, GameManager.CurrentEntity);
if (repairCost > 0) ContextMenu.AddOption($"Repair ({repairCost:N0})", Repair);
+ var oreValue = StationServices.OreValue(GameManager.ItemManager, PlayerBays());
+ if (oreValue > 0) ContextMenu.AddOption($"Sell Ore ({oreValue:N0})", SellOre);
ContextMenu.Show();
});
}
diff --git a/Assets/Scripts/UI/ScenarioPicker.cs b/Assets/Scripts/UI/ScenarioPicker.cs
index e0cd93134..f5f3a1ca4 100644
--- a/Assets/Scripts/UI/ScenarioPicker.cs
+++ b/Assets/Scripts/UI/ScenarioPicker.cs
@@ -30,7 +30,7 @@ public sealed class ScenarioPicker
private static readonly Color Accent = new Color(1, .4458f, .05f);
private int _selected;
private bool _launched;
- private bool _restoreDeselect;
+ private readonly FocusHold _focus = new FocusHold();
private ScenarioPicker(PropertiesPanel list, PropertiesPanel detail, Action launch, Action back)
{
@@ -115,7 +115,7 @@ public sealed class ScenarioPicker
picker._launchButton.OnCancelAsObservable().Subscribe(_ => picker.Back());
picker.StyleScrollbars();
- picker.HoldFocus();
+ picker._focus.Hold();
picker.Select(0);
// Layout is not live until the frame after Show; edit mode has no frames.
if (Application.isPlaying) Observable.NextFrame().Subscribe(_ => picker.FitViewport());
@@ -229,7 +229,7 @@ public sealed class ScenarioPicker
_rows[i].colors = colors;
_rows[i].targetGraphic.color = i == _selected ? Accent : _rowFills[i];
}
- Focus(_launchButton.gameObject);
+ FocusHold.Focus(_launchButton.gameObject);
Reveal((RectTransform) _rows[_selected].transform);
}
@@ -253,36 +253,42 @@ public sealed class ScenarioPicker
{
if (_launched) return;
_launched = true;
- Focus(null);
- ReleaseFocus();
+ FocusHold.Focus(null);
+ _focus.Release();
_launch(Selected);
}
// Leaves the screen; the same path for the Back button and Cancel.
private void Back()
{
- Focus(null);
- ReleaseFocus();
+ FocusHold.Focus(null);
+ _focus.Release();
_back();
}
+}
- // While the picker is up, a click on empty space must not drop focus from Launch, or the arrows and Enter go dead.
- // The input module's flag is scene-wide, so the picker takes it for its own lifetime and gives it back on leaving.
- private void HoldFocus()
+// Keeps keyboard and gamepad focus on one control while a menu screen is up. While held, a click on empty space must
+// not drop focus, or the arrows and Enter go dead. The input module's flag is scene-wide, so the screen takes it for its
+// own lifetime and gives it back on leaving. The New Game and Credits screens both use it.
+public sealed class FocusHold
+{
+ private bool _restoreDeselect;
+
+ public void Hold()
{
if (EventSystem.current == null || !(EventSystem.current.currentInputModule is InputSystemUIInputModule module) || !module.deselectOnBackgroundClick) return;
module.deselectOnBackgroundClick = false;
_restoreDeselect = true;
}
- private void ReleaseFocus()
+ public void Release()
{
if (!_restoreDeselect) return;
_restoreDeselect = false;
if (EventSystem.current != null && EventSystem.current.currentInputModule is InputSystemUIInputModule module) module.deselectOnBackgroundClick = true;
}
- private static void Focus(GameObject target)
+ public static void Focus(GameObject target)
{
if (EventSystem.current != null) EventSystem.current.SetSelectedGameObject(target);
}
diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs
index f63f746bd..24ce8a494 100644
--- a/Assets/Scripts/Zone Display/ZoneRenderer.cs
+++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs
@@ -508,6 +508,7 @@ public class ZoneRenderer : MonoBehaviour
void LateUpdate()
{
+ if (!ActionGameManager.RunLive) return;
Map.Draw(Zone, ActionGameManager.Clock.Lead);
}
@@ -550,6 +551,7 @@ public class ZoneRenderer : MonoBehaviour
void Update()
{
+ if (!ActionGameManager.RunLive) return;
var lead = ActionGameManager.Clock.Lead;
GravityLowering.Lower(Zone, lead, ref _gravityWells);
foreach (var loot in _floatingItems.Values)
diff --git a/Assets/Shaders/Brushes/SimplexBrush.shader b/Assets/Shaders/Brushes/SimplexBrush.shader
index 3a6bf56e5..af54035b2 100644
--- a/Assets/Shaders/Brushes/SimplexBrush.shader
+++ b/Assets/Shaders/Brushes/SimplexBrush.shader
@@ -25,7 +25,7 @@ Category {
#pragma target 2.0
#include "UnityCG.cginc"
- #include "Assets/Plugins/GPU Noise/SimplexNoise3D.cginc"
+ #include "Packages/org.gamecult.cultmath/Shaders/CultMath.hlsl"
float _Depth;
float _Power;
@@ -68,7 +68,7 @@ Category {
fixed4 frag (v2f i) : SV_Target
{
float dist = length(i.texcoord - float2(.5,.5));
- return powerPulse(dist * 2,_Power) * (_Depth * abs(snoise(float3(i.texcoord1.xy*_Frequency,_Time.y*_Speed)))+_Constant);
+ return powerPulse(dist * 2,_Power) * (_Depth * abs(cultmath_snoise(float3(i.texcoord1.xy*_Frequency,_Time.y*_Speed)))+_Constant);
}
ENDCG
}
diff --git a/Assets/Shaders/Clouds.shader b/Assets/Shaders/Clouds.shader
index 11e3fe0a3..ccbda8835 100644
--- a/Assets/Shaders/Clouds.shader
+++ b/Assets/Shaders/Clouds.shader
@@ -29,7 +29,7 @@
#pragma fragment frag
#include "UnityCG.cginc"
- #include "Assets/Plugins/GPU Noise/SimplexNoise3D.cginc"
+ #include "Packages/org.gamecult.cultmath/Shaders/CultMath.hlsl"
struct appdata
{
@@ -64,7 +64,7 @@
float sum = 0;
for(int i = 0; i < 6; i++)
{
- sum += snoise(p * freq + Parallax * ParallaxDirection) * amp;
+ sum += cultmath_snoise(p * freq + Parallax * ParallaxDirection) * amp;
parallax /= ParallaxLacunarity;
freq *= NoiseLacunarity;
amp *= NoiseGain;
@@ -83,7 +83,7 @@
fixed4 frag (v2f i) : SV_Target
{
float3 p = float3(i.uv,_Time.x*Speed);
- float noise = saturate((1-abs(snoise(p*NoiseFrequency/2))) * fbm(p));
+ float noise = saturate((1-abs(cultmath_snoise(p*NoiseFrequency/2))) * fbm(p));
return noise * _Color * (1-length(i.uv)/FadeDistance);
}
ENDCG
diff --git a/Assets/Shaders/Compute/Lightning/Lightning.compute b/Assets/Shaders/Compute/Lightning/Lightning.compute
index 0750006b9..7edd707d4 100644
--- a/Assets/Shaders/Compute/Lightning/Lightning.compute
+++ b/Assets/Shaders/Compute/Lightning/Lightning.compute
@@ -5,7 +5,7 @@
#define NUM_THREAD_X 64
#include "LightningVertex.cginc"
-#include "Assets/Plugins/GPU Noise/SimplexNoise2D.cginc"
+#include "Packages/org.gamecult.cultmath/Shaders/CultMath.hlsl"
struct Node
{
@@ -46,7 +46,7 @@ float fbm(float2 p)
float sum = 0;
for(int i = 0; i < 4; i++)
{
- sum += snoise(p * freq) * amp;
+ sum += cultmath_snoise(p * freq) * amp;
freq *= _NoiseLacunarity;
amp *= _NoiseGain;
}
diff --git a/Assets/Shaders/GalaxyMap.shader b/Assets/Shaders/GalaxyMap.shader
index 567396a35..109cd96d0 100644
--- a/Assets/Shaders/GalaxyMap.shader
+++ b/Assets/Shaders/GalaxyMap.shader
@@ -36,7 +36,7 @@ Shader "Unlit/GalaxyMap"
#pragma fragment frag
#include "UnityCG.cginc"
- #include "Assets/Plugins/GPU Noise/SimplexNoise2D.cginc"
+ #include "Packages/org.gamecult.cultmath/Shaders/CultMath.hlsl"
struct appdata
{
@@ -86,8 +86,8 @@ Shader "Unlit/GalaxyMap"
for(int i = 0; i < octaves; i++)
{
if(i<4)
- sum += (1-abs(snoise(p * freq))) * amp;
- else sum += abs(snoise(p * freq)) * amp;
+ sum += (1-abs(cultmath_snoise(p * freq))) * amp;
+ else sum += abs(cultmath_snoise(p * freq)) * amp;
freq *= NoiseLacunarity;
amp *= NoiseGain;
}
diff --git a/Assets/Steel.mat b/Assets/Steel.mat
deleted file mode 100644
index fc4d8d0ca..000000000
--- a/Assets/Steel.mat
+++ /dev/null
@@ -1,83 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
- serializedVersion: 6
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Steel
- m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- m_ShaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _BumpMap:
- m_Texture: {fileID: -3888315358723833787, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailAlbedoMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailMask:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailNormalMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _EmissionMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 4, y: 4}
- m_Offset: {x: 0, y: 0}
- - _MainTex:
- m_Texture: {fileID: 108215966750249586, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
- m_Scale: {x: 4, y: 4}
- m_Offset: {x: 0, y: 0}
- - _MetallicGlossMap:
- m_Texture: {fileID: 4793252353645218242, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _OcclusionMap:
- m_Texture: {fileID: -4384182597330533215, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _ParallaxMap:
- m_Texture: {fileID: 4600200897981803784, guid: cbc61995a46604441ab9de4f1c68e290,
- type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Floats:
- - _BumpScale: 1
- - _Cutoff: 0.5
- - _DetailNormalMapScale: 1
- - _DstBlend: 0
- - _GlossMapScale: 1
- - _Glossiness: 0.5
- - _GlossyReflections: 1
- - _Metallic: 0
- - _Mode: 0
- - _OcclusionStrength: 1
- - _Parallax: 0.02
- - _SmoothnessTextureChannel: 0
- - _SpecularHighlights: 1
- - _SrcBlend: 1
- - _UVSec: 0
- - _ZWrite: 1
- m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- m_BuildTextureStacks: []
diff --git a/Directory.Build.props b/Directory.Build.props
index 05d5e4d22..62160b34f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,12 +2,12 @@
$(CULTLIB_ROOT)
$(MSBuildThisFileDirectory)..\CultLib
-
- b8fc5eb07720a187a0421424ac2cb3aa2966ca1d
+
+ 7225835d11fd08a3de2a2ef24742fc351b3b08fb
$(CULTMATH_ROOT)
$(CultLibRoot)
-
- 7a8933b085468e1fc6f9d3bce4a85e7d101aaca3
+
+ f1edfa458dd8e7e107214e9d9884254359475b8c
C:\Program Files\Git\cmd\git.exe
git
diff --git a/GameData/Aetheria.cc b/GameData/Aetheria.cc
index 553e6bcce..b58ec27b4 100644
--- a/GameData/Aetheria.cc
+++ b/GameData/Aetheria.cc
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0f81d35d4cec8f57178220f20bca98ffaa6709783349efe3cc28aa64ea1f02b1
-size 220607
+oid sha256:58e9e0ceadc3b4908491563eb9dfad8ee062024b036a4d3d3cab1e00c168cda9
+size 225267
diff --git a/GameData/Mods/aetheria.nakovalnya/ship.cc b/GameData/Mods/aetheria.nakovalnya/ship.cc
index ebe05cd33..1def7b776 100644
--- a/GameData/Mods/aetheria.nakovalnya/ship.cc
+++ b/GameData/Mods/aetheria.nakovalnya/ship.cc
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:87d8cbcca252460d1ec2bfeb895c1447ab185172a4a4449b237a297b83ea5057
-size 40059
+oid sha256:0228aa7ec3a2e060bd49e46aa64f52eea4c4cdb25951c164646c1d031ad17851
+size 30457
diff --git a/GameData/Mods/aetheria.nakovalnya/ship.glb b/GameData/Mods/aetheria.nakovalnya/ship.glb
index 3dac76cc9..af1e370e6 100644
--- a/GameData/Mods/aetheria.nakovalnya/ship.glb
+++ b/GameData/Mods/aetheria.nakovalnya/ship.glb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:90a503473e3b12251c225b7fe283b2fc5b45a25e6e47839d1c3d78e3ac61b00c
-size 843452
+oid sha256:ab3fdd340bf27fc8c2a6149ce6be9159215cf26b3eabd290064ffe40b2e96512
+size 839556
diff --git a/GameData/Mods/aetheria.wren/ship.cc b/GameData/Mods/aetheria.wren/ship.cc
deleted file mode 100644
index d81f9bba5..000000000
--- a/GameData/Mods/aetheria.wren/ship.cc
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b1744dfa7dd6c5325ca3bd04fba941408cdc1255c06d1fc0d52fa67c97dc100
-size 10514
diff --git a/GameData/Mods/aetheria.wren/ship.glb b/GameData/Mods/aetheria.wren/ship.glb
deleted file mode 100644
index 03b70b729..000000000
--- a/GameData/Mods/aetheria.wren/ship.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98bf1b4a0e19e67568930ca79b9d61529c21c63dd74ee8df3d3f1d419d3a81cc
-size 6964
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 7693bd94f..ef01307a8 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -53,7 +53,7 @@
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0",
"org.gamecult.caching.unity": "https://github.com/GameCult/CultLib.git?path=/src/GameCult.Unity/Assets/Caching#caching-unity-v2.0.0",
- "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v2.0.1",
- "org.gamecult.cultmath": "https://github.com/GameCult/CultLib.git?path=/packages/cultmath/unity/org.gamecult.cultmath#cultmath-unity-v0.5.0"
+ "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v3.0.0",
+ "org.gamecult.cultmath": "https://github.com/GameCult/CultLib.git?path=/packages/cultmath/unity/org.gamecult.cultmath#cultmath-unity-v0.5.1"
}
}
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 919cf94d1..4db845c3b 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -265,20 +265,20 @@
"hash": "42dce3611a81adc5c5fac54cadbaa5637d6022d3"
},
"org.gamecult.cultlib": {
- "version": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v2.0.1",
+ "version": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v3.0.0",
"depth": 0,
"source": "git",
"dependencies": {
- "org.gamecult.cultmath": "0.5.0"
+ "org.gamecult.cultmath": "0.5.1"
},
- "hash": "b8fc5eb07720a187a0421424ac2cb3aa2966ca1d"
+ "hash": "7225835d11fd08a3de2a2ef24742fc351b3b08fb"
},
"org.gamecult.cultmath": {
- "version": "https://github.com/GameCult/CultLib.git?path=/packages/cultmath/unity/org.gamecult.cultmath#cultmath-unity-v0.5.0",
+ "version": "https://github.com/GameCult/CultLib.git?path=/packages/cultmath/unity/org.gamecult.cultmath#cultmath-unity-v0.5.1",
"depth": 0,
"source": "git",
"dependencies": {},
- "hash": "7a8933b085468e1fc6f9d3bce4a85e7d101aaca3"
+ "hash": "f1edfa458dd8e7e107214e9d9884254359475b8c"
},
"com.unity.modules.accessibility": {
"version": "1.0.0",
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 1b000cd89..76b6938ad 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1f95917a4ca95a4f6977be90d80185648b012099467fa2275b31b868aca88b6f
-size 24058
+oid sha256:900f257853e7bf436c28cb323c323f2ef43e8d0659253ca7545cd23255d8ea57
+size 24033
diff --git a/docs/aetheria-fauna-map.md b/docs/aetheria-fauna-map.md
index b698baf41..5276db97e 100644
--- a/docs/aetheria-fauna-map.md
+++ b/docs/aetheria-fauna-map.md
@@ -398,7 +398,7 @@ the lore branch `eureka/aetheria-fauna-lore` `74c7e212`, note `Open Water` (`OW`
| # | Question | Result |
|---|---|---|
| B28 | What does CultMath already give a node library? | Integer PCG hashes `pcg`, `pcg3d`, `pcg4d` (Jarzynski and Olano), "integer-only, so dxc and C# agree bit for bit" (`packages/cultmath/src/CultMath/math.cs:393-426`, `shaders/CultMath.hlsl:396-426`). `cellular(float3)`: Worley F1 and F2 - F1 with analytic gradients, jitter from `pcg3d` of the integer cell, 3D, unweighted (`math.cs:849-975`, `CultMath.hlsl:440-503`). `smin_grad` (`math.cs:831-847`, `CultMath.hlsl:428-437`). `distance_to_segment` in C# only (`math.cs:319`; no HLSL twin). No weighted cellular, no diagram over explicit weighted sites, no site-graph gate. |
-| B29 | How does CultMath own parity? | Two legs, one owner each (`packages/cultmath/docs/design.md:202-206`): HLSL against C# by the mirror test, which compiles the text of `CultMath.hlsl` as C# and compares float32 bit patterns (`design.md:118-124`), plus a clean `dxc -T lib_6_3` compile (`design.md:114-116`); GLSL against C# by golden fixtures run on a device. The mirror proves the composition in the text, not that a GPU agrees (`design.md:119-121`); device HLSL runs are consumers' today (Asura `gpu-snoise-parity`; Aetheria `FlowFieldParityVerify`). CultMath ships a Unity compute smoke (`packages/cultmath/scripts/unity-smoke/`). Aetheria pins `cultmath-unity-v0.4.1` (`Packages/manifest.json`). |
+| B29 | How does CultMath own parity? | Two legs, one owner each (`packages/cultmath/docs/design.md:202-206`): HLSL against C# by the mirror test, which compiles the text of `CultMath.hlsl` as C# and compares float32 bit patterns (`design.md:118-124`), plus a clean `dxc -T lib_6_3` compile (`design.md:114-116`); GLSL against C# by golden fixtures run on a device. The mirror proves the composition in the text, not that a GPU agrees (`design.md:119-121`); device HLSL runs are consumers' today (Asura `gpu-snoise-parity`; Aetheria `FlowFieldParityVerify`). CultMath ships a Unity compute smoke (`packages/cultmath/scripts/unity-smoke/`). Aetheria pins `cultmath-unity-v0.5.1` (`Packages/manifest.json`). |
| B30 | Does Aetheria already keep a math twin outside CultMath? | Yes. `FlowField` uses CultMath's `math`, but its `Tri`, `Tri3` and `Tri3D` are Aetheria functions (`FlowField.cs:66-72`) whose HLSL twin is `Volumetric.cginc`, pinned by Aetheria's own `FlowFieldParityVerify` (`RelativeTolerance` 1.5e-4). That is a second parity owner beside CultMath. |
| B31 | What is parked in CultMath that a DAG would use? | The tape: steps 2-5 (expression graph lowered to bytecode with C# evaluators, pruning, an HLSL interpreter, meshing) are parked until Asura is stable (`docs/cultmath-tape-target.md:3-8`, ruling `tape-target-unparks-when-asura-stable`). "Truth and lowerings" (`:84-92`): the field is a typed CultCache document, and the CPU evaluator and the HLSL interpreter are lowerings of it. Step 1 (intervals) and affine forms are on main. |
| B32 | Do the candidates make filaments? (`docs/research/2026-10-14-trophic-dag-probe/`, README there; wells orbit, slope terms on, t = 0) | `skein` draws strands between neighbouring wells, bent by the flow (`density_skein.png`); `lattice` draws a fine cellular web, dense on the shoulders, dim elsewhere, with no long links (`density_lattice.png`); `skein-web` draws both: strands from well to well with a web hanging off them (`density_skein-web.png`, `layer_L2-krill.png`). Correlation with the B20 Physarum map at 64x32 blocks (this measures the envelope, not filaments: a block is 62 u, wider than a strand): band .512, lattice .359, skein-web .296, krill .277, skein .225, slack .171. Hosted krill at 16 u: band 2,075, skein-web 1,475, skein 639, lattice 419. |
diff --git a/docs/aetheria-release-map.md b/docs/aetheria-release-map.md
index 18f9b6941..83892fc69 100644
--- a/docs/aetheria-release-map.md
+++ b/docs/aetheria-release-map.md
@@ -502,10 +502,8 @@ record.
| follow-up | `hull-damage-wear` | demo | Damage visible on the hull (line 6). |
| follow-up | `mod-ship-single-existence-gate` | demo | A skipped package throws on spawn; demo hulls are packages. |
| follow-up | `ambiguous-hardpoint-origin` | demo | Save correctness for package hulls. |
-| follow-up | `remove-sbsar-files` | demo | Clean break from Substance before a public build. |
| follow-up | `delaunay-exact-predicates` | demo | Galaxy links; a silently unlinked zone could strand a demo run. |
| follow-up | `failed-start-scene-halts` | demo | The New Game failure path the demo's missing-cast refusal uses. |
-| follow-up | `stale-docs-after-scenarios-menu` | demo | Docs that describe the old New Game path. |
| follow-up | `scratch-carry-drafts` | demo | The ship `.cc` draft bears on `demo-ship-cc-timing`. |
| follow-up | `faction-lore-notes-r3` | full game | Vault setting notes; no demo cut reads them. |
| follow-up | `mining-impacts-through-contract` | full game | Mining Cut 4 is parked. |
@@ -2188,7 +2186,7 @@ wear comes from baked maps. Grunge is baked into `ship.maps.png` A.
- r2's region tint (`_PaintStrength`, `RegionLuminance`, a tiling `_WearNoise`)
and its `Livery` of three colours are never built.
- Revision 1's vertex mask is gone.
- - The 41 `.sbsar` files go with follow-up `remove-sbsar-files`.
+ - The 41 `.sbsar` files are removed (follow-up `remove-sbsar-files`).
#### Parity
@@ -7459,7 +7457,9 @@ That file's Cut 4 (AI heading planner) and Cut 5 (combat facing) are carried as
is `stage.Generated("Djinni")`, `EvasionTermTests.cs:520`, so the target's fit follows the galaxy). The
cause is 0.3.0's breaking `snoise` kernel (its CHANGELOG), read in C# by `Settings.cs:72-73` (galaxy
cloud density), `GlobalData.cs:30` and `Environment.cs:132,144`. Shaders use the GPU Noise plugin, not
- CultMath (`Background.shader:39`), so nothing on the GPU moves. Every other DemoTerminus test passes.
+ CultMath (`Background.shader:39`), so nothing on the GPU moved at 0.3.0. GalaxyMap, Clouds, SimplexBrush and
+ Lightning.compute now include `CultMath.hlsl`; Background keeps its 2D gradient copy because CultMath has no 2D
+ `snoise_grad`. Every other DemoTerminus test passes.
Between the tags CultMath also adds `phacelle` (MPL-2.0 files), `cellular`, `smin_grad`, the `*_grad`
noises and `BoundedLeastSquares`; no existing signature changes.
- **TA9. The pin guard.** `Directory.Build.targets:21` conditions `VerifyCultLibRevision` on a
diff --git a/docs/cultcache-migration-cut.md b/docs/cultcache-migration-cut.md
index 16e885490..f27bde97d 100644
--- a/docs/cultcache-migration-cut.md
+++ b/docs/cultcache-migration-cut.md
@@ -95,7 +95,7 @@ recorded, none blocking:
`WeaponData.AmmoType` refs.
- One cache holds all three stores for the process.
- `RunSave` commits a save atomically with stable zone keys and clears the run
- on New Game or death.
+ on death or victory (`RunSave.Replace` drops the old run once a new one has staged).
- `SavedRun`, the msgpack settings and layout I/O, `.loadout`, `SaveState`,
`SaveZone` and the importer are deleted.
- **Loadouts are authored ship presets in the catalog.** This was reworked
@@ -138,9 +138,6 @@ The first Soul pass found untested all-or-nothing, availability and price
rules, weapon-group corruption, dictionary-ordered product choice, and a
premature "done". All are fixed.
-Recorded, not fixed: New Game clears the previous run before generation, as the
-spec says, so a generation fault loses that run.
-
`GameData/PlayerSettings.msgpack` entered history through `5c5c3d5e`. It holds
defaults and the username, and about 65 earlier versions are already in LFS
history, so history is left alone.
@@ -151,7 +148,7 @@ death clearing the run across relaunch, stance toggle, `FieldShieldTest`. It fou
migration defect: CultMath types are not Unity-serializable, so Unity-serialized CultMath
fields load as zero. Mouse sensitivity (lost look control) moved to `PlayerSettings` in
`00ebe46a`; the rest, including the black rarity colours, is `docs/settings-globals-cut.md`.
-Scene materials are broken by the dead Substance plugin, not by this migration.
+The Substance maps are removed and the materials repointed to Assets/Materials/PBR.
History, before the smoke:
- nothing else from agents. The preset rework's Soul findings were fixed in
@@ -651,7 +648,9 @@ After Cut 10, every runtime write is a single-store `Commit` on one cache that
holds catalog, run and player stores from first access:
- `RunSave.Commit` saves the run at wormhole arrival and quit, with stable
`SavedZone` keys.
-- `RunSave.Clear` deletes every run record at New Game and at death.
+- `RunSave.Clear` deletes every run record at death and victory (`ActionGameManager.EndRun`).
+- `RunSave.Replace` swaps the saved run for a new one only after the new run has
+ staged; a start that fails leaves the saved run in place.
- The settings getter creates `PlayerSettings` on first launch, and
`SavePlayerSettings` commits it.
- `Loadouts.Save` writes loadouts to the player store, and
@@ -849,7 +848,7 @@ reads a global back (Q4).
| Global | Store | Read by | Existence owned by | Missing at main menu | Missing at resume | Missing at new game |
|---|---|---|---|---|---|---|
| `PlayerSettings` | Player | `MainMenu` (name, tutorial flag), `ActionGameManager` (credits) | boot: `ActionGameManager.Awake` after `AetheriaStores.Open`, when `GetGlobal()` is null, upserts one and flushes (Cut 10) | cannot happen after boot | same | same |
-| `SavedGame` | Run | `MainMenu` (resume), `Galaxy(CultCache, SavedGame, ...)` | new game: `ActionGameManager.BeginRun()` creates the run store and writes it; `Die()` deletes the run store (Cut 10) | no run file: Resume hidden; run file without `SavedGame`: refuse to resume, log the key, New Game only | as main menu | new game deletes any run store first |
+| `SavedGame` | Run | `MainMenu` (resume), `Galaxy(CultCache, SavedGame, ...)` | new run: `RunSave.Replace` writes the new run's records and removes the old run's once the scenario has staged; `EndRun` calls `RunSave.Clear` at death and victory | no run file: Continue disabled; run file without `SavedGame`: Continue disabled, log the key | as main menu | a new run keeps the saved run until it has staged |
| catalog globals | Catalog | none exist | authored data; catalog is read-only | `AetheriaStores.Open` throws naming every `[CultGlobal]` type routed to the catalog with no record | same | same |
**CultLib's role.** `[CultGlobal]` means exactly: at most one record of the
@@ -1772,8 +1771,8 @@ Probes behind 8a (scratch copies; nothing committed):
Math audit:
- **Not used:** `float4x4`, `transpose`, `determinant`, `_11` names. The
- `determinant` hits (`AetheriaMath.cs:98-112`, `NIH\MIConvexHull`) are locals
- and comments; the `half` hits are locals. `float2x2`/`float3x3`, `int3`/`int4`,
+ `determinant` hits were locals and comments (in `AetheriaMath.cs` and the
+ vendored `NIH\MIConvexHull`, both since deleted); the `half` hits are locals. `float2x2`/`float3x3`, `int3`/`int4`,
`double2`/`double3`, `quaternion.LookRotation`, `Random` and `snoise` all
compile against CultMath.
- **Accepted by Cut 6b:** `hash`, `normalize`, `Random`, `snoise` and NaN
@@ -2596,28 +2595,31 @@ AetherDb and test edits made by Cut 9 (landed `70fbaca1`, recorded `e3af23fa`).
- `SavedGame` global and `savedzone-{i}` records in `run.cc`.
- `PlayerSettings` global in `player.cc`.
- Orbit and body records in `run.cc`, written by zone generation and landed by the next save.
- - **Run begins:** New Game calls `RunSave.Clear(CultCache)` as its first
- statement (the `MainMenu.cs:110` handler), before the `Task.Run` at `:127`
- or `:154`.
- - Galaxy generation writes nothing.
- - Zone generation (`PopulateLevel` `:615`, then `ZoneGenerator.cs:99, 108,
- 200-201, 239, 253`) upserts orbits and bodies into the attached run store.
- They stay staged until the next `RunSave.Commit`.
+ - **Run begins:** a scenario launch (`MainMenu.Launch`) generates the galaxy on a
+ background task and writes nothing to the run store. `StartGame` then calls
+ `StartScenario`, which runs arena generation, `PopulateLevel` and staging
+ inside `RunSave.Replace(CultCache, ...)`. The saved run's records are removed
+ only when staging succeeds; on failure the records the start wrote are removed
+ and the saved run stays.
+ - Zone generation (`PopulateLevel`, then `ZoneGenerator`) upserts orbits and
+ bodies into the attached run store. They stay staged until the next
+ `RunSave.Commit`, or are removed by `Replace` on a failed start.
- **Run saves:** `ActionGameManager.SaveRun()`:
- - It is `if (CurrentGalaxy != null) { var (game, zones) = RunSave.Capture(CultCache, CurrentGalaxy, Zone, DockedEntity ?? CurrentEntity, IsTutorial, _actionBarSlots.Select(s => s.Save()).ToArray()); RunSave.Commit(CultCache, game, zones); }`.
+ - It captures the live run (`RunSave.Capture`, which writes `SavedGame.IsTutorial` from `galaxy.IsPrelude`) and commits it with `RunSave.Commit` (`ActionGameManager.SaveRun`, `:284`).
- Callers: wormhole arrival (`:605`) and `OnApplicationQuit() { SaveRun(); SavePlayerSettings(); }`.
- - **Run ends:** `Die` replaces `SavePlayerSettings()` at `:1059` with
- `RunSave.Clear(CultCache); SavePlayerSettings();`.
- - `CurrentGalaxy` is already null (`:1058`), so a quit afterwards does not save a run.
+ - **Run ends:** `EndRun` (death and victory) nulls `CurrentGalaxy`, then calls
+ `RunSave.Clear(CultCache); SavePlayerSettings();` (`ActionGameManager.cs:1224-1232`).
+ - `CurrentGalaxy` is already null, so a quit afterwards does not save a run.
- **Run exists:** derived only as `CultCache.GetGlobal() != null`.
- `MainMenu.ShowMain` enables Continue from it. Continue sets
- `IsTutorial = saved.IsTutorial` and
- `CurrentGalaxy = new Galaxy(CultCache, saved, Debug.Log)`.
- - `StartGame` (`:695-741`) reads it once at the top: `null` takes the
- new-run branch; otherwise it resumes from `CurrentZone`,
- `CurrentZoneEntity` and `ActionBarBindings` (`:722, 723, 737`).
+ `CurrentGalaxy = new Galaxy(CultCache, saved, Debug.Log)`, whose `IsPrelude`
+ comes from `saved.IsTutorial`.
+ - `StartGame` (`ActionGameManager.cs:820`) branches on `PendingScenario`: set
+ means a new run (`StartScenario`); otherwise it resumes from `CurrentZone`,
+ `CurrentZoneEntity` and `ActionBarBindings` of the saved run.
- A run store that holds records but no `SavedGame` logs
- `run store has no SavedGame; Continue disabled`. New Game clears it.
+ `run store has no SavedGame; Continue disabled`. The next scenario launch
+ replaces those records once it has staged.
- **Player settings:**
- The `ActionGameManager.PlayerSettings` getter returns `CultCache.GetGlobal()`.
- When that is absent (first launch), the getter commits
@@ -2651,7 +2653,7 @@ AetherDb and test edits made by Cut 9 (landed `70fbaca1`, recorded `e3af23fa`).
- The cache never creates either. `AetheriaStores.Open` keeps its missing-global check catalog-only (`AetheriaStores.cs:24-29`).
- **Derived state:**
- "Run exists" is derived from the `SavedGame` global.
- - `IsTutorial` is set from it on Continue and written back by `Capture`.
+ - `Galaxy.IsPrelude` is set from `SavedGame.IsTutorial` on Continue; `Capture` writes it back from `galaxy.IsPrelude`. No static copy exists.
- `PlayerSettings.SavedRun` is deleted, not demoted.
- **Forbidden writers:**
- `File.*` I/O for game state anywhere in `Assets\Scripts`.
@@ -2660,10 +2662,10 @@ AetherDb and test edits made by Cut 9 (landed `70fbaca1`, recorded `e3af23fa`).
- A second `AetheriaStores.Open` in `Assets\Scripts`.
- Any upsert of `SavedGame` or `SavedZone` outside `RunSave.Commit`.
- **Shared paths:**
- - Normal and tutorial New Game both call `Clear`.
+ - Every scenario launch goes through `RunSave.Replace`.
- Continue and a new run's `StartGame` read the same global.
- Wormhole and quit call `SaveRun`.
- - Death calls `Clear`.
+ - Death and victory call `Clear` through `EndRun`.
- **Deletion line:** `SavedRun`, `SaveState`, the msgpack settings and layout
I/O, `SaveLoadout`, `SaveZone` and the `SavedGame` constructor go before
`RunSave` lands.
diff --git a/docs/element-ids.md b/docs/element-ids.md
new file mode 100644
index 000000000..32ccdafc8
--- /dev/null
+++ b/docs/element-ids.md
@@ -0,0 +1,42 @@
+# Element ids and the CultLib pin (cultlib-unity-v3.0.0)
+
+CultLib 3.0.0 (Unity tag `cultlib-unity-v3.0.0`, commit `7225835d`, which is the headless pin in `Directory.Build.props`; CultMath `cultmath-unity-v0.5.1`, `f1edfa45`) gives every element of an object list an identity. Every
+element type reachable through a list of a `[CultDocument]` type carries one string member with `[Key(n)]` and `[CultElementId]`;
+the registry refuses to open otherwise, naming the type and list.
+
+- **Where the slot goes.** A union base takes the member above its subclasses' highest key. `BehaviorData.Id` is key 37, so an
+ array-format behavior is 38 slots on the wire (`PaintModeTests`, `ShipRigTests` pin it). A new `BehaviorData` subclass must keep
+ its keys below 37 or move the slot, which is a wire change.
+- **Derived ids.** `ShipJoint` and `ShipAnchor` already had a readable `Id`; CultLib refuses a readable id inside a marked member,
+ so each gained a trailing `ElementId` marked `[CultElementId(nameof(Id))]`.
+- **Minting.** A writer mints random ids for elements that have none. A store written before ids (every file under `GameData/`)
+ loads with ids minted in memory and persists them on its next write; `CultCache.MintElementIds()` does that in one pass.
+ `ElementIdUpgradeTests` opens a copy of the shipped catalog, mints, flushes and reopens it.
+- **Comparing content.** Random ids differ between two writes of the same content. Tests that compare bytes use
+ `ElementIdBlind`.
+- **One list element is one object.** The same instance twice in a list is refused (`CultElementIdException`).
+- **Retyping.** Writing a different type onto a held key is refused unless the record is removed first
+ (`EconomyAuthor.Write` does).
+
+## The bump is one-way
+
+A store holding element ids is format v3 (single file) or v5 (directory). The previous pin (`cultlib-unity-v2.0.1`, `b8fc5eb0`) refuses a v3 store loudly
+(`NotSupportedException: Store format cultcache.store.v3 is not readable`; checked by Soul on PR 12). CultLib #98 (`7002c252`) records
+that some intermediate pins read a single-file v3 store silently and drop the ids on the next write. So: upgrade readers before
+writers, keep a pre-upgrade copy of any real store (`GameData/Aetheria.cc` and the mod packages are tracked in git; player saves and
+run stores are not), and do not roll the pin back after a store has been written under the new one.
+
+The shipped mod package (`GameData/Mods/aetheria.nakovalnya/ship.cc`) and the test fixture package (`tests/fixtures/mods/aetheria.wren/ship.cc`) held only default
+placeholders (`0` and `[]`) in the retired `HullData` slots 21 and 22, which the new CultLib refuses to write over
+(`CultSchemaConflictException`). They were regenerated with `AetherDb ship-authoring regenerate apply`, which loads the
+records, writes them into a fresh file under the current schema, requires them to read back identical and replaces the file. Both
+now hold persisted element ids and nil in slots 21 and 22; `EveryShippedModPackageCanBeWrittenOver` fails if a package regresses.
+A mod file that fails the same way is regenerated the same way. A rewritten catalog is about 15% larger: every behavior row is 38
+slots, mostly nil. A regenerated ship package can still shrink: the old nakovalnya file stored its floats as float64 and the
+fresh write stores the typed `float` fields as float32 (40059 to 30457 bytes; each value equals the old one rounded to float32).
+
+The Unity manifest (`Packages/manifest.json`) pins `org.gamecult.cultlib` at `cultlib-unity-v3.0.0` and `org.gamecult.cultmath` at
+`cultmath-unity-v0.5.1` (the version v3.0.0 depends on). `org.gamecult.caching.unity` stays at `caching-unity-v2.0.0`: it is editor
+tooling, unchanged in v3.0.0. The v3.0.0 plugin `GameCult.Caching.dll` exports `CultElementIdAttribute` (sealed, fields and
+properties, one optional `derivedFrom` argument), the shape `ServerShared` uses. The Unity editor compile of this branch has not
+been run; the headless build and tests are the evidence so far.
diff --git a/docs/headless-playground-cut.md b/docs/headless-playground-cut.md
index bea30aa46..d6ca6104a 100644
--- a/docs/headless-playground-cut.md
+++ b/docs/headless-playground-cut.md
@@ -10,6 +10,13 @@ probe was built with `--artifacts-path` in scratch, so this tree got no `bin`/`o
writes. CultLib was a temporary detached worktree at `a0813c6`, since removed. The probe
source is not kept; §2.8 records what it did.
+Since this map, the new-run path moved: `MainMenu.Launch` starts a `Scenario` and
+`ActionGameManager.StartScenario` replaces the saved run through `RunSave.Replace`
+after `RunStart` stages it (`docs/scenarios-cut.md` R.9); the `IsTutorial` static is
+gone (`Galaxy.IsPrelude` is the one owner) and `ItemManager` takes its seed in its
+constructor. Passages below that name the old `MainMenu` new-game anchors or those
+statics are rewritten to that path; the `Run` owner itself is still unbuilt.
+
## 0. Target
Operator, 2026-09-17: player inputs "map directly to the same entity inputs the AI
@@ -107,11 +114,11 @@ All of this is Unity code:
| Concern | Anchor | Unity dependencies |
|---|---|---|
| Store composition | `ActionGameManager.cs:43-63` (static, `Application.dataPath`) | path only |
-| Handoff across scene load | statics `CurrentGalaxy`, `IsTutorial` (`:96-97`), written by `MainMenu.cs:104-105,126,138,152,166`, read by `SectorMap.cs:114-310` | `SceneManager.LoadScene` (`MainMenu.cs:106,139,167`) |
-| New game: clear | `MainMenu.cs:112` | none |
-| New game: galaxy | `MainMenu.cs:125,148` (`UnityEngine.Random.value` background noise), `:127-141,153-169` (`Task.Run`, then `Observable.NextFrame`) | Random, UniRx main-thread scheduler |
-| ItemManager | `ActionGameManager.cs:264`; RNG clock-seeded at `ItemManager.cs:20` | `Debug.Log` |
-| Start / Continue | `StartGame` `:725-770`: spawn player ship `:733-744`; Continue resolves the docked child `:751-762`; action bar restore `:764-767` | renderer binding, `SectorMap` reveal |
+| Handoff across scene load | statics `CurrentGalaxy` and `PendingScenario` (`ActionGameManager.cs:108,113`), written by `MainMenu.Launch` and Continue, read by `SectorMap` | `SceneManager.LoadScene` (`MainMenu.EnterGame`, `MainMenu.cs:287`) |
+| New game: replace | `ActionGameManager.StartScenario` (`:855-876`): `RunSave.Replace` drops the saved run only after the scenario stages; `MainMenu` clears nothing | none |
+| New game: galaxy | `MainMenu.Launch` builds a `GalaxyStage` and runs `Task.Run(() => RunStart.Generate(scenario, stage))`, then `Observable.NextFrame`; background noise and galaxy draw from `GalaxyStage.Seed`, not `UnityEngine.Random` | UniRx main-thread scheduler |
+| ItemManager | `ActionGameManager.cs:309`; seed is a constructor argument, `RunStart.ItemSeed(galaxy, step)` (`RunStart.cs:99`), reseeded by `RunStart.SeedItems` | `Debug.Log` |
+| Start / Continue | `StartGame` (`:820`): `PendingScenario` set runs `StartScenario` (new run, player staged by `RunStart.Stage`); otherwise Continue resolves the saved zone and docked child and restores the action bar | renderer binding, `SectorMap` reveal |
| Zone entry | `PopulateLevel` `:639-675`: generate/unpack `:643-654`; move pilot `:659-666` | `ZoneRenderer.LoadZone`, `Debug.Log` |
| Wormhole placement (a game rule) | `ZoneRenderer.cs:222-231` (`dir * Pack.Radius * GameSettings.WormholeDistanceRatio`) | lives in a MonoBehaviour |
| Warp | detect `ActionGameManager.cs:312-316`; `EnterWormhole` `:615-637`, which saves on arrival (`:635`) | `ZoneRenderer.WormholeInstances` as the wormhole list |
@@ -120,10 +127,11 @@ All of this is Unity code:
| Save | `SaveRun` `:241-249`, called at quit `:236` and warp `:635` | action-bar slots (`:246`) |
| Death | `BindToEntity` subscribes `Death` -> `Die` (`:1053`); `Die` `:1080-1115` clears the run (`:1088`) | `Time.time`, `Observable.EveryUpdate` post-fx |
| Tick | `Update` `:1151-1220`: input `:1189-1216`, then `Zone.Update(Time.deltaTime)` `:1218` | `Time.deltaTime`, pause flag |
-| Dead code | `IntroCutscene` `:772-799`; its only call is commented out (`:760`) | coroutine, `Time.time` |
### 2.2 Already headless
+- Past probe: the measurements below were taken at an earlier commit and their line anchors
+ are not maintained; re-run the probe before relying on a number or an anchor.
- `Aetheria.Shared/Aetheria.Shared.csproj` compiles `Assets/Scripts/ServerShared/**`
plus UniRx (`UniRxLibrary`) and Ink with no Unity defines. It is the
Unity-independence check.
@@ -134,23 +142,23 @@ All of this is Unity code:
- a player `LonginusX` spawned through `LoadoutGenerator`;
- thrust by hand-set `MovementDirection` reached 142 m/s in 5 s;
- a `Minion` patrol moved the player ship 642 units in 10 s;
- - `TryDock` and `TryUndock` succeeded (`Entity.cs:721-755`);
- - `Ship.EnterWormhole` followed by stepping fired `OnEnteredWormhole` (`Ship.cs:82-90,372`);
- - `Death` fired on hull damage (`Entity.cs:277-280`);
+ - `TryDock` and `TryUndock` succeeded;
+ - `Ship.EnterWormhole` followed by stepping fired `OnEnteredWormhole`;
+ - `Death` fired on hull damage;
- `RunSave.Capture` and `RunSave.Commit` wrote a 489 KB `run.cc`.
- Settings: `GameSettings` is a ScriptableObject (`GameSettings.cs:11`) holding
ServerShared classes.
- `tools/AetherDb/AuthoredSettings.cs` reads them from the asset YAML. The probe
placed every field (0 unplaced).
- Two lifecycle inputs are Unity-only `GameSettings` fields: `StartingHullName`
- (`GameSettings.cs:17`, authored `LonginusX`) and `WormholeDistanceRatio` (`:23`,
+ (`GameSettings.cs:13`, authored `Longinus`) and `WormholeDistanceRatio` (`:16`,
authored 0.75).
- Randomness:
- - `ItemManager.Random` is clock-seeded (`ItemManager.cs:20`).
- - `Galaxy` is clock-seeded only when `seed == 0` (`Galaxy.cs:108,158`).
- - `Zone` seeds from the zone name (`Zone.cs:54`).
- - `Zone.Update` runs belt updates on `Task.Run` (`Zone.cs:144`). It is still
- deterministic (probe: identical traces).
+ - `ItemManager.Random` is seeded by the constructor argument (`ItemManager.cs:35`); a new run's seed is `RunStart.ItemSeed(galaxy, step)`, from `Galaxy.Seed`.
+ - `Galaxy` takes its seed from the run (`Galaxy.cs:119`); a zero seed throws.
+ - `Zone` seeds from the zone name: `CombatSeed` (`Zone.cs:162`), with `DropSeed` mixing in the run's seed (`:163`).
+ - Probe: `Zone.Update` was deterministic (identical traces) when belt updates ran on `Task.Run`;
+ no `Task.Run` remains in `Zone.cs`.
### 2.3 Agents
@@ -243,7 +251,7 @@ Continue and death. There is one instance per run. It holds no Unity type.
- `GameplaySettings`, `ZoneGenerationSettings`, `PlanetSettings`;
- a `uint seed` for `ItemManager`;
- `Action log`;
- - for a new run, a caller-built `Galaxy` and `isTutorial`;
+ - for a new run, a caller-built `Galaxy` (`Galaxy.IsPrelude` says whether it is the prelude) and the staged start (`RunStart.Stage`);
- `dt` per step;
- commands from either lowering;
- `SavedActionBarBinding[]` at save, owned by the Unity action bar (the playground
@@ -305,10 +313,8 @@ Continue and death. There is one instance per run. It holds no Unity type.
- `ActionGameManager`: bodies of `SaveRun`, `EnterWormhole`, `PopulateLevel`'s
simulation half, `StartGame`, `Dock`, `DoDock`'s state half, `Undock`'s checks,
`TowShip`, `Die`'s clear, and `IntroCutscene` (entirely);
- - statics `CurrentGalaxy` and `IsTutorial`;
- - `MainMenu.cs:104-105,112`;
- - `ZoneRenderer.cs:222-231`'s wormhole construction;
- - `ItemManager.cs:20`'s clock seed.
+ - statics `CurrentGalaxy` and `PendingScenario`;
+ - `ZoneRenderer.cs:222-231`'s wormhole construction.
All of these go in the same cut that adds `Run`. None survives as a fallback.
@@ -318,12 +324,12 @@ Unity dependencies, each injected or cut:
|---|---|---|
| `Time.deltaTime` | `:1218` | injected: `Run.Step(float dt)` |
| `Time.time` | `IntroCutscene`, `Die` post-fx | cutscene deleted; post-fx stays in Unity, on `Died` |
-| `UnityEngine.Random` | `MainMenu.cs:125,148` (background noise), `EntityInstance.cs:413-428` (loot) | noise stays in the menu as a galaxy-generation input; loot roll moves to `Zone` on `ItemManager.Random` (Cut 2); effect spread jitter (`ProjectileManager.cs:20-26`) stays visual |
-| Clock RNG | `ItemManager.cs:20` | cut; the seed is a constructor argument, and Unity passes a clock-derived one |
+| `UnityEngine.Random` | `EntityInstance.cs:413-428` (loot) | galaxy noise already draws from `GalaxyStage.Seed`; loot roll moves to `Zone` on `ItemManager.Random` (Cut 2); effect spread jitter (`ProjectileManager.cs:20-26`) stays visual |
+| Clock RNG | `Scenario.Seed` of 0 (`GalaxyStage.SeedFrom`) | the clock seeds only the galaxy seed; every item stream derives from it through `RunStart.ItemSeed` |
| Coroutines | `IntroCutscene` | deleted (dead) |
| UniRx | `Observable.NextFrame` in the menu, `EveryUpdate` in `Die` | stay in Unity; `Run` uses C# events, and `Entity.Death` (UniRx, headless-compiled) is what `Run` subscribes to |
| `Debug.Log` | `:264`, `:657`, `MainMenu` | injected `Action` |
-| Scene load | `MainMenu` | stays; the handoff static becomes `ActionGameManager.NewRun : (Galaxy, bool)?`, command-only, consumed once in `Start`; null means Continue |
+| Scene load | `MainMenu` | stays; the handoff static is `ActionGameManager.PendingScenario`, command-only, consumed once by `StartGame`; null means Continue |
| MonoBehaviour state | `_currentEntity`, `DockedEntity`, `DockingBay`, `TowingStation`, `Zone`, `ItemManager` | projections of `Run` |
| Barrel transforms | `EntityInstance.cs:516` -> `HardpointTransforms` | `HardpointTransforms` deleted (Cut 2); the arc is item rotation plus `FiringArc` (fork A); barrels and `ArticulationPoint` are presentation only, `GetBarrel` |
| `Physics.*` hit queries | `Projectile`, `GuidedProjectile`, `Laser`, `Lightning`, `HullCollider` subjects | deleted from damage paths; `FireControl` rolls (Cut 2) |
@@ -374,7 +380,7 @@ This is subtraction first, then one new file.
- Deletes and moves:
- `ActionGameManager.cs`:
- `IntroCutscene` `:772-799` (dead).
- - Statics `CurrentGalaxy` and `IsTutorial` (`:96-97`).
+ - Statics `CurrentGalaxy` and `PendingScenario` (`:108,113`).
- `SaveRun` body `:243-248` becomes `Run?.Save(actionBar)`. Quit (`:236`) calls it.
- `EnterWormhole` `:615-637` and the detect loop `:312-316` become
`Run.TryEnterWormhole()`. `WarpArrived` drives `SectorMap.QueueZoneReveal`.
@@ -393,14 +399,13 @@ This is subtraction first, then one new file.
`Run.Died`.
- `:264` constructs no `ItemManager`.
- `Update` `:1218` becomes `Run.Step(Time.deltaTime)`.
- - `MainMenu.cs`:
- - Continue (`:102-107`) sets `ActionGameManager.NewRun = null` and loads the scene.
- - New Game drops `:112` and sets `NewRun = (sector, tutorial)` at `:138,166`.
+ - `MainMenu`: already built. Continue (`ShowMain`) loads the scene with no
+ `PendingScenario`; `MainMenu.Launch` sets `PendingScenario` and clears nothing.
- `SectorMap.cs:114-310` reads `ActionGameManager.Instance.Run.Galaxy`.
- `InventoryPanel.cs:117-118` becomes `GameManager.Run.Board(ship)`.
- `ZoneRenderer.cs:222-231` iterates `zone.Wormholes`.
- - `ItemManager.cs:20`: the seed becomes a constructor argument. Call sites: 11 in
- tests, 1 in `AetherDb`, and `Run`.
+ - `ItemManager`: the seed is already a constructor argument (`ItemManager.cs:35`);
+ `Run` supplies `RunStart.ItemSeed(galaxy, step)`.
- Settings (fork S (a)):
- `StartingHullName` and `WormholeDistanceRatio` move from `GameSettings.cs:17,23` to
`GameplaySettings` (`Settings.cs:155`).
@@ -412,8 +417,8 @@ This is subtraction first, then one new file.
`GalaxyZone.AdjacentZones` with the rule from `ZoneRenderer.cs:226-230`. Null galaxy
zone gives an empty array.
- New `Run.cs`: types and rules, no bodies here.
- - `static Run New(CultCache, GameplaySettings, ZoneGenerationSettings, PlanetSettings, Galaxy, bool isTutorial, uint seed, Action log)`
- 1. `RunSave.Clear`.
+ - `static Run New(CultCache, GameplaySettings, ZoneGenerationSettings, PlanetSettings, Galaxy, Scenario, Action log)`
+ 1. `RunSave.Replace` around steps 2-5 (the saved run goes only once the scenario has staged).
2. `ItemManager` over `RunSave.Lots`, seeded.
3. `EnterZone(Entrance)`.
4. Spawn the player ship per `:734-743`.
@@ -446,7 +451,7 @@ This is subtraction first, then one new file.
child; updates `Bay.DockedShip`.
- `void Tow()`: the rule from `:891-911`.
- `void Save(SavedActionBarBinding[] actionBar)`
- - `RunSave.Capture(cache, Galaxy, Zone, Station ?? Pilot, isTutorial, actionBar)`,
+ - `RunSave.Capture(cache, Galaxy, Zone, Station ?? Pilot, actionBar, credits)`,
then `Commit(…, ItemManager.Lots)`.
- No-op when `Ended`.
- Remembers `actionBar` for warp saves.
@@ -461,7 +466,7 @@ This is subtraction first, then one new file.
| Test | Asserts | Mutation that must kill it |
|---|---|---|
-| `NewRunSpawnsPilotInEntrance` | pilot is a `Ship` with `IsPlayerShip`, in `Zone.Entities`, `Zone.GalaxyZone == Galaxy.Entrance`; the run store is cleared of a prior `SavedGame` | `New` skips `RunSave.Clear`; spawn omits `Zones.Entities.Add` |
+| `NewRunSpawnsPilotInEntrance` | pilot is a `Ship` with `IsPlayerShip`, in `Zone.Entities`, `Zone.GalaxyZone == Galaxy.Entrance`; the run store holds no prior `SavedGame` once the run has staged | `New` skips `RunSave.Replace`; spawn omits `Zones.Entities.Add` |
| `WarpMovesPilotAndSaves` | stepping after `TryEnterWormhole` lands the pilot in the target zone, out of the old zone's entities, with `SavedGame.CurrentZone` equal to the target index after reopen | arrival skips `Save`; `EnterZone` leaves the pilot in the old zone |
| `ContinueLandsDocked` | save while docked, reopen, `Continue`: `Station` is the saved orbital, `Pilot` is its player child | `Land` binds to the orbital itself |
| `DeathEndsAndClears` | hull death clears every run record; `Step` throws; `Save` writes nothing | `Died` handler omits `Clear`; `Ended` not set |
@@ -473,7 +478,7 @@ This is subtraction first, then one new file.
- Unity batchmode has no `error CS`.
- Negative greps:
- `rg -n "RunSave\.(Clear|Commit|Capture)" Assets/Scripts --glob '!ServerShared/**'` is empty.
- - `rg -n "CurrentGalaxy|IsTutorial\s*=" Assets/Scripts` is empty.
+ - `rg -n "CurrentGalaxy|PendingScenario" Assets/Scripts` matches only the `Run` lowering in `ActionGameManager` and `MainMenu`.
- `rg -n "new Wormhole" Assets/Scripts` matches only `Zone.cs`.
- `rg -n "new ItemManager\(" Assets/Scripts` matches only `Run.cs`.
- `rg -n "ZoneGenerator\.GenerateZone|new Zone\(" Assets/Scripts --glob '!ServerShared/**'` is empty.
@@ -1161,7 +1166,7 @@ Options as mapped before the ruling:
- **Recommend (a).**
**N. Is the scene handoff static acceptable?** Low-blocking.
-- (a) `ActionGameManager.NewRun : (Galaxy, bool)?`, consumed once by `Start`.
+- (a) `ActionGameManager.PendingScenario : Scenario`, consumed once by `StartGame` (built this way).
- (b) `MainMenu` builds the whole `Run` on its generation thread. That moves zone
generation's run-store upserts off the main thread, and the `CultCache` threading
contract is not checked here.
diff --git a/docs/item-provenance-cut.md b/docs/item-provenance-cut.md
index 473ec76c2..a0ccd947f 100644
--- a/docs/item-provenance-cut.md
+++ b/docs/item-provenance-cut.md
@@ -166,9 +166,9 @@ Contradictions and corrections found in the Body:
`LoadoutTests` fixture is not: `FirstAvailableProductInKeyOrderBuildsTheSlot`
(`LoadoutTests.cs:289-312`) adds two same-maker Lamp products and reads `.Product`.
6. **`ItemManager` lives one scene load, and every run starts with a scene load.** It is
- constructed in `ActionGameManager.Start` (`:264`). There is one scene, `ARPG`. New Game
- and Continue both end in `SceneManager.LoadScene("ARPG")` (`MainMenu.cs:106,139,167`), and
- no `DontDestroyOnLoad` exists. So a ledger held by `ItemManager` spans exactly one run.
+ constructed in `ActionGameManager.Start` (`:309`). There is one scene, `ARPG`. A scenario
+ launch and Continue both end in `SceneManager.LoadScene("ARPG")` (`MainMenu.EnterGame`,
+ `:287`), and no `DontDestroyOnLoad` guards the `ItemManager`. So a ledger held by `ItemManager` spans exactly one run.
7. **Aside, not this cut:** `CreateInstance(CraftedItemData, float)` mints a
`CompoundCommodity` for a `ConsumableItemData` design (`ItemManager.cs:136-141`), while
`TryActivateConsumable` casts to `ConsumableItem` (`Entity.cs:336`). This map keeps
@@ -252,9 +252,11 @@ Not probed: CultCache Studio's rendering of the ledger (operator check); Unity c
`ZoneGenerator`'s staged-upsert pattern (`ZoneGenerator.cs:99-108`) is not used for
lots: the ledger is live simulation state, captured at commit like entities.
- Lifecycle: the run begins with a scene load (§1.6), whose `Start` reads
- `RunSave.Lots(CultCache)`. New Game has already cleared the run store (`MainMenu.cs:112`),
- so it gets an empty ledger. Continue gets the stored one. Death clears the run store
- (`ActionGameManager.cs:1090`); the next run reloads the scene.
+ `RunSave.Lots(CultCache)`. A scenario launch has `PendingScenario` set, so `Start` builds an
+ empty `ProvenanceLedger` instead (`ActionGameManager.cs:312`); the saved run's records stay
+ in the store until `RunSave.Replace` drops them once the new run has staged
+ (`SavedGame.cs:247`). Continue reads the stored ledger. Death and victory end in `EndRun`,
+ which calls `RunSave.Clear` (`ActionGameManager.cs:1224-1231`); the next run reloads the scene.
**Branding.**
- Owner: `ItemManager.Brand(CraftedItemInstance)` -> `(Faction Maker, FactionProductData Product)`.
@@ -526,7 +528,7 @@ Subtraction, plus a data rewrite.
worktrees.
Operator-only checks after Cut C:
-- New Game and fly through one zone. The starting ship's items show tier colour, and the
+- New Game, pick a scenario, and fly through one zone. The starting ship's items show tier colour, and the
properties panel shows Manufacturer, product name and flavour text for branded gear.
- Dock and buy an item: its brand still shows in your cargo.
- Kill an NPC and pick up loot: brand shown.
diff --git a/docs/item-provenance-substrate.md b/docs/item-provenance-substrate.md
index 0bc310942..956d79138 100644
--- a/docs/item-provenance-substrate.md
+++ b/docs/item-provenance-substrate.md
@@ -68,8 +68,7 @@ catalog, built a 196-zone sector galaxy from the authored `Settings.asset`, and
`47189c8a`). The commented `HaulingControllerData` union (`Behaviors.cs:179`) is
the same kind of residue.
- **No recipe, blueprint or ingredient model exists.** "Factory", "fabricat",
- "assembler", "blueprint", "recipe" and "refiner" appear in no live C# outside
- `NIH/MIConvexHull`.
+ "assembler", "blueprint", "recipe" and "refiner" appear in no live C#.
`ItemData.Manufacturer` readers: `PropertiesPanel.cs:371-372` (shows "Manufacturer",
falling back to "GameCult"), `tools/AetherDb/Program.cs:54` (census), and the
@@ -83,7 +82,7 @@ All crafted instances come from three `ItemManager` overloads:
- `CreateInstance(CraftedItemData, float quality)` (`ItemManager.cs:126-142`) sets
Quality and Durability, with no product and no ingredients.
- `CreateInstance(CraftedItemData)` (`:144-160`) rolls a rarity tier with the
- **time-seeded** `ItemManager.Random` (`:20`) and stores the tier's *discrete*
+ `ItemManager.Random` (`:22`; seeded per run from the galaxy seed by `RunStart.ItemSeed`) and stores the tier's *discrete*
Quality.
- `CreateInstance(FactionProductData)` (`:164-187`) calls the previous overload, sets
`Product`, and draws a gaussian `RoleFill` per design role. Since no role is
@@ -130,9 +129,12 @@ unexecuted stubs.
`TradeMenu.Inventory = entity.CargoBays.First()` (`ActionGameManager.cs:827-829`).
- **Zones generate lazily on first entry** (`ActionGameManager.cs:643-652`,
`PackedContents ??=`) from a deterministic zone seed
- (`ZoneGenerator.cs:47`: name hash xor position hash). Item *selection* follows that
- seed, but item *quality* comes from the time-seeded `ItemManager.Random`. A zone is
- never regenerated within a run. New Game clears the run store (`MainMenu.cs:111`).
+ (`ZoneGenerator.cs:52`: name hash xor position hash). Item *selection* follows that
+ seed, but item *quality* comes from `ItemManager.Random`, a stream seeded per run from
+ the galaxy seed (`RunStart.SeedItems`, steps `ArenaStep`, `StageStep`, `ContinueStep`)
+ and drawn in the order zones are entered. A zone is never regenerated within a run. A
+ new run does not clear the run store up front: `RunSave.Replace` drops the old run's
+ records once the new run has staged (`SavedGame.cs:247`).
- Each station carries hull, hardpoint gear, one docking bay, cargo bay, capacitor and
stock, all embedded by value. No station equips a factory; none can, because factory
designs have no product (§1).
@@ -150,8 +152,9 @@ unexecuted stubs.
`FactionProductData`, `PersonalityAttribute`, `NameFile`, `InputLayout`, `Loadout`.
- Run (`:10`): `OrbitData`, `BodyData`, `SavedZone`, `SavedGame`. Written only by
`RunSave.Commit`, which does one commit, keys zones `savedzone-{i}` and removes stale
- zones (`SavedGame.cs:96-111`). `RunSave.Clear` removes every run-typed record
- (`:114-124`). The single-file store writes its whole view on commit.
+ zones (`SavedGame.cs:216`). `RunSave.Clear` removes every run-typed
+ record (`:242`); `RunSave.Replace` (`:247`) does the same for a new run, but only once
+ the new run has staged. The single-file store writes its whole view on commit.
- Player (`:11`): `PlayerSettings`.
- **Every item instance is a value** embedded in `EntityPack` (hull, equipment, bays,
cargo contents; `EntitySerializer.cs:179-196`), inside `SavedZone.Contents`. No
@@ -237,7 +240,7 @@ Every stat and wear reader goes through the instance:
"F" marks a fork (§9). "D" marks a recorded default.
-| Kind | Named by | Mint | Transfer / loot / sell | Consume | Zone unload / save | New Game / death | Decides |
+| Kind | Named by | Mint | Transfer / loot / sell | Consume | Zone unload / save | New run / death | Decides |
|---|---|---|---|---|---|---|---|
| **Lot** (provenance node) | run-scoped `LotId` (F1) | synthesis, at the mint site's call (F3) | never moves; instances point at it (D) | synthesized inputs are consumed at synthesis and have no instance (D) | kept while reachable from any instance, route or station; GC on `RunSave.Commit` (D, from the orphan-SavedZone scar) | cleared with the run store (D) | the synthesizer, one function in `ServerShared` |
| **Lot properties** (mocked quality per role) | on the lot (F4) | rolled once at synthesis from factory quality and input qualities, seeded by lot id (F4) | immutable | n/a | with the lot | with the lot | synthesizer; stat readers only read |
@@ -301,7 +304,7 @@ synthesized?** Blocks station identity, routes, stock and loot provenance.
pirated freighter's cargo should come from a station the player can fly to. The
skeleton is about 200 stations, small next to 16k instances. It demotes
`ZoneGenerator`'s station count and faction choice to reading the roster. It also
- moves item quality from the time-seeded `ItemManager.Random` to seeded synthesis,
+ moves item quality from the per-run `ItemManager.Random` stream, which depends on the order zones are entered, to lot-seeded synthesis,
which makes the chain regenerable.
- Sub-default: stations keep no identity outside a run. Zones never regenerate within
one.
diff --git a/docs/merge-to-master-checklist.md b/docs/merge-to-master-checklist.md
index d5d70e17b..664f464b2 100644
--- a/docs/merge-to-master-checklist.md
+++ b/docs/merge-to-master-checklist.md
@@ -33,7 +33,7 @@ Compiled 2026-09-29 by Eyes from the maps on the branch. Pointers are `doc:line`
### 2b. Fresh launch (no `run.cc`, no `player.cc`)
3. **Launch to main menu.** Expect no Addressables errors, and the Groups window shows `Assets/Content` under `Default Local Group` (`addressables-cut.md:301`). `player.cc` appears and Continue is disabled (`cultcache-migration-cut.md:2746`). Proves: Addressables Cut 1, CultCache cutover. The 09-17 smoke covered the last two on the old tree; this is a cheap recheck on the new schema.
-4. **New Game (tutorial).** Expect the galaxy generates and the start ship is the Longinus (`settings-globals-cut.md:498`, an expectation, not a recorded check for this stack). Expect a Zenith station with a docking bay in the entrance zone every time (`locomotion-cut.md:375`). Proves: locomotion Cut 1 station rule.
+4. **New Game, then a scenario.** New Game opens the scenario picker (`MainMenu.ShowScenarios`); a development build lists modes (Terminus (Demo)), development (Main Galaxy) and test arenas, a release build lists only the modes. Pick Terminus (Demo). Expect the galaxy generates and the start ship is the Longinus (`settings-globals-cut.md:498`, an expectation, not a recorded check for this stack). Expect a Zenith station with a docking bay in the entrance zone every time, because the scenario declares `EntranceStation` (`locomotion-cut.md:375`). Proves: locomotion Cut 1 station rule.
5. **Addressables, "Use Asset Database".** Ships, turret and Zenith spawn; thruster and aether-drive particles show; fire an instant weapon (Autocannon) and a charged one (ChargeBlast SG); action bar icons show (`addressables-cut.md:362-366`). Proves: Addressables Cut 2.
### 2c. Flight, power and economy
diff --git a/docs/mining-cut-refresh.md b/docs/mining-cut-refresh.md
index a96d10b40..8a5fdcd9e 100644
--- a/docs/mining-cut-refresh.md
+++ b/docs/mining-cut-refresh.md
@@ -63,8 +63,9 @@ rows are kept for the combined test count.
The three file sets are disjoint. I checked with `git diff --name-only` over each branch's own range, and none
of the three pairs shares a file. So each anchored line is byte-identical in the merged tree.
- **Tests ran on Yggdrasil, against synthetic merges** (section 0). CultLib `45c2f40` and CultMath `6d5e209` are
- the pins in `Directory.Build.props`. The two LFS files the tests read (`GameData/Aetheria.cc`,
- `Assets/Resources/Settings.asset`) were staged beside the job, because the verify mirror carries no LFS.
+ the pins in `Directory.Build.props`. The LFS files the tests read were staged beside the job, because the verify mirror carries no LFS. The Mining
+ cut tests needed `GameData/Aetheria.cc` and `Assets/Resources/Settings.asset`; `SubstanceCleanBreakTests` needs 97 and the whole suite needs more
+ (see the LFS staging set under Verification).
- **Catalog facts** come from a probe that opens the merged tree's `GameData/Aetheria.cc` through
`AetheriaStores.Open` (section 0).
@@ -289,7 +290,7 @@ Every mining question is ruled.
- Mark the `:396-412` table as history, anchored at `8bd25f6f`.
- **Verification:**
- Yggdrasil, the same job that section 0 ran:
- `ygg-verify.sh dotnet ''`.
+ `ygg-verify.sh dotnet ''`.
Both roots are mandatory (shared precondition).
- The job mounts the Yggdrasil mirrors read-only with
`DOCKER_ARGS="-v /home/gamecultadmin/eureka-verify/repos:/repos:ro -v /home/gamecultadmin/eureka-verify/lfs-aetheria:/lfs:ro"`.
@@ -298,8 +299,16 @@ Every mining question is ruled.
Rule pinned: fire control and mining compose without a behaviour change on either side. Every pre-existing
test passes unchanged.
- The verify mirror has no LFS (the push from `F:\Projects\Aetheria` fails in the LFS pre-push hook on an
- `ssh:` remote). Push from a `--shared --no-checkout` clone, and mount the two LFS blobs. This is recorded
+ `ssh:` remote). Push from a `--shared --no-checkout` clone, and mount the LFS blobs. This is recorded
so the next Hands does not rediscover it.
+ - LFS staging set. `SubstanceCleanBreakTests` fails loudly on any LFS pointer it scans, so the job must restore
+ every LFS-tracked file under `Assets/`, `Packages/`, `ProjectSettings/`, `GameData/*.cc` and `tests/fixtures/mods/*.cc` that is not a
+ binary-media extension (the test's `BinaryExtensions` denylist): 99 files at `83e6957de`, 96 `*.asset` and 3
+ `*.cc` (`GameData/Aetheria.cc`, `GameData/Mods/aetheria.nakovalnya/ship.cc`, `tests/fixtures/mods/aetheria.wren/ship.cc`),
+ which includes `ProjectSettings/ProjectSettings.asset` and `Assets/Resources/Settings.asset`. Derive the list from
+ the merged tree instead of hand-copying it:
+ `git ls-files Assets Packages ProjectSettings 'GameData/*.cc' 'tests/fixtures/mods/*.cc' | git check-attr --stdin filter | grep 'lfs$' | sed 's/: filter: lfs//' | grep -viE '\.(png|jpg|jpeg|tga|tif|tiff|psd|bmp|gif|exr|hdr|dds|wav|mp3|ogg|mp4|fbx|glb|blend|ttf|otf|dll|so|pdb|msgpack|zip|bank)$'`,
+ then copy each path from the `/lfs` mount over the checkout. That set (99: the 97 the sbsar guards read plus the two mod `ship.cc` files the Nakovalnya and Wren tests open) makes `SubstanceCleanBreakTests` green and nothing more: staging only two files turns it red. For a fully green suite also stage `GameData/Mods/*/ship.glb` and `tests/fixtures/mods/*/ship.glb` (the catalog excludes a package with an invalid GLB header, failing about 520 tests) and the LFS `.ttf`/`.otf` fonts `CreditsTests.FontCreditsShowWhatTheFontsThemselvesEmbed` reads.
- Unity batchmode compile of the merged tree (Self, in a worktree, never with the operator's editor open on
the main tree). This is the Cut 1 renderer compile the map still owes.
- Operator: fly through a belt (the Cut 1 check the map still owes). Rocks orbit smoothly, and the minimap
diff --git a/docs/mining-cut.md b/docs/mining-cut.md
index 7c5be8297..ce23094dc 100644
--- a/docs/mining-cut.md
+++ b/docs/mining-cut.md
@@ -301,7 +301,7 @@ resources **(probe: 8 belts, 0 authored)**.
- A: Composition is derived: `Comp_c(o) = Abundance_o × exp(Variance × g(hash(belt key, index, o)))`, normalized,
with `g ∈ [-1, 1]`. Nothing is stored. Existing saves work, and key 4 is retired.
- B: `ZoneGenerator` writes `BodyData.Resources` per belt at generation, and the chunk jitter is derived. Belts in
- runs started before Cut 5 have empty compositions until New Game.
+ runs started before Cut 5 have empty compositions until a new run.
- C: Per-belt only, with no per-chunk variation.
- **Recommended: A.** It has one owner (the catalog) and nothing to migrate. It follows the same "derived, never
stored" spirit as branding. The operator's wording ("the chunk's composition") argues against C. If B is chosen,
diff --git a/docs/moddable-ship-authoring.md b/docs/moddable-ship-authoring.md
index 81871b2dc..057b7d511 100644
--- a/docs/moddable-ship-authoring.md
+++ b/docs/moddable-ship-authoring.md
@@ -216,7 +216,12 @@ a radiator, `weapon-mount` for an energy, ballistic or launcher hardpoint. An
internal hardpoint (reactor, sensors, shield and the rest) has no anchor, and
an anchor taking its id is refused. A thruster's or radiator's anchor node is a
mesh: the thruster's is not rendered and is the surface its exhaust emits from,
-the radiator's is rendered. A weapon mount is a point, and each one needs at
+the radiator's is rendered. A directional thruster's emitter is one-sided: the
+exhaust is born along each triangle's normal, so every normal must face the way
+the hardpoint's Rotation faces (opposite the push), and a closed box, which also
+fires along the push, is refused by Compose and `validate` naming the anchor. In
+the Blender kit's frame a hull source's emit mesh is cut to the side facing its
+anchor's yaw. A ring thruster would be its own class with its own rule. A weapon mount is a point, and each one needs at
least one `weapon-muzzle` anchor whose `ParentId` is the weapon's mount id.
`articulation` is reserved for pivots and is never a mount; no pivot is
planned until pivots move onto `HullData`. `ShipModPlan` then maps the
diff --git a/docs/research/2026-10-21-strategic-ai-arena-living-world-prior-art.md b/docs/research/2026-10-21-strategic-ai-arena-living-world-prior-art.md
index 42f0ee20c..87a1bb7c9 100644
--- a/docs/research/2026-10-21-strategic-ai-arena-living-world-prior-art.md
+++ b/docs/research/2026-10-21-strategic-ai-arena-living-world-prior-art.md
@@ -390,7 +390,8 @@ Battlecode, Halite, CodinGame, BWAPI/SSCAIT/AIIDE/CIG, SC2 AI Arena, Lux, CodeCl
- **The Colosseum follow-up.** `aetheria-release:follow_up:colosseum-npc-lab` (in force; owner "Aetheria Agents and
the headless simulation") names its foundations:
- an observation and action seam (agents hold live `Ship`, `Zone` and `ItemManager` references);
- - seeding `ItemManager.Random` and the MIConvexHull randoms;
+ - seeding for tournament reproducibility: `ItemManager.Random` already takes the run's seed
+ (`RunStart.ItemSeed`), and no MIConvexHull source remains in the repo;
- a replay recorder;
- a headless tournament runner on Yggdrasil with ratings;
- a primitive vocabulary;
diff --git a/docs/settings-globals-cut.md b/docs/settings-globals-cut.md
index b031ba4bf..f1b2e0582 100644
--- a/docs/settings-globals-cut.md
+++ b/docs/settings-globals-cut.md
@@ -495,8 +495,9 @@ landed type differs from it by the one attribute.
(the helper) [2 now].
- `rg -n "ScriptableObject" Assets/Scripts/ServerShared` must stay 0.
- operator:
- - Play smoke: main menu, then New Game (tutorial). The tutorial galaxy generates,
- and the starting ship is LonginusX.
+ - Play smoke: main menu, then New Game, then the Tutorial Galaxy scenario (listed under
+ development, in editor and development builds). The prelude galaxy generates, and the
+ starting ship is `Settings.StartingHullName` (`Longinus`).
- In a station trade menu and the properties panel, item names show tier colours:
Legendary orange, Uncommon green. None is black.
- The inventory shows armour and durability gradients, and hit flashes use the
diff --git a/docs/tutorial-script-sketch.md b/docs/tutorial-script-sketch.md
index 7e9233988..3fcbbebb6 100644
--- a/docs/tutorial-script-sketch.md
+++ b/docs/tutorial-script-sketch.md
@@ -16,7 +16,7 @@ Status: sketch for the operator to react to. Nothing here is built or canon.
## Shape
-One contained tutorial run in a small prelude galaxy (`IsTutorial`,
+One contained tutorial run in a small prelude galaxy (`Galaxy.IsPrelude`,
`TutorialGenerationSettings`). The player is a newly incorporated subsidiary of the
protagonist faction. Threefra, a debt-born assessor with opinions, walks them through a
"qualification module" whose checklist is theatre. The real test is how the player
diff --git a/native/aetherlight/Cargo.lock b/native/aetherlight/Cargo.lock
new file mode 100644
index 000000000..494df4f1d
--- /dev/null
+++ b/native/aetherlight/Cargo.lock
@@ -0,0 +1,430 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aetherlight"
+version = "0.1.0"
+dependencies = [
+ "rmp-serde",
+ "serde",
+ "serde_json",
+ "sha2",
+ "thiserror",
+ "unicode-normalization",
+ "unicode-properties",
+ "uuid",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
+
+[[package]]
+name = "futures-task"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd"
+
+[[package]]
+name = "futures-util"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "js-sys"
+version = "0.3.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e0c1080212aad755ea003d18543e8768dd432c48819efd73a7bf1e39b7a5a3a"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.189"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+
+[[package]]
+name = "memchr"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
+[[package]]
+name = "rmp"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ba8be72d372b2c9b35542551678538b562e7cf86c3315773cae48dfbfe7790c"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72f81bee8c8ef9b577d1681a70ebbc962c232461e397b22c208c43c04b67a155"
+dependencies = [
+ "rmp",
+ "serde",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
+
+[[package]]
+name = "serde"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.3",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.151"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "syn"
+version = "2.0.119"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.3",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "typenum"
+version = "1.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-properties"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
+
+[[package]]
+name = "uuid"
+version = "1.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cefc03fd367c0c6d4305de1b312cf00248c4114f4a0418ce6a6af769e3b0bd9"
+dependencies = [
+ "getrandom",
+ "js-sys",
+ "serde_core",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.127"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b70935747edd64d89de3efa29d73789b806c15798f8e7dca4d8ac356b50ce70"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.127"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77775f8f3f7217702089053b94958f8f54061a3f663417df76e19cbdcca29bc1"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.127"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e11d33f857dc2fb11b8bc75aee111aa9cbeb12cd9f25efd3d4c2a3dd4e235284"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.127"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ef64dbcc55df09c7e5a46182d181c2cfa3e925f3da937ea764728b4bbb9dcbf"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
diff --git a/native/aetherlight/Cargo.toml b/native/aetherlight/Cargo.toml
new file mode 100644
index 000000000..49c9a5965
--- /dev/null
+++ b/native/aetherlight/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "aetherlight"
+version = "0.1.0"
+edition = "2024"
+license = "MIT"
+publish = false
+
+# Its own workspace: the crate builds on its own, outside any parent manifest.
+[workspace]
+
+[dependencies]
+rmp-serde = "1.3"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+sha2 = "0.10"
+thiserror = "2"
+unicode-normalization = "0.1.25"
+unicode-properties = "0.1.4"
+uuid = { version = "1", features = ["serde"] }
+
+[dev-dependencies]
+# Test fixtures draw random ids; no shipped path does.
+uuid = { version = "1", features = ["v4"] }
diff --git a/native/aetherlight/PROVENANCE.md b/native/aetherlight/PROVENANCE.md
new file mode 100644
index 000000000..d56b93a69
--- /dev/null
+++ b/native/aetherlight/PROVENANCE.md
@@ -0,0 +1,628 @@
+# Aetherlight provenance
+
+Aetherlight is a fork of the synchronous world kernel of Ghostlight.
+
+- Upstream: `GameCult/Ghostlight`, `crates/ghostlight/`
+- Commit: `c43eb54962ed4a09cc737ecac73a16b0d7ce62b4` (origin/main)
+- Taken: 2026-11-19
+- Authority: cut `aetherlight-fork-import` r1 of campaign `aetheria-release`;
+ rulings `aetherlight-narrative-state-owner` and `dialogue-is-world-action`.
+
+Every file below was copied as a raw git blob (`git show`), never `git archive`.
+The blobs are LF, as upstream. A Windows checkout with `core.autocrlf` turns the
+`.rs` files and the two text fixtures into CRLF; rustc, the fixture readers
+(`lines()`, `trim()`) and the golden test absorb that, so no `.gitattributes` is
+kept (a first commit had one; its stated reason did not hold). The recorded-world
+fixture (removed in AL2a) was binary and no newline rule touched it. Line ranges are in the c43eb54 file.
+
+## Taken
+
+| c43eb54 path (under `crates/ghostlight/`) | Here | Range | Edits |
+| --- | --- | --- | --- |
+| `src/lib.rs` | `src/lib.rs` | all | E1-E5, E10-E12 |
+| `src/action.rs` | `src/action.rs` | all | E11, E12 |
+| `src/clock.rs` | `src/clock.rs` | all | none |
+| `src/journal.rs` | `src/journal.rs` | all | E12 |
+| `src/grammar.rs` | `src/grammar.rs` | all | none |
+| `src/grammar/tests.rs` | `src/grammar/tests.rs` | all | E12 |
+| `src/import_key_tests.rs` | `src/import_key_tests.rs` | all | E12 |
+| `src/patch.rs` | `src/patch.rs` | 1-6059 and 7906-9606 (dropped 6060-7905: the patch tool catalog, `PATCH_TOOLS`, `patch_tools()`, the `field_example` helpers, `mod catalog_tests`) | E6, E7, E12 |
+| `Cargo.lock` | `Cargo.lock` | all | pruned by cargo to the dependencies below |
+
+`Cargo.toml` is new: package `aetherlight`, its own `[workspace]`, no features,
+dependencies rmp-serde, serde, serde_json, sha2, thiserror, unicode-normalization,
+unicode-properties, uuid (serde only); dev uuid with v4 (AL3a).
+
+## Edits
+
+- E1. `lib.rs`: dropped the `mod` lines and every `pub`/`pub(crate) use` of
+ aetheria, consumer, controllers, elaboration, local_inference (with its
+ `cfg(feature = "test-support")` re-export), mailbox, sdk_inference, table,
+ tool_schema, vault, verse.
+- E2. `lib.rs` crate docs: retitled to Aetherlight with a pointer to this file;
+ the `compile_fail` doc-tests name `aetherlight::` instead of `ghostlight::`.
+ The sealing prose is kept.
+- E3. `lib.rs`: `#![allow(dead_code)]`. The kernel has no entry point until AL4
+ adds the ABI; AL4 removes the attribute.
+- E4. `lib.rs`: imports that only dropped code used are removed
+ (`cover::{CellId, Constituent, Resolution}`), or moved under `#[cfg(test)]`
+ because only tests use them (`patch::{Bounds, Declaration, EntityDeclaration,
+ SubjectDeclaration}`).
+- E5. `lib.rs`: `let mut` removed from the closures `confine_subject` and
+ `confine_place` (unused-mut in the non-test build).
+- E6. `patch.rs`: deleted `use super::tool_schema;`,
+ `use codex_connector::CodexToolDefinition;` and `use serde_json::{Value, json};`
+ (only the dropped catalog used the last one); `let mut` removed from the
+ `controller_id` closure.
+- E7. `patch.rs`: lines 6060-7905 dropped as above.
+- E8. `lens.rs`: deleted test `every_lead_names_a_patch_tool` and its
+ `use crate::patch::PATCH_TOOLS;`, which read the dropped catalog.
+- E9. `lens.rs`: the doc comment on `leads_with` says "patch tool names" instead
+ of naming `PATCH_TOOLS`.
+- E10. `lib.rs` crate docs describe the fork as it is (no runner, no ports, no
+ controllers); the compile_fail doc-tests keep no error code (stable rustdoc does
+ not check one) and the two that named items absent from the fork
+ (`fixture_controller_opportunities`, `fixture_inference_output`) are deleted.
+ The `VerifiedPrincipalEvidence` doc no longer links `WorldMailbox`/`SeedPort`
+ and says nothing here enforces `valid_until`; the ABI must (AL4).
+- E11. New tests, not upstream, each killing a mutant that survived upstream's 810
+ tests: `action::tests::holding_exactly_the_threshold_satisfies_holds`,
+ `clock_tests::committed_requires_the_named_counterparty`,
+ `clock_tests::committed_requires_the_named_kind`,
+ `soul_knowledge_tests::a_telling_by_a_speaker_outside_its_audience_does_not_apply`.
+
+- E12. Cut AL2a deletes the model-guidance lanes; see the section below. It
+ supersedes E4's `cover` import, E8 and E9 (`lens.rs` is gone), and `lib.rs`,
+ `patch.rs`, `journal.rs`, `action.rs`, `grammar/tests.rs` and
+ `import_key_tests.rs` lose the symbols and tests listed there.
+
+The `ghostlight.*` schema ids were renamed in AL3a (see the last section). The
+golden replay AL2a removed is back as `fixtures/golden.digests` (AL3a).
+
+## Left behind
+
+| Upstream file | Why it is not here |
+| --- | --- |
+| `mailbox.rs` | the async port/mailbox lane around the kernel; AL4's ABI replaces it |
+| `controllers.rs` | model decider lane; composes an invocation's speech text, which Aetheria's player and C# brains do themselves |
+| `elaboration.rs` | model elaboration lane |
+| `consumer.rs` | consumer patch admission over HTTP-shaped ports; speech only in its fixtures |
+| `table.rs` | encodes actor calls as model tools |
+| `vault.rs` | evidence source over a vault |
+| `local_inference.rs`, `sdk_inference.rs` | model backends (tokio, reqwest, codex-connector) |
+| `tool_schema.rs` | tool schemas for model calls |
+| `aetheria.rs`, `aetheria/` | Ghostlight's Aetheria catalog reader; Aetheria content is read by Aetheria |
+| `verse/` | one example world; its speech affordances are a pattern to copy into Aetheria content, not a kernel dependency |
+| `tests/external_admission.rs` | the cross-crate proof that forged, serde-minted opportunities and ids are refused at the public surface; dropped with the consumer lane it drove. AL4 must carry an equivalent proof against the ABI's own surface |
+| crates `ghostlight-persona-projection`, `ghostlight-verse`; `sidecar/` | outside the synchronous kernel |
+
+Speech as world action stays whole: affordance declarations with `carries_speech`,
+preconditions, audience, effect slots and outcome bands, `Communicate` and
+`Display`, `Knowledge` and `Told`, commitments (`patch.rs`); exercise, role
+binding, preconditions, audience, band selection and lowering (`action.rs`);
+`DecisionInvocation`, `DecisionEvent` and `ResolvedOp::Communicate` apply
+(`lib.rs`); the `SpeakRenderPath` check (`grammar.rs`).
+
+## Dependency pin
+
+The crate no longer pins CultLib: `cultcache-rs` (Ghostlight's rev
+`85f7024a35ea42cf9f0a0199a064526427150191`) left the manifest in AL3a with the
+redb store it served.
+
+## Pulling a later Ghostlight fix
+
+By hand, against this file: read the upstream diff for the taken files, apply it
+here, and record it in this file with its upstream commit and the files it
+touched. A fix that lands in a left-behind file is not pulled.
+
+## Cut AL2a: the model-guidance lanes
+
+Authority: cut `aetherlight-cut-agency-a` r1 of campaign `aetheria-release`;
+rulings `aetherlight-narrative-state-owner` and `dialogue-is-world-action`.
+Deleted, with their c43eb54 homes:
+
+- Lens (`src/lens.rs`, 361 lines): `Lens`, `LensWeights`; the genesis input,
+ `WorldState`, snapshot and creation field `lens_weights`;
+ `CommandBody::SetLensWeights`; `WorldEffect::LensWeightsReplaced`;
+ `Mismatch::LensWeightsNeverDraw`; the draw-rule check in `verify_state_shape`.
+- Cover and agency graph (`src/cover.rs`, 1105 lines): `Cover`, `Cell`,
+ `CoverBudget`, `derive_cover`, `AgencyGraph`; `WorldKernel::agency_graph` and
+ `fn agency_graph` (`lib.rs`); `CommandId::for_cell`, `for_cell_constituent`.
+- Persona material (`lib.rs`, `patch.rs`): `PersonaMaterial`, `PersonaReadRef`,
+ `ComponentOp::SetPersonaMaterial` and `ResolvedOp::SetPersonaMaterial` with
+ resolution, apply and confinement arms, `WorldState.persona_material`, the
+ subject snapshot's `material`, `WorldPatch::sets_persona_of_existing_subject`.
+ The op set goes from 34 to 33.
+- Brief: the `brief` string in `CreateWorld`, `CreateWorldIntent`, `WorldState`,
+ `WorldEffect::WorldCreated`, the snapshot and the shape checks.
+- Elaborator lane: `SystemCapability::Elaborator`, `PatchAnswer`,
+ `CausalBoundary`, `BoundaryDigest` and `derive_boundaries`, `exact_boundary`,
+ `require_answer` (the `AnswerRequired` gate), `jurisdiction_deficit`,
+ `ground_covers`, `place_in`, `PatchGround::Jurisdiction`; `WorldScaleIntent`,
+ `WorldScaleIntentRef`, `JurisdictionKey`, `ScaleDeficitRow`, `qualifies`,
+ `derive_scale_deficit`, the subject snapshot's `qualified`, the snapshot's
+ `boundaries` and `scale_deficit`, `CreateWorld.scale_intent`,
+ `CreateWorldIntent.targets` and `jurisdictions`, `CreateJurisdictionIntent`,
+ `WorldState.scale_intent`; `CommandBody::AdmitPatch.answers` and
+ `WorldEffect::PatchAdmitted.answers`; `KernelError::AnswerRequired`,
+ `AnswerNotDerived`, `AnswerNotSatisfied`; `Mismatch::UnknownJurisdictionRoot`
+ and `ScaleWeightsExceedWhole`. `resolve_patch` loses its intent parameter.
+- The golden replay `grammar::tests::existing_world_reopens_with_unchanged_digests`
+ and the recorded-world fixtures under `tests/fixtures`: removing state fields changed the state
+ shape, so Ghostlight's recorded world no longer decodes. AL4 adds
+ Aetherlight's own golden.
+
+Behaviour with the gate gone: `require_play_active` keeps the one rule
+`require_answer` also held (`Play` authors nothing in Draft) and states the other
+as a plain rule: in Active, declaring (new structure or evidence) is `Play`'s act
+alone, and the owner is refused. A confined author's only remaining check is
+`confine_to_ground`, which now serves the consumer ground alone.
+
+AL4's ABI must route the host through typed commands (the sim reports events,
+scripts propose), never through owner declarations in Active: under
+`aetherlight-narrative-state-owner` an owner declaring in Active would be a second
+door beside that path.
+
+Kept untouched for AL2b: controllers and `ControllerMode`, consumers
+(`ConsumerId`, `SystemCapability::Consumer`, `PatchGround::Consumer`,
+`bound_to_consumer`), the draft phase and approvals, `VerifiedPrincipalEvidence`.
+(Opportunities, scope digests, the attention order, `ExerciseDecision` and
+`DeclineDecision` went in AL2b-1, below.)
+
+## Leave-set vocabulary still compiled (AL2b's and AL4's triage list)
+
+`#![allow(dead_code)]` still hides the dead code of a crate with no entry point.
+What the cut deletes is gone; what remains is part B's:
+
+- Authenticated-caller vocabulary: `AuthenticatedCaller::fixture`,
+ `verified_principal` and `verified_play`; id helpers `text` and `nil_for_test`;
+ `commits_for_test`; grammar `verbs`. AL4's ABI
+ decides which of these it needs.
+- Patch ingress: `decode_patch`, `check_patch_caps`, `PatchDecodeError` and
+ `MAX_PATCH_BYTES`, `MAX_PATCH_DECLARATIONS`, `MAX_PATCH_OPERATIONS`,
+ `MAX_PATCH_EVIDENCE`; the consumer ingress and elaboration lane read them, and
+ nothing here does. They stay: AL4's ABI decides whether it decodes patches
+ itself.
+- Mailbox and vault comments (`WorldMailbox`, `vault:` evidence strings).
+
+Reproduce the list with `RUSTFLAGS=--force-warn dead_code cargo test --lib --no-run`:
+under test configuration the items nothing exercises show up.
+
+## Cut AL2b-1: Play's Act replaces opportunity-based exercise
+
+Base `bf92a054f`. An act is one command, `Act { actor, invocation }`, admitted for
+`System(Play)` in Active only, and one effect, `Acted { invocation, event }`.
+`require_granted(state, actor, affordance)` is the only constructor of
+`GrantedAffordance`: the actor's `affordance_grants` entry holds the affordance
+and the catalog defines it, otherwise `AffordanceDenied`. `Retire` removes a
+subject's grants, so a retired actor is refused by that check alone.
+`action::exercise` takes the actor in place of an opportunity; its pipeline is
+unchanged and the band draw keeps `command_id` as its only per-command term.
+`DecisionEvent` carries `actor`, not `scope` and `controller_id`. `STATE_SCHEMA`
+and `COMMIT_SCHEMA` moved to `consumer.v8`.
+
+Deleted, with their `bf92a054f` locations in `lib.rs`:
+
+- `ScopeDigest`, `ScopePreimage`, `DecisionOpportunity` (459-506) and
+ `scope_digest`, `exact_opportunity`, `derive_opportunities`,
+ `order_opportunities`, `pressure_total`, `attention_debt`, `granted_entries`
+ (3841-4034). `WorldSnapshot.opportunities`, `WorldState.last_opportunity_at` and
+ the attention-stamp shape check in `journal.rs` (730-738).
+- `CommandBody::ExerciseDecision` and `DeclineDecision`, `WorldEffect::
+ DecisionExercised` and `DecisionDeclined`, their `reduce` and `apply_effect`
+ arms, and `KernelError::OpportunityMismatch`, `ScopeChanged`,
+ `ControllerMismatch`.
+- The operator log: `operator_log`, `OperatorEvent`, `BoundRole` (3518-3579,
+ 1109-1134), and the kernel readers `opportunities`, `clock_advances`,
+ `controller_receipt`, `controller_decline_receipt`.
+- `WorldJournal::commits` and `FictionalMinutes::since`, dead once the readers
+ above went.
+
+Kept: the whole dialogue lane (`carries_speech`, `Communicate`, `Display`, the
+kernel Speak entry, the grammar, `preconditions_hold`). `DecisionScope` stays the
+grant key and `ControllerAssignment` stays; the owner's `AdmitPatch` and
+`AdvanceTime` doors and `SystemCapability::Clock` stay.
+
+AL2b-2a (below) took the writers; AL2b-2b still owns the controller half under
+`aetherlight-play-only-after-genesis`: `ControllerAssignment` (which until then
+holds only the `Retired` flag and unread identity data), `NewController`,
+`ControllerId`, `ControllerMode`, `DecisionScope` as the grant key,
+`SubjectState.retired`, `Mismatch::UnadmittedController`, the `admits_human`
+rename and the snapshot's controller fields.
+
+`last_acted_at` and `minted_at` in `snapshot` still read `state.events` (by
+`event.actor`). AL3 needs keyed rows instead of a scan; that is the AL3 cut's.
+
+## Cut AL2b-2a: after genesis only Play writes
+
+Base `f51275c61`. A world is born Active: the genesis commit is the owner's
+only act, and `WorldState::empty` has no phase and no approvals. After it
+`CallerId::Play` is the only caller any command body admits. `CallerId` is
+`{ Principal, Play }`; `Principal` survives as the genesis creator (and as the
+refused caller of every post-genesis body). One rule, `require_play`, decides it
+at the top of `reduce` and again at the top of `apply_effect`, so it holds on
+commit and at replay; the journal gains no caller rule.
+`require_ruler` is `forbid_rulings_at_genesis`: genesis may not rule or mint,
+Play may. A grant row exists if and only if the subject holds a verb; a subject
+may be declared with none, and revoking the last verb removes the row.
+`GrantsOutsideControl` is `GrantsToRetired`. `STATE_SCHEMA` and `COMMIT_SCHEMA`
+moved to `consumer.v9`.
+
+Deleted, with their `f51275c61` locations in `lib.rs` unless noted:
+
+- The Clock and Consumer capabilities and `CallerId::Controller`:
+ `SystemCapability` (388-406), `AuthenticatedCaller::verified_controller` (433),
+ `require_system_capability`, `require_clock_caller`, `require_play_active`,
+ `require_owner` and `require_patch_author` (1456-1514, 3594-3625, 3989-4006),
+ and `apply_effect`'s capability table.
+- The consumer lane: `ConsumerId` and its namespace (317-338), `PatchGround`
+ (408-419), `NewController::External`, `ControllerAssignment::
+ ExternallyControlled`, `expected_caller`, `consumer()`, `bound_to_consumer`,
+ `candidate_places`, `confine_to_ground` (3628-3792), `operation_ground`
+ (3826-3987), and in `patch.rs` the mirror and human candidate sets,
+ `Mismatch::OutsideJurisdiction`, `RetiresAMirror`, `ControllerGrantMismatch`.
+- The draft phase: `WorldPhase`, `WorldState.phase` and `draft_approvals`,
+ `CommandBody::ApproveDraft` and `ActivateWorld`, `WorldEffect::DraftApproved`
+ and `WorldActivated`, `required_approvers`, `KernelError::WrongPhase`,
+ `NotDraftApprover`, `DraftAlreadyApproved`, `MissingApprovals`, the snapshot's
+ `phase`, `draft_approvals` and `required_approvers`, `Mismatch::RetiresAnApprover`,
+ and the Draft-only shape clause in `journal.rs`.
+- The never-mute rule and the controller/grant pairing: in `admit_resolved`, the
+ resolver, `Mismatch::WouldLeaveSubjectMute`, and the shape clauses in
+ `verify_state_shape` that required a grant row per controlled scope.
+- `CommandId::derived`, whose only caller was `ConsumerId::of_name`.
+- `VerifiedPrincipalEvidence` (106-146), `CreateWorldIntent` (366-376) and
+ `PrincipalCommandIntent` (521-529). The `valid_until` enforcement that
+ Ghostlight's mailbox did is no longer an AL4 obligation: the type that carried
+ it is gone.
+
+Kept: the whole dialogue lane, `decode_patch`, `check_patch_caps`,
+`PatchDecodeError` and the `MAX_PATCH_*` constants (AL4's ABI decides whether
+it decodes patches itself), the `ghostlight.*` schema namespaces (AL3 renames
+them), `Retire`, `GrantAffordance` and `RevokeAffordance` as Play's patch
+operations, and `#![allow(dead_code)]`.
+
+Nothing decides with a controller after this cut. `ControllerAssignment`,
+`NewController::{Human, NarrativePersona, OperationalAgent}`, `ControllerId`,
+`ControllerMode`, `DecisionScope` as the grant key, `validate_assignment`,
+`Mismatch::UnadmittedController` and `admits_human` (the genesis predicate three
+places read) stay compiled for AL2b-2b, which removes the controllers and
+renames the predicate.
+
+`last_acted_at` and `minted_at` in `snapshot` still read `state.events`; the
+count of code readers of `state.events` did not rise (idea
+`cutspecs-1119.al3-needs-keyed-rows`).
+
+## Obligations this cut hands to AL4
+
+- A cross-crate proof that forged opportunities and ids are refused, equivalent to
+ the dropped `tests/external_admission.rs`, against the ABI's surface.
+- Removal of `#![allow(dead_code)]`.
+
+## AL2b-2b: controllers go, retirement on the subject
+
+The subject controller is gone: `ControllerAssignment`, `ControllerId`,
+`ControllerMode`, `NewController`, `DecisionScope`, `SubjectDeclaration.controller`,
+`Mismatch::UnadmittedController`, `validate_assignment`, the snapshot's controller
+fields and `ControllerId::issue`. Retirement is `SubjectState.retired`, and
+`is_retired` is its only statement. `affordance_grants` is keyed by `SubjectId`.
+`admits_human` is `is_genesis`: it says what the from-nothing lane may build (the
+kernel Speak entry and the first subjects), not who may be bound. The schema is
+`consumer.v10`; v9 rows are refused at the schema gate, with no migration.
+
+Not this cut's, and kept: the channel controller (`ChannelRecord.controller`,
+`SetController`, `resolve_controller`), which is dialogue
+(`dialogue-is-world-action`). An earlier version of this file listed
+`resolve_controller` and `controller_key` as AL2b-2b's; that was wrong.
+
+## Cut AL3a: the journal is in memory; ids are derived
+
+Authority: cut `aetherlight-journal-a` r1 of campaign `aetheria-release`; rulings
+`aetherlight-narrative-state-owner`, `cultnet-scale-is-not-negotiable`,
+`dialogue-is-world-action`. Base `09a1c3256` (spec base `39c50acfc`; no `native/`
+change between them).
+
+Ids. `CommandEnvelope::id()` is the first 16 bytes of sha256 over
+`aetherlight.command.v1`, the world id, the big-endian expected revision and the
+named messagepack of caller and body. `CreateWorld::id()` is the same over
+`aetherlight.create.v1` and the whole creation. `WorldId::of(creation id)` is the
+same over `aetherlight.world.v1`; a genesis commit whose world id is not that is
+refused at open. The `id` fields on `CreateWorld` and `CommandEnvelope`,
+`CommandId::new`/`parse_uuid` and `WorldId::issue` are gone; `CommandId::issue`
+is a test fixture. Retry identity went with them: `SubmitReceipt` collapsed into
+`CommitReceipt`, and a resubmitted applied command is a `RevisionMismatch`.
+`WorldCommit.committed_at` is gone: wall time is the C# store's `stored_at`.
+
+Journal. `WorldJournal { commits }` is the only record of a world. `export()` is
+canonical named messagepack of `{ schema: aetherlight.journal.v1, commits }`;
+`open(bytes)` decodes canonically and replays through `verify_history`, which
+reads the revision-ordered slice and returns the head state it derives. There is
+no state row, no expected world id, no health or ownership check and no
+`verify_append`. `STATE_SCHEMA` and `COMMIT_SCHEMA` are
+`aetherlight.world_state.v1` and `aetherlight.world_commit.v1`; any `ghostlight.*`
+schema is refused at the schema gate and at the commit chain.
+
+Dependencies. chrono, cultcache-rs (and with it redb) and tempfile left the
+manifest; uuid keeps `serde` in `[dependencies]` and `v4` only in
+`[dev-dependencies]`, so no shipped path draws a random id (`cargo build --lib`
+compiles without it).
+
+Not taken from the spec's text: the spec's negative pattern `id: CommandId`
+matches the `command_id: CommandId` parameters of the band draw and derivation
+(the per-command term the spec keeps); the doc comment said `synchronous`, which
+`chrono` matches, and now says `single-threaded`.
+
+Host contracts (AL3a, from Soul's pass):
+
+- Two byte-equal creations share a `WorldId` and every id under it. A host that
+ wants distinct worlds salts each run or profile into the creation, for example
+ a run seed in the patch.
+- Truncation and rollback open: a chain verifies as a prefix, so an export with
+ its tail dropped, or an older export, opens as a valid shorter world. The
+ holder of the bytes keeps the head (revision and state digest from `snapshot()`
+ at export time) and compares after `open`. AL5's C# store owns this.
+- The band draw is grindable through the command id (it hashes the body, so the
+ text, a magnitude or the revision re-roll it). Only Play submits acts after
+ genesis and Play is trusted, so it is not an authority hole.
+
+## Cut AL3b: partitions are tracked documents, the state digest is a set digest
+
+Authority: cut `aetherlight-journal-b` r1 of campaign `aetheria-release`; rulings
+`aetherlight-narrative-state-owner`, `cultnet-scale-is-not-negotiable`,
+`terminus-clockwork-world`. Base `36d1d2507`.
+
+Tracked documents. Each partition of `WorldState` is a `Docs` (`docs.rs`):
+a map whose every write method records the key's value as it stood when the
+transaction first touched it. `finish` reports the keys whose value really
+changed with their old value; `rollback` puts the touched keys back. The world's
+own fields (id, owner, title, grammar, clock) are one `Tracked`.
+`revision`, the accumulator, `state_digest` and `last_commit_digest` are the
+chain head, outside every document. `submit` checks, reduces, opens a
+transaction, applies to the live state, then folds the change set and seals the
+commit; any error before the commit is sealed rolls the state back. There is no
+candidate clone, and replay uses the same begin, apply, finish path, so opening
+a world costs what its commits touched.
+
+Set digest. A document digest is sha256 over `u64be len(schema)`, schema,
+`u64be len(key)`, key and the named messagepack of the value. The accumulator is
+LtHash16 (Lewi et al. 2019): a document digest is expanded to 2048 bytes by
+sha256(digest, block) for blocks 0 to 63, read as 1024 little-endian `u16`
+lanes, and added (or subtracted) with wrapping. An updated document subtracts
+its old digest and adds its new one. `state_digest` is `sha256:` plus the hex of
+sha256 over `aetherlight.world_state.v2`, `u64be revision` and the lanes. It
+depends on the set of documents alone, never on write order.
+
+Document names are `aetherlight..v1` for world, subject, entity, edge,
+position, holdings, dependencies, fact, channel, knowledge, authority,
+selection, redress, commitments, pressures, affordance and affordance_grants.
+Keys are the id's uuid text; redress is keyed by the grievance name and knowledge
+by `subject/fact`. These schema ids exist only as digest input.
+
+Schemas. `aetherlight.world_state.v2` and `aetherlight.world_commit.v2`. An
+export whose commits carry v1 is refused. Every state digest, every commit
+digest and the export hash moved; `fixtures/golden.digests` was regenerated and
+reproduces on Linux.
+
+Events and knowledge. `WorldState` no longer holds events: an event lives once,
+in the `Acted` effect of the commit that applied it. `snapshot` folds
+`minted_at` and `last_acted_at` over the journal (still one O(history) pass; an
+index is the follow-up's). `verify_state_shape` no longer judges events; replay
+re-derives each through `action::exercise` in `apply_effect`. Knowledge is one
+document per (subject, fact), so a subject's knowledge is a range over the key
+and forgetting removes one key. `WorldState` has no `Serialize` or `Deserialize`:
+only documents are encoded, one at a time.
+
+The change set is transient here. AL3c records it through the CultLib type.
+
+Timing. The ratio of 1600 to 100 persons is not gated by this cut: the world
+reads a commit makes (`audience`, `derive_motion`, the snapshot) are still
+O(world), and follow-up `aetherlight-read-indexes-timing-gate` owns the gate. What
+this cut owns is the work it does for the digest, which
+`golden_tests::digest_work_is_equal_at_100_and_1600` pins: document digests per
+commit equal at both sizes and equal to Added + Removed + 2 x Updated.
+
+## Cut AL3b-2: partition read indexes, and the read-work gate
+
+Authority: cut `aetherlight-read-indexes` r1 of campaign `aetheria-release`;
+rulings `aetherlight-narrative-state-owner`, `cultnet-scale-is-not-negotiable`,
+`terminus-clockwork-world`. Base `576605c7b`. No digested byte moves:
+`fixtures/golden.digests` is identical at every commit of the cut.
+
+Read indexes are derived state. A `Docs` may carry a `Projection`, a pure function
+of one document's value (`DueAt`, `StandsAt`, `ChildOf`, `BySource`, `ByEndpoint`,
+`ByController`, `ByIncumbent`, in `lib.rs` beside `world_state!`). The index is the
+projection of the map as of the last `finish`, folded by `Docs::finish` from the
+same changed-key list the digest folds. It is not a partition: not digested, not
+encoded, ignored by equality, never exported. Opening a world builds it by replay,
+since genesis and every replayed commit close through `finish`; there is no rebuild
+path. `Docs::indexed(range)` returns (point, key) in order and is corrected by the
+open log (a logged key's committed entries are dropped and its current points are
+read from the map), so it is true mid-transaction; `rollback` never touches the
+index because the index never saw the transaction. `Docs` no longer derefs to its
+map: every read is an inherent method, so no reader can step around the counter.
+
+Read work is counted where reads are owned. In test builds `docs::rows_read()` is
+the number of rows any `Docs` iterator has yielded plus the entries every `indexed`
+call returned. `golden_tests::read_work_is_equal_at_100_and_1600` asserts that a
+tick (two routines rolled, two obligations pressed) and a colocated speech read
+the same number of rows at 100 and 1600 persons; `operation_reads_are_equal_at_100_and_1600`
+does the same for the reads no submit shape reaches (a two-level `under_place`, a
+`DischargeCommitment` among N pressure rows, one incumbent's `delegated_authority`,
+a three-route `reachable`). Wall time is reported by `clockwork_commit_cost` and
+asserted nowhere: it is noise at this scale. The gate world holds a route, a
+`Reach::Place` channel and an institution with an office per place, because an
+empty partition hides its scan.
+
+Eight scans became index reads: `under_place`, `audience` (colocated), the pressure
+holders of `DischargeCommitment`, `scope_components`' routes and controls,
+`delegated_authority`, `derive_motion`'s commitment walk and `reachable`'s outbound
+edges. Each old scan is kept as a `cfg(test)` `*_by_scan` reference, and
+`index_reads_equal_reference_scans` compares them over every revision of the golden
+session, the populated worlds and forty clockwork commits. `indexes_are_derived`
+rebuilds every index from its map after each commit, after reopen and after each
+failed apply; `a_corrupted_index_is_detected` damages each index both ways.
+
+Reads that still scan, each with its owner: `snapshot` (the host's whole-world
+projection, never on the commit path); the resolver's reads of the whole world in
+`AdmitPatch` (`aetherlight-resolver-reads-world`). The
+"Timing" paragraph of AL3b above is superseded: the gate it deferred is
+`read_work_is_equal_at_100_and_1600`.
+
+## Cut AL3d-2: cross-partition views
+
+Authority: cut `aetherlight-cross-partition-views` r1 of campaign
+`aetheria-release`; rulings `cultnet-scale-is-not-negotiable`,
+`aetherlight-narrative-state-owner`, `terminus-clockwork-world`,
+`dialogue-is-world-action`. Base `609b3ba5e`. No digested byte moves:
+`fixtures/golden.digests` is identical at every commit of the cut.
+
+Two questions the clock asks are joins, so no one partition's index answers them
+(a `Docs` projection is a pure function of one document). Whether a dependency is
+failing joins `dependencies` with `edges`, `holdings` and `positions`, and two of
+its arms are anti-joins (a resource not held, a subject not placed); whether a due
+commitment is live joins `commitments` with `subjects.retired`. `views.rs` owns
+both as `Views { live_due, failing }`: `live_due` is the subjects with a
+commitment due at each minute, retired subjects excluded, and `failing` is the
+(dependent, target) pairs failing a live dependent.
+
+`Views` is derived state, a sibling of the `Docs` indexes and not a projection: a
+field of `WorldState` outside `partitions()`, so not digested, not encoded and
+never exported; its `PartialEq` is always true, so equality is the documents'.
+Its one writer is `Views::fold`, called by `WorldState::finish` before the logs
+close, from the `changes()` of the six partitions the views join. A subject whose
+commitments or retirement changed loses its due points and regains them if it is
+live; a subject whose dependencies, holdings or retirement changed has its
+failing rows re-judged; a changed route or placement re-judges its dependents,
+which the new `DependsOn` index on `dependencies` names. Rollback never touches
+it, because the view never saw the transaction; genesis and every replayed
+commit close through the same `finish`, so open rebuilds it by replay.
+
+`derive_motion` reads the views only with clean logs (`debug_assert` on the six
+partitions; both callers satisfy it: `reduce`, and `apply_effect`'s
+`TimeAdvanced` arm before its first write). `DueAt` is deleted, so the due
+question has one owner, and `motion_of` no longer walks every dependency row or
+visits retired subjects' past-due routines. Motion is byte-identical. The old
+walks are `cfg(test)`: `derive_motion_by_scan` over every promisor and every
+dependency, and `Views::rebuild`. A test that forges partitions and then calls
+`derive_motion` must close its writes through `finish`; a forged state that never
+finishes has a stale view by design, the same contract as a `Docs` index.
+
+Oracles: `views_are_derived` (the view is the rebuild after every walked commit,
+reopen and failed apply, over a scenario world that closes and reopens a route,
+empties and refills a holding, removes a depended-on subject's position, releases
+a dependency and retires a subject holding past-due routines and a failing
+dependency), `view_reads_equal_reference_scans`, `a_corrupted_view_is_detected`
+and a debug refusal of a read with an open log. View reads are counted where they
+are owned, like `Docs` reads, so the gate sees them.
+
+The gate world grows with them: a dependency per person (to the previous live
+person, so each stays satisfied), two failing (persons 0 and 1 on the last
+place's grain), a forum per place, every routine checking that its person holds
+their place's grain, every tenth person from the 35th retired, and the clock
+moved one period so every routine is past due. The fixed-count pins on
+`dependencies` and `redress` are gone; `read_work_is_equal_at_100_and_1600` now
+asserts the population at scale.
+
+Soul pass 1 (fix batch). The fold's moved-targets arm reads the dependencies
+`DependsOn` index through `Docs::indexed_unchanged`, which names the committed
+entries of keys the open log did not change and does not walk the log; a changed
+dependencies key is already re-judged whole, so a bulk commit (genesis, every
+replayed commit at open) folds in rows proportional to what it changed
+(`folding_a_bulk_commit_reads_rows_in_proportion_to_the_change`). The clean-log
+check on a view read is an `assert!`, not a `debug_assert!`: six flag tests, held
+in every build. `Release` now clears the pressure its dependency raised through
+`set_pressure`; before, a pressed dependency's pressure row outlived it and the
+export failed to reopen (pre-existing at `609b3ba5e`). A seeded differential test
+(`views_equal_their_rebuild_and_the_scans_over_random_commands`) holds the views
+to their rebuild and the motion to the scans over random bind, release, route,
+holding, relocate, retire, tick, speech and refused commands, reopening every 50.
+
+Not defended by the gate, on purpose: a tick's cost is linear in the number of
+failing dependencies, because each failing dependency presses a pressure row each
+tick. The gate world pins failing at two, so growth in failing is not seen; that
+cost is inherent to pressing and is not a read of the world. `open` of a large
+world is superlinear in rows from readers outside this cut (the resolver's reads
+of the whole world at genesis, owner `aetherlight-resolver-reads-world`);
+`open_cost` reports it.
+
+## Cut AL3d-1: the patch lane reads what the patch touches
+
+Authority: cut `aetherlight-resolver-reads-world` r1 of campaign
+`aetheria-release`; rulings `cultnet-scale-is-not-negotiable`,
+`aetherlight-narrative-state-owner`, `terminus-clockwork-world`,
+`dialogue-is-world-action`. Base `609b3ba5e`. No digested byte moves:
+`fixtures/golden.digests` is identical at every commit of the cut.
+
+`resolve_patch` used to seed fifteen candidate maps by copying every partition,
+collect every catalog kind and every subject's import key into sets, and re-judge
+every holder for overlap after each widening operation. Its reads grew with the
+world: 936, 3696 and 14736 rows for one `DischargeCommitment` at 100, 400 and 1600
+persons, and 14,000 or more for every other shape. It now reads what the patch
+touches.
+
+`patch/candidate.rs` owns the candidate graph of one resolution. Each candidate map
+is an `Overlay`: the committed partition read through a base function (a point get;
+a `Key::Draft` key has none), and the patch's writes in a local map. `Candidate`
+holds the fifteen overlays and the named reads, each bounded by what the patch
+wrote plus what it returns: `occupants_under` (`under_place` over `ChildOf` and
+`StandsAt`, corrected by the written positions), `offices_of` and `offices_held_by`
+(the committed row or `ByIncumbent`, corrected by the written offices), `kind_taken`
+(`ByKind` on the catalog) and `import_key_held` (`ByImportKey` on the subjects),
+`custody` (the sums over the written holders only: every other holder is on both
+sides of the equation and cancels). `authority`, `selection` and `retired` are
+private to the module: a write goes through `set_grants`, `set_office` or `retire`,
+which re-judge the holders whose effective authority it can change (the holder and
+an institution's incumbents; an office's old and new incumbent) and keep
+`overlapping`, the set of holders with two grants of one kind over overlapping
+ground. A widening operation is `OverlappingJurisdiction` exactly when the set is
+non-empty. That is what `graph_overlaps` answered, because the committed world is
+disjoint (every commit checks it and opening a world verifies it), so only a holder
+the patch touched can enter the set. The mismatch list is unchanged, including the
+later widening operations after a first overlap and a revoke that clears it
+(`overlap_mismatches_are_unchanged`). The candidate lives for one `resolve_patch`
+call and is never written back; `admit_resolved` stays the only writer of the
+ontology partitions.
+
+`apply_operations` derives its two checks from the transaction's log. Conservation
+sums the holders `holdings` logged as changed, each from its value when the
+operations began (so a holder already written by the declarations above it is
+measured from there). Disjointness judges only the holders whose grants, offices or
+institution the transaction touched, through `holder_overlaps`, which
+`overlapping_holder` also calls for the open-time whole-world check
+(`verify_state_shape`, whole-world on purpose). `resource_total` survives only as
+the test reference `resource_total_by_scan`.
+
+Two partitions gained read indexes, `subjects` by `ByImportKey` and
+`affordance_catalog` by `ByKind`, so `held_import_keys` and the per-patch kind set
+are gone and `import_key_fault` asks a predicate.
+
+The seeding block, `graph_overlaps`, the old effective-authority walk and
+`key_covers_place` live on only as `cfg(test)` references (`Materialized`, whose
+`seeded` is the old block verbatim). `candidate_reads_equal_materialized_scans`
+walks a civic world through the shapes that move each read (a subject leaving and
+entering a subtree, a declared place and subject, a retirement, a vacated and
+refilled office, an overlapping grant and its revocation, the retirement of the
+lending institution, a declared institution, custody written both ways) and holds
+every named read and the overlap set to the scan after every step;
+`an_untouched_overlay_reads_what_the_seeding_copied` holds every base function to
+the copy in each populated world. The gate is
+`golden_tests::patch_read_work_is_equal_at_100_and_1600`: ten patch shapes through
+`AdmitPatch` read the same rows at 100, 400 and 1600 persons (at most 21 each),
+and `apply_checks_read_the_log` pins the commit lane's two checks. The
+`DischargeCommitment` case of `operation_reads_are_equal_at_100_and_1600`, which
+called `apply_operation` directly, moved into the gate.
+
+Reads that still scan: `snapshot` (follow-up `aetherlight-snapshot-history-fold`)
+and `verify_state_shape` at open, by design.
+
+Fix batch (verdict s1). `apply_operations` sums the union of the holders written at
+entry and the holders the log reports, so a holder written before the operations and
+restored to its start value still counts. Three missed mutants were not equivalent
+and are pinned by `golden_tests::within_one_patch`; `random_patch_sequences_agree_with_the_scan_references`
+runs seeded random patches through the kernel and holds resolver, apply and the scan
+references to one answer. The retirement-flip clause of `touched_holders` is gone
+(a retirement only removes lent authority). Accepted, not fixed
+(`counter-blind-sizes`): the read gates count rows through the counted API, which
+point reads bypass by design, and wire patches are capped at 128 operations
+(`MAX_PATCH_OPERATIONS`), so the flat-read gates measure patches no larger than that;
+nothing measures a patch whose operation count grows with the world.
diff --git a/native/aetherlight/fixtures/golden.digests b/native/aetherlight/fixtures/golden.digests
new file mode 100644
index 000000000..cd2c826c8
--- /dev/null
+++ b/native/aetherlight/fixtures/golden.digests
@@ -0,0 +1,10 @@
+0 sha256:2ca3c099943ec537cd4dad9eef0b79b7368daa5b2dbd93baac0cb57cba3dcabe sha256:a94b938beddc671d28803581c9c3711fc520603f2dc8ac192b7cb54e73b3ff14
+1 sha256:cc421710aaa5d92b07abe0d7c4d0506fd6f9b66d1c806e863942e8a0113c7620 sha256:1abfc74079a3894ad21923f6d195f5e067adf58c5806f6cfc6bf08094f72ce9f
+2 sha256:c2c2c2631caa85f9a0721778a7a05515a6687dda65af71f916a6565314f20f1b sha256:58a46e1def214cba12ed5d6ba1e991fa43d6927f6467fe10c276c0bc5ec38691
+3 sha256:5326e779106a076a35b26deb2d1116813accd9c8ad7da32569d240d4631de85c sha256:1cb8fd189c2c64c7ebf8708ae7db856b020b156c5660ac9178a27b50421ddbd4
+4 sha256:8b6e54464a24af395e8f5c0149aab8993355fa79994c09c4be53eabc5688d23a sha256:c78021e910c535f333fa4fdf97742a1329c5eb788b874c5c6302613abeef639b
+5 sha256:78af2b889c301251919c6d68cf397d2befdf9b4fc012d73887c7d56894e86ecf sha256:3ab475b3e27f2e4d0afabd973ff69fff3523182216aa1f4ff3331de1747e1482
+6 sha256:2ce1eee99f2a650d9ef212ec04c2042b5e63005c5c263063d4e53b79d7ba7214 sha256:575b25743bc6d1673a71d9d0dc7be3825bec261f485bae13984065028601fb98
+7 sha256:fd5454f623359764bb4afaae6305a9ca41bca8670c36fd1f4f1c38779add4aa4 sha256:ba97a6d5c09e018c6abe91f782ab8bc5e618d0d8a45ac22cb637f40ad01755ef
+8 sha256:7762f695b8205cba054d957e9a9242399320683d6d34c30ee9612dc89844ff2f sha256:b531e0d1afdb4f11033fc19e5280f7b46fc2b27911194e5c34dcbe8d57fae10e
+export sha256:ef186452fd00de5b85a44e4a623489264e649810ab95847a45f25d82a0ae36fd
diff --git a/native/aetherlight/src/action.rs b/native/aetherlight/src/action.rs
new file mode 100644
index 000000000..4d3b3edad
--- /dev/null
+++ b/native/aetherlight/src/action.rs
@@ -0,0 +1,2762 @@
+//! The invocation pipeline: catalog lookup, role binding, precondition
+//! evaluation, effect-ceiling checking, band selection, and lowering.
+//!
+//! One entry point, [`exercise`], reached from `reduce`'s `Act` arm
+//! and from `apply_effect`'s `Acted` arm, so a forged effect is
+//! re-derived by the same function that produced the honest one. Nothing else
+//! draws a band, and the draw goes through the one `digest()` owner.
+
+use super::patch::{
+ self, Affordance, Audience, AudienceSpec, BoundPrecondition, Bounds, ComponentOpKind, Cost,
+ Precondition, Quantity, RefKind, Role, WorldPatch,
+};
+use super::{
+ AffordanceId, AuthorityGrant, AuthorityTarget, CommandId, DecisionEvent, DecisionInvocation,
+ EdgeId, EntityId, EventId, FictionalMinutes, GrantedAffordance,
+ KernelError, Magnitude, SubjectId, Target, WorldId, WorldState, digest,
+};
+use serde::Serialize;
+use std::collections::{BTreeMap, BTreeSet};
+
+/// The complete failure set of one affordance invocation. Sorted and complete
+/// like `Mismatch`, and like it never serialized: it states the affordance
+/// contract, which no commit records.
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum ActionMismatch {
+ UnboundRole {
+ role: Role,
+ },
+ UnknownRole {
+ role: Role,
+ },
+ DuplicateRoleBinding {
+ role: Role,
+ },
+ UnknownTarget {
+ role: Role,
+ },
+ TargetKindMismatch {
+ role: Role,
+ expected: RefKind,
+ actual: RefKind,
+ },
+ ActorNotPresent {
+ precondition: usize,
+ },
+ TargetUnreachable {
+ precondition: usize,
+ },
+ InsufficientHolding {
+ precondition: usize,
+ },
+ SlotNotProposed {
+ slot: usize,
+ },
+ UnknownSlot {
+ slot: usize,
+ },
+ DuplicateSlotProposal {
+ slot: usize,
+ },
+ MagnitudeShapeMismatch {
+ slot: usize,
+ },
+ MagnitudeOverCeiling {
+ slot: usize,
+ },
+ ZeroMagnitude {
+ slot: usize,
+ },
+ SpeechRequired,
+ SpeechNotCarried,
+ EmptySpeech,
+ EmptyDisplay,
+ /// The acting subject's effective authority covers no such target under
+ /// this kind. A target that walked out of the jurisdiction while the
+ /// proposal was in flight arrives here: what the actor is authorized over
+ /// is in its scope, the world it reaches is not.
+ NotAuthorized {
+ precondition: usize,
+ },
+ /// No forum takes this grievance, or its standing does not reach the actor.
+ NoStanding {
+ precondition: usize,
+ },
+ /// An invocation bound the reserved `actor` role.
+ ActorRoleBound,
+ /// A slot would grant authority the acting subject does not itself hold
+ /// over that ground. Without this, any holder mints unlimited authority in
+ /// one step and the whole component is decorative.
+ DelegationNotMonotone {
+ slot: usize,
+ },
+ /// The actor does not hold the bound fact at the required confidence. A
+ /// re-appraisal that lowered its own confidence while the proposal was in
+ /// flight arrives here: confidence is admission-only.
+ FactUnknown {
+ precondition: usize,
+ },
+ /// The actor has no audience at all: unplaced for co-location, or outside a
+ /// channel it does not control.
+ NoAudience {
+ precondition: usize,
+ },
+ /// The addressed subject is not inside that audience. A target that walked
+ /// out of the room while the proposal was in flight arrives here: the
+ /// preimage holds what the actor *is*, not the world it reaches.
+ CannotReach {
+ precondition: usize,
+ },
+ /// The actor holds no commitment of that kind to the bound referent.
+ NotCommitted {
+ precondition: usize,
+ },
+}
+
+/// The band draw's whole preimage. Five fields. `command_id` is derived from
+/// the world, the expected revision, the caller and the whole body, so the
+/// payload does reach the draw through it: changing the speech or display text,
+/// a magnitude or the revision re-rolls the band, and a proposer who can vary
+/// those can grind for a band. That is not an authority hole: only Play submits
+/// an act after genesis, and Play is trusted. `affordance` is the id carried by
+/// the kernel-verified grant, so the draw cannot be steered by an affordance the
+/// actor does not hold.
+#[derive(Serialize)]
+struct BandPreimage {
+ world_id: WorldId,
+ revision: u64,
+ command_id: CommandId,
+ affordance: AffordanceId,
+ band_count: usize,
+}
+
+/// Catalog lookup, binding, admission, draw, lowering, event. Stages 1 through 4
+/// accumulate one complete rejection set and return it sorted before anything is
+/// drawn or lowered, so nothing past the gate can fail on caller input.
+///
+/// The entry arrives as a [`GrantedAffordance`], which only `require_granted`
+/// can build: the grant check is the type, not a call a third caller might
+/// forget. Nothing here reads `invocation.affordance`.
+pub(super) fn exercise(
+ state: &WorldState,
+ command_id: CommandId,
+ actor: SubjectId,
+ granted: &GrantedAffordance<'_>,
+ invocation: &DecisionInvocation,
+) -> Result {
+ let entry = granted.entry;
+ let mut rejections = Vec::new();
+
+ let components = super::scope_components(state, actor);
+ let authority = super::effective_authority(&components.authority, &components.delegated);
+ let bindings = bind_roles(state, actor, entry, invocation, &mut rejections);
+ check_preconditions(state, actor, &authority, entry, &bindings, &mut rejections);
+ check_proposals(entry, invocation, &mut rejections);
+ check_delegation(state, &authority, entry, &bindings, &mut rejections);
+
+ if !rejections.is_empty() {
+ rejections.sort();
+ return Err(KernelError::ActionRejected(rejections));
+ }
+
+ let band = select_band(state, command_id, granted.id, entry)?;
+ let operations = lower(entry, band, actor, state.header.now, invocation, &bindings)?;
+ let mut effects = if operations.is_empty() {
+ Vec::new()
+ } else {
+ // The same resolver, the same per-operation preconditions, the same
+ // conservation equation the declaration lane passes.
+ patch::resolve_patch(
+ state,
+ command_id,
+ &WorldPatch {
+ declarations: Vec::new(),
+ operations,
+ evidence: Vec::new(),
+ },
+ )
+ .map_err(KernelError::PatchRejected)?
+ .operations
+ };
+
+ // The speech lowering: kernel-owned, not a slot, and unreachable by any
+ // proposer, band, or effect ceiling. The audience comes from the entry's one
+ // speech precondition, so a world's `whisper` and `proclaim` lower through
+ // the same two operations with a different audience and the kernel learns no
+ // genre. Addressing does not narrow the fan-out: a voice fills its audience.
+ let speech = match (&invocation.speech, entry.carries_speech) {
+ (Some(statement), true) => {
+ let fact = EntityId(patch::derive_id(
+ patch::ENTITY_NAMESPACE,
+ state.header.world_id,
+ command_id,
+ &patch::DraftHandle::new(SPEECH_HANDLE),
+ Some(SPEECH_INDEX),
+ ));
+ let to = speech_audience(entry, &bindings)?;
+ effects.splice(
+ 0..0,
+ [
+ patch::ResolvedOp::AssertClaim {
+ fact,
+ statement: statement.clone(),
+ by: actor,
+ },
+ patch::ResolvedOp::Communicate {
+ speaker: actor,
+ fact,
+ to,
+ },
+ ],
+ );
+ Some(fact)
+ }
+ _ => None,
+ };
+ // The display lowering: the same standing as speech, from the same
+ // allocation site under the second discriminator. It needs no entry
+ // field and reads no audience precondition: a body is visible to the room
+ // whatever the entry addresses, so `proclaim` down a horn still shrugs at
+ // whoever stands beside the speaker.
+ let display = invocation.display.as_ref().map(|statement| {
+ let fact = EntityId(patch::derive_id(
+ patch::ENTITY_NAMESPACE,
+ state.header.world_id,
+ command_id,
+ &patch::DraftHandle::new(SPEECH_HANDLE),
+ Some(DISPLAY_INDEX),
+ ));
+ let at = usize::from(speech.is_some()) * 2;
+ effects.splice(
+ at..at,
+ [
+ patch::ResolvedOp::AssertClaim {
+ fact,
+ statement: statement.clone(),
+ by: actor,
+ },
+ patch::ResolvedOp::Display { actor, fact },
+ ],
+ );
+ fact
+ });
+
+ let revision = super::resolution_revision(state)?;
+ Ok(DecisionEvent {
+ id: EventId::for_command(command_id),
+ revision,
+ actor,
+ affordance: granted.id,
+ speech,
+ display,
+ band,
+ effects,
+ })
+}
+
+/// The synthetic handle every minted claim allocates under. It is synthesized
+/// in an act, which declares nothing, so no world-declared handle can collide
+/// with it.
+const SPEECH_HANDLE: &str = "ghostlight.speech";
+
+/// The speech index, passed as `derive_id`'s discriminator. It is `0` for every
+/// invocation because one invocation carries one utterance; it exists so a
+/// second minted claim needs no second allocation idiom.
+const SPEECH_INDEX: &str = "0";
+
+/// The display index: the second claim one invocation may mint, under the
+/// same handle and allocation site as speech.
+const DISPLAY_INDEX: &str = "1";
+
+/// The audience a speech-carrying entry names. The declaration validator already
+/// refused an entry with none (`SpeechWithoutAudience`) or two
+/// (`AmbiguousSpeechAudience`), so anything else here is a corrupt catalog.
+fn speech_audience(
+ entry: &Affordance,
+ bindings: &BTreeMap,
+) -> Result {
+ entry
+ .preconditions
+ .iter()
+ .find_map(|precondition| match precondition {
+ Precondition::CanBroadcast { via } | Precondition::CanReach { via, .. } => {
+ bound_audience(via, bindings)
+ }
+ _ => None,
+ })
+ .ok_or_else(|| KernelError::Invariant("a speech-carrying entry names no audience".into()))
+}
+
+/// Stage 2. The acting subject is never a declared role: the kernel binds the
+/// reserved name `actor` to it and refuses an invocation that tries to. A
+/// binding that happens to name the actor through a declared role is legal and
+/// unremarkable.
+fn bind_roles(
+ state: &WorldState,
+ actor: SubjectId,
+ entry: &Affordance,
+ invocation: &DecisionInvocation,
+ rejections: &mut Vec,
+) -> BTreeMap {
+ let declared: BTreeMap<&Role, RefKind> = entry
+ .roles
+ .iter()
+ .map(|spec| (&spec.role, spec.kind))
+ .collect();
+ let mut bound: BTreeMap = BTreeMap::new();
+ let mut seen: BTreeSet<&Role> = BTreeSet::new();
+ for binding in &invocation.bindings {
+ if binding.role.0 == patch::ACTOR_ROLE {
+ rejections.push(ActionMismatch::ActorRoleBound);
+ continue;
+ }
+ if !seen.insert(&binding.role) {
+ rejections.push(ActionMismatch::DuplicateRoleBinding {
+ role: binding.role.clone(),
+ });
+ continue;
+ }
+ let Some(expected) = declared.get(&binding.role).copied() else {
+ rejections.push(ActionMismatch::UnknownRole {
+ role: binding.role.clone(),
+ });
+ continue;
+ };
+ let Some(actual) = live_kind(state, binding.target) else {
+ rejections.push(ActionMismatch::UnknownTarget {
+ role: binding.role.clone(),
+ });
+ continue;
+ };
+ let fits = match (expected, actual) {
+ (RefKind::Subject(None), RefKind::Subject(_)) => true,
+ (expected, actual) => expected == actual,
+ };
+ if fits {
+ bound.insert(binding.role.clone(), binding.target);
+ } else {
+ rejections.push(ActionMismatch::TargetKindMismatch {
+ role: binding.role.clone(),
+ expected,
+ actual,
+ });
+ }
+ }
+ for spec in &entry.roles {
+ if !seen.contains(&spec.role) {
+ rejections.push(ActionMismatch::UnboundRole {
+ role: spec.role.clone(),
+ });
+ }
+ }
+ // The kernel's own binding, added after the caller's so nothing can shadow
+ // it: a slot that must land on the actor says `actor` and the proposer has
+ // no say. Without it, a levy's `Transfer` would need the proposer to name
+ // the payee, and an authorized collector could lawfully take a tax and send
+ // it to a friend.
+ bound.insert(Role(patch::ACTOR_ROLE.into()), Target::Subject(actor));
+ bound
+}
+
+/// What a target actually is in committed state. `None` means the target keys no
+/// live partition in its namespace.
+fn live_kind(state: &WorldState, target: Target) -> Option {
+ match target {
+ Target::Subject(subject_id) => state
+ .subjects
+ .get(&subject_id)
+ .map(|subject| RefKind::Subject(Some(subject.kind))),
+ Target::Entity(entity_id) => state
+ .entities
+ .get(&entity_id)
+ .map(|record| RefKind::Entity(record.kind)),
+ Target::Edge(edge_id) => state
+ .edges
+ .get(&edge_id)
+ .map(|_| RefKind::Edge(patch::EdgeKind::Route)),
+ }
+}
+
+/// Stage 3, in declaration order, each failure carrying its index so a test can
+/// name the exact precondition that refused. Role binding is this caller's job:
+/// each declared `Precondition` is lowered through stage 2's bindings into a
+/// `BoundPrecondition` and handed to the one evaluator. A precondition whose
+/// role stage 2 left unbound is skipped here, because stage 2 already named it.
+fn check_preconditions(
+ state: &WorldState,
+ actor: SubjectId,
+ authority: &BTreeSet,
+ entry: &Affordance,
+ bindings: &BTreeMap,
+ rejections: &mut Vec,
+) {
+ for (index, precondition) in entry.preconditions.iter().enumerate() {
+ let Some(bound) = bind_precondition(precondition, bindings) else {
+ continue;
+ };
+ if let Some(mismatch) = evaluate(state, actor, authority, index, &bound) {
+ rejections.push(mismatch);
+ }
+ }
+}
+
+/// The catalog's role indirection lowered to canonical referents. `None` means
+/// a role is unbound or bound to the wrong namespace, which stage 2 named.
+fn bind_precondition(
+ precondition: &Precondition,
+ bindings: &BTreeMap,
+) -> Option {
+ let place = |role: &Role| match bindings.get(role)? {
+ Target::Entity(entity_id) => Some(*entity_id),
+ _ => None,
+ };
+ Some(match precondition {
+ Precondition::Present { at } => BoundPrecondition::Present { at: place(at)? },
+ Precondition::Reachable { to, within } => BoundPrecondition::Reachable {
+ to: place(to)?,
+ within: *within,
+ },
+ Precondition::Holds { resource, at_least } => BoundPrecondition::Holds {
+ resource: place(resource)?,
+ at_least: *at_least,
+ },
+ Precondition::Authorized { over, kind } => BoundPrecondition::Authorized {
+ over: bindings.get(over).copied()?,
+ kind: kind.clone(),
+ },
+ Precondition::HasStanding { grievance } => BoundPrecondition::HasStanding {
+ grievance: grievance.clone(),
+ },
+ Precondition::Knows { fact, at_least } => BoundPrecondition::Knows {
+ fact: place(fact)?,
+ at_least: *at_least,
+ },
+ Precondition::CanBroadcast { via } => BoundPrecondition::CanBroadcast {
+ via: bound_audience(via, bindings)?,
+ },
+ Precondition::CanReach { subject, via } => BoundPrecondition::CanReach {
+ subject: match bindings.get(subject)? {
+ Target::Subject(subject_id) => *subject_id,
+ _ => return None,
+ },
+ via: bound_audience(via, bindings)?,
+ },
+ Precondition::Committed { to, kind } => BoundPrecondition::Committed {
+ to: match bindings.get(to)? {
+ Target::Subject(subject_id) => *subject_id,
+ _ => return None,
+ },
+ kind: *kind,
+ },
+ })
+}
+
+/// The one precondition reader, over referents that are already canonical.
+/// Returns the complete set in declaration order; an empty set is "all hold".
+/// The tick reads only its emptiness — an `ActionMismatch` never surfaces to
+/// anyone from there.
+pub(super) fn preconditions_hold(
+ state: &WorldState,
+ actor: SubjectId,
+ checks: &[BoundPrecondition],
+) -> Vec {
+ let components = super::scope_components(state, actor);
+ let authority = super::effective_authority(&components.authority, &components.delegated);
+ checks
+ .iter()
+ .enumerate()
+ .filter_map(|(index, check)| evaluate(state, actor, &authority, index, check))
+ .collect()
+}
+
+/// One check against committed state. `index` is the position within the slice
+/// the caller passed in, which is what every `precondition: usize` means.
+fn evaluate(
+ state: &WorldState,
+ actor: SubjectId,
+ authority: &BTreeSet,
+ index: usize,
+ check: &BoundPrecondition,
+) -> Option {
+ let holds = match check {
+ BoundPrecondition::Present { at } => {
+ return (state.positions.get(&actor).map(|position| position.place) != Some(*at))
+ .then_some(ActionMismatch::ActorNotPresent {
+ precondition: index,
+ });
+ }
+ BoundPrecondition::Reachable { to, within } => {
+ return (!reachable(state, actor, authority, *to, *within)).then_some(
+ ActionMismatch::TargetUnreachable {
+ precondition: index,
+ },
+ );
+ }
+ BoundPrecondition::Holds { resource, at_least } => {
+ state
+ .holdings
+ .get(&actor)
+ .and_then(|held| held.get(resource))
+ .map_or(0, |quantity| quantity.0)
+ >= at_least.0
+ }
+ BoundPrecondition::Authorized { over, kind } => {
+ return (!authority
+ .iter()
+ .any(|grant| &grant.kind == kind && super::covers(state, grant.over, *over)))
+ .then_some(ActionMismatch::NotAuthorized {
+ precondition: index,
+ });
+ }
+ BoundPrecondition::HasStanding { grievance } => {
+ return (!state.redress.get(grievance).is_some_and(|forum| {
+ super::covers(state, forum.standing, Target::Subject(actor))
+ }))
+ .then_some(ActionMismatch::NoStanding {
+ precondition: index,
+ });
+ }
+ BoundPrecondition::Knows { fact, at_least } => {
+ return (!state
+ .knowledge
+ .get(&(actor, *fact))
+ .is_some_and(|held| held.confidence >= *at_least))
+ .then_some(ActionMismatch::FactUnknown {
+ precondition: index,
+ });
+ }
+ BoundPrecondition::CanBroadcast { via } => {
+ return (!super::can_broadcast(state, actor, via)).then_some(
+ ActionMismatch::NoAudience {
+ precondition: index,
+ },
+ );
+ }
+ BoundPrecondition::CanReach { subject, via } => {
+ return (!super::audience(state, actor, via).contains(subject)).then_some(
+ ActionMismatch::CannotReach {
+ precondition: index,
+ },
+ );
+ }
+ // A linear scan of one subject's own small map. No key lookup is needed
+ // and none is offered, which is why a `CommitmentKey` never has to be
+ // guessable.
+ BoundPrecondition::Committed { to, kind } => {
+ return (!state.commitments.get(&actor).is_some_and(|held| {
+ held.values().any(|commitment| {
+ commitment.counterparty == Some(*to) && commitment.kind == *kind
+ })
+ }))
+ .then_some(ActionMismatch::NotCommitted {
+ precondition: index,
+ });
+ }
+ };
+ (!holds).then_some(ActionMismatch::InsufficientHolding {
+ precondition: index,
+ })
+}
+
+/// The catalog's role indirection lowered to the canonical audience: the entry
+/// names a role, the invoker binds a channel to it, and every reader of reach
+/// sees one shape. `None` means the role is unbound, which stage 2 already named.
+fn bound_audience(via: &AudienceSpec, bindings: &BTreeMap) -> Option {
+ match via {
+ AudienceSpec::Colocated => Some(Audience::Colocated),
+ AudienceSpec::Channel(role) => match bindings.get(role).copied() {
+ Some(Target::Entity(entity_id)) => Some(Audience::Channel(entity_id)),
+ _ => None,
+ },
+ }
+}
+
+/// Stage 4, beside the ceilings: an authority a slot would grant or revoke
+/// must not exceed the actor's own. For a grant this is the monotonicity
+/// envelope — no holder mints authority it does not itself hold. For a
+/// revocation it is the same envelope read the other way: an actor may not
+/// strip ground it holds no jurisdiction over, so revocation is not a lever
+/// for reaching past one's own authority. Every slot is checked, not just the
+/// drawn band's, for the same reason every ceiling is — the proposer commits
+/// to a complete attempt and cannot see the band.
+///
+/// The rule is action-lane only, and that is not two truths. The patch lane's
+/// `GrantAuthority`/`RevokeAuthority` is admitted for Play;
+/// monotonicity *is* the action lane's authority envelope, and both lanes
+/// reach one `apply_operation` with the identical mutation.
+fn check_delegation(
+ state: &WorldState,
+ authority: &BTreeSet,
+ entry: &Affordance,
+ bindings: &BTreeMap,
+ rejections: &mut Vec,
+) {
+ for (index, slot) in entry.effect_slots.iter().enumerate() {
+ let kind = match &slot.op_kind {
+ ComponentOpKind::GrantAuthority { kind }
+ | ComponentOpKind::RevokeAuthority { kind } => kind,
+ _ => continue,
+ };
+ let Some(over) = slot
+ .roles
+ .get(1)
+ .and_then(|role| bindings.get(role))
+ .copied()
+ .and_then(authority_target_of)
+ else {
+ continue;
+ };
+ if !authority.iter().any(|grant| {
+ &grant.kind == kind && super::covers(state, grant.over, over.as_referent())
+ }) {
+ rejections.push(ActionMismatch::DelegationNotMonotone { slot: index });
+ }
+ }
+}
+
+/// The authority target a bound referent names. A route is jurisdictional
+/// ground but never a grant's target, so a slot bound to one lowers to nothing.
+fn authority_target_of(target: Target) -> Option {
+ match target {
+ Target::Subject(subject_id) => Some(AuthorityTarget::Subject(subject_id)),
+ Target::Entity(entity_id) => Some(AuthorityTarget::PlaceSubtree(entity_id)),
+ Target::Edge(_) => None,
+ }
+}
+
+/// Dijkstra over the live route graph, admitting the open routes this subject
+/// may traverse — the same `route_admits` rule the resolver applies to a
+/// `Relocate`, so a subject with the right authority can plan a path through
+/// its own restricted ground — and
+/// relaxing in `EdgeId` order, pruning any path whose accumulated cost exceeds
+/// `within`. Cost 0 — already standing there — succeeds; `Present` is the strict
+/// form. An unplaced actor reaches nothing.
+///
+/// Admission runs at commit against live state, so a route that closed while
+/// the proposal was in flight makes this fail rather than letting a stale path
+/// commit.
+pub(super) fn reachable(
+ state: &WorldState,
+ actor: SubjectId,
+ authority: &BTreeSet,
+ destination: EntityId,
+ within: Cost,
+) -> bool {
+ reach(state, actor, authority, destination, within, |place| {
+ state
+ .edges
+ .indexed(place..=place)
+ .into_iter()
+ .map(|(_, edge_id)| edge_id)
+ .collect()
+ })
+}
+
+/// What `reachable` was before the index: every edge asked at every settled place.
+#[cfg(test)]
+pub(super) fn reachable_by_scan(
+ state: &WorldState,
+ actor: SubjectId,
+ authority: &BTreeSet,
+ destination: EntityId,
+ within: Cost,
+) -> bool {
+ reach(state, actor, authority, destination, within, |place| {
+ state
+ .edges
+ .iter()
+ .filter(|(_, record)| {
+ let (from, to) = record.endpoints();
+ from == place || to == place
+ })
+ .map(|(edge_id, _)| *edge_id)
+ .collect()
+ })
+}
+
+/// The search, given how the routes touching a place are found, in `EdgeId`
+/// order.
+fn reach(
+ state: &WorldState,
+ actor: SubjectId,
+ authority: &BTreeSet,
+ destination: EntityId,
+ within: Cost,
+ routes_at: impl Fn(EntityId) -> Vec,
+) -> bool {
+ let Some(origin) = state.positions.get(&actor).map(|position| position.place) else {
+ return false;
+ };
+ let mut best: BTreeMap = BTreeMap::from([(origin, 0)]);
+ let mut settled: BTreeSet = BTreeSet::new();
+ let ceiling = u64::from(within.0);
+ loop {
+ let Some((place, cost)) = best
+ .iter()
+ .filter(|(place, _)| !settled.contains(place))
+ .min_by_key(|(place, cost)| (**cost, **place))
+ .map(|(place, cost)| (*place, *cost))
+ else {
+ return false;
+ };
+ if place == destination {
+ return true;
+ }
+ settled.insert(place);
+ let outbound: Vec<(EdgeId, EntityId, u64)> = routes_at(place)
+ .into_iter()
+ .map(|edge_id| (edge_id, &state.edges[&edge_id]))
+ .filter(|(_, record)| record.is_open())
+ .filter_map(|(edge_id, record)| {
+ let (from, to) = record.endpoints();
+ let next = if from == place {
+ to
+ } else if to == place {
+ from
+ } else {
+ return None;
+ };
+ patch::route_admits(state, authority, record.access(), next)
+ .then(|| (edge_id, next, u64::from(record.cost().0)))
+ })
+ .collect();
+ for (_, next, step) in outbound {
+ let total = cost + step;
+ if total <= ceiling && best.get(&next).is_none_or(|known| total < *known) {
+ best.insert(next, total);
+ }
+ }
+ }
+}
+
+/// Stage 4. Every slot is checked, not just the ones the selected band names:
+/// the proposer cannot see the band, so it commits to a complete attempt, and
+/// checking every slot makes the ceiling total.
+fn check_proposals(
+ entry: &Affordance,
+ invocation: &DecisionInvocation,
+ rejections: &mut Vec,
+) {
+ let mut seen: BTreeSet = BTreeSet::new();
+ for proposed in &invocation.proposed {
+ if !seen.insert(proposed.slot) {
+ rejections.push(ActionMismatch::DuplicateSlotProposal {
+ slot: proposed.slot,
+ });
+ continue;
+ }
+ let Some(slot) = entry.effect_slots.get(proposed.slot) else {
+ rejections.push(ActionMismatch::UnknownSlot {
+ slot: proposed.slot,
+ });
+ continue;
+ };
+ match (slot.bounds, proposed.magnitude) {
+ (Bounds::None, Magnitude::None) => {}
+ (Bounds::Quantity(ceiling), Magnitude::Quantity(value)) => {
+ if value.0 == 0 {
+ rejections.push(ActionMismatch::ZeroMagnitude {
+ slot: proposed.slot,
+ });
+ } else if value.0 > ceiling.0 {
+ rejections.push(ActionMismatch::MagnitudeOverCeiling {
+ slot: proposed.slot,
+ });
+ }
+ }
+ (Bounds::Cost(ceiling), Magnitude::Cost(value)) => {
+ if value.0 == 0 {
+ rejections.push(ActionMismatch::ZeroMagnitude {
+ slot: proposed.slot,
+ });
+ } else if value.0 > ceiling.0 {
+ rejections.push(ActionMismatch::MagnitudeOverCeiling {
+ slot: proposed.slot,
+ });
+ }
+ }
+ _ => rejections.push(ActionMismatch::MagnitudeShapeMismatch {
+ slot: proposed.slot,
+ }),
+ }
+ }
+ for slot in 0..entry.effect_slots.len() {
+ if !seen.contains(&slot) {
+ rejections.push(ActionMismatch::SlotNotProposed { slot });
+ }
+ }
+ // `Statement` is serde-transparent, so a value that arrived through
+ // deserialization rather than through the constructor is re-checked here
+ // rather than trusted.
+ match (&invocation.speech, entry.carries_speech) {
+ // A speech-carrying entry addresses someone; a silent turn that only
+ // displays still addresses the room, so it is not `SpeechRequired`.
+ (None, true) if invocation.display.is_none() => {
+ rejections.push(ActionMismatch::SpeechRequired);
+ }
+ (Some(_), false) => rejections.push(ActionMismatch::SpeechNotCarried),
+ (Some(speech), true) if !patch::is_canonical_text(speech.as_str()) => {
+ rejections.push(ActionMismatch::EmptySpeech);
+ }
+ _ => {}
+ }
+ if invocation
+ .display
+ .as_ref()
+ .is_some_and(|display| !patch::is_canonical_text(display.as_str()))
+ {
+ rejections.push(ActionMismatch::EmptyDisplay);
+ }
+}
+
+/// The only entropy in the kernel: one digest, one modulo, one cumulative walk.
+/// Modulo rather than rejection sampling — the bias is bounded by
+/// `total_weight / 2^64`, and a rejection loop would need its counter in the
+/// preimage, which is a second entropy shape for a rounding error nobody can
+/// measure.
+fn select_band(
+ state: &WorldState,
+ command_id: CommandId,
+ affordance: AffordanceId,
+ entry: &Affordance,
+) -> Result {
+ let draw = digest(&BandPreimage {
+ world_id: state.header.world_id,
+ revision: state.revision,
+ command_id,
+ affordance,
+ band_count: entry.outcome_bands.len(),
+ })?;
+ let head = draw
+ .strip_prefix("sha256:")
+ .and_then(|hex| hex.get(..16))
+ .and_then(|head| u64::from_str_radix(head, 16).ok())
+ .ok_or_else(|| KernelError::Invariant("band draw digest is not hex".into()))?;
+ let total: u128 = entry
+ .outcome_bands
+ .iter()
+ .map(|band| u128::from(band.weight))
+ .sum();
+ if total == 0 {
+ return Err(KernelError::Invariant(
+ "affordance has no outcome band".into(),
+ ));
+ }
+ let mut position = u128::from(head) % total;
+ for (index, band) in entry.outcome_bands.iter().enumerate() {
+ let weight = u128::from(band.weight);
+ if position < weight {
+ return Ok(index);
+ }
+ position -= weight;
+ }
+ Err(KernelError::Invariant(
+ "band weights did not cover the draw".into(),
+ ))
+}
+
+/// Stage 7. One arm per `ComponentOpKind`, every referent read from the slot's
+/// roles resolved through the bindings, every magnitude from the proposal for
+/// that slot. An empty band lowers to nothing.
+fn lower(
+ entry: &Affordance,
+ band: usize,
+ actor: SubjectId,
+ now: FictionalMinutes,
+ invocation: &DecisionInvocation,
+ bindings: &BTreeMap,
+) -> Result, KernelError> {
+ let malformed = || KernelError::Invariant("admitted affordance slot is malformed".into());
+ let band = entry
+ .outcome_bands
+ .get(band)
+ .ok_or_else(|| KernelError::Invariant("selected band does not exist".into()))?;
+ let mut operations = Vec::new();
+ for slot_index in &band.effects {
+ let slot = entry.effect_slots.get(*slot_index).ok_or_else(malformed)?;
+ let magnitude = invocation
+ .proposed
+ .iter()
+ .find(|proposed| proposed.slot == *slot_index)
+ .map(|proposed| proposed.magnitude)
+ .ok_or_else(malformed)?;
+ let target = |position: usize| -> Result {
+ slot.roles
+ .get(position)
+ .and_then(|role| bindings.get(role))
+ .copied()
+ .ok_or_else(malformed)
+ };
+ let subject = |position: usize| -> Result, KernelError> {
+ match target(position)? {
+ Target::Subject(subject_id) => Ok(patch::Ref::Existing(subject_id)),
+ _ => Err(malformed()),
+ }
+ };
+ let entity = |position: usize| -> Result, KernelError> {
+ match target(position)? {
+ Target::Entity(entity_id) => Ok(patch::Ref::Existing(entity_id)),
+ _ => Err(malformed()),
+ }
+ };
+ let edge = |position: usize| -> Result, KernelError> {
+ match target(position)? {
+ Target::Edge(edge_id) => Ok(patch::Ref::Existing(edge_id)),
+ _ => Err(malformed()),
+ }
+ };
+ let quantity = || -> Result {
+ match magnitude {
+ Magnitude::Quantity(value) => Ok(value),
+ _ => Err(malformed()),
+ }
+ };
+ let dependency = |position: usize| -> Result {
+ Ok(match target(position)? {
+ Target::Subject(subject_id) => {
+ patch::DependencyRef::Subject(patch::Ref::Existing(subject_id))
+ }
+ Target::Entity(entity_id) => {
+ patch::DependencyRef::Resource(patch::Ref::Existing(entity_id))
+ }
+ Target::Edge(edge_id) => patch::DependencyRef::Route(patch::Ref::Existing(edge_id)),
+ })
+ };
+ let grant_over = |position: usize| -> Result {
+ Ok(match target(position)? {
+ Target::Subject(subject_id) => {
+ patch::AuthorityTargetRef::Subject(patch::Ref::Existing(subject_id))
+ }
+ Target::Entity(entity_id) => {
+ patch::AuthorityTargetRef::PlaceSubtree(patch::Ref::Existing(entity_id))
+ }
+ Target::Edge(_) => return Err(malformed()),
+ })
+ };
+ operations.push(match &slot.op_kind {
+ // `due` is computed here, so a proposer cannot set one, and the
+ // pressure source is the acting subject, so it cannot be forged.
+ ComponentOpKind::CreateCommitment {
+ kind,
+ horizon,
+ period,
+ } => patch::ComponentOp::CreateCommitment {
+ subject: subject(0)?,
+ counterparty: Some(subject(1)?),
+ kind: *kind,
+ due: now.checked_add(*horizon).ok_or_else(malformed)?,
+ period: *period,
+ checks: Vec::new(),
+ // The world named the action; that name is what was promised.
+ // A proposer cannot supply the text, so it cannot promise more
+ // than the affordance carries.
+ statement: patch::Statement::new(format!("a promise made through {}", entry.kind.0))
+ .ok_or_else(malformed)?,
+ },
+ ComponentOpKind::AdvancePressure { by } => patch::ComponentOp::AdvancePressure {
+ source: patch::PressureSourceRef::Subject(patch::Ref::Existing(actor)),
+ target: subject(0)?,
+ by: *by,
+ },
+ ComponentOpKind::ReducePressure { by } => patch::ComponentOp::ReducePressure {
+ source: patch::PressureSourceRef::Subject(patch::Ref::Existing(actor)),
+ target: subject(0)?,
+ by: *by,
+ },
+ ComponentOpKind::ResolvePressure => patch::ComponentOp::ResolvePressure {
+ source: patch::PressureSourceRef::Subject(patch::Ref::Existing(actor)),
+ target: subject(0)?,
+ },
+ ComponentOpKind::Relocate => patch::ComponentOp::Relocate {
+ subject: subject(0)?,
+ via: edge(1)?,
+ },
+ ComponentOpKind::OpenRoute => patch::ComponentOp::OpenRoute { route: edge(0)? },
+ ComponentOpKind::CloseRoute => patch::ComponentOp::CloseRoute { route: edge(0)? },
+ ComponentOpKind::AlterCost => patch::ComponentOp::AlterCost {
+ route: edge(0)?,
+ cost: match magnitude {
+ Magnitude::Cost(value) => value,
+ _ => return Err(malformed()),
+ },
+ },
+ ComponentOpKind::Transfer => patch::ComponentOp::Transfer {
+ from: subject(0)?,
+ to: subject(1)?,
+ resource: entity(2)?,
+ qty: quantity()?,
+ },
+ ComponentOpKind::Transform => patch::ComponentOp::Transform {
+ holder: subject(0)?,
+ from_resource: entity(1)?,
+ into_resource: entity(2)?,
+ qty: quantity()?,
+ },
+ ComponentOpKind::Consume => patch::ComponentOp::Consume {
+ holder: subject(0)?,
+ resource: entity(1)?,
+ qty: quantity()?,
+ },
+ ComponentOpKind::Bind => patch::ComponentOp::Bind {
+ subject: subject(0)?,
+ target: dependency(1)?,
+ },
+ ComponentOpKind::Release => patch::ComponentOp::Release {
+ subject: subject(0)?,
+ target: dependency(1)?,
+ },
+ ComponentOpKind::GrantAuthority { kind } => patch::ComponentOp::GrantAuthority {
+ holder: subject(0)?,
+ grant: patch::AuthorityGrantRef {
+ kind: kind.clone(),
+ over: grant_over(1)?,
+ },
+ },
+ ComponentOpKind::RevokeAuthority { kind } => patch::ComponentOp::RevokeAuthority {
+ holder: subject(0)?,
+ grant: patch::AuthorityGrantRef {
+ kind: kind.clone(),
+ over: grant_over(1)?,
+ },
+ },
+ ComponentOpKind::InstallIncumbent { office } => patch::ComponentOp::InstallIncumbent {
+ institution: subject(0)?,
+ office: office.clone(),
+ incumbent: subject(1)?,
+ },
+ ComponentOpKind::VacateOffice { office } => patch::ComponentOp::VacateOffice {
+ institution: subject(0)?,
+ office: office.clone(),
+ },
+ ComponentOpKind::AcquireKnowledge { confidence } => {
+ patch::ComponentOp::AcquireKnowledge {
+ subject: subject(0)?,
+ fact: entity(1)?,
+ source: patch::AuthoredSource::Witnessed,
+ confidence: *confidence,
+ }
+ }
+ ComponentOpKind::Witness { confidence } => patch::ComponentOp::Witness {
+ fact: entity(0)?,
+ place: entity(1)?,
+ confidence: *confidence,
+ },
+ ComponentOpKind::Forget => patch::ComponentOp::Forget {
+ subject: subject(0)?,
+ fact: entity(1)?,
+ },
+ });
+ }
+ Ok(operations)
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use crate::custody_tests::custody_kernel;
+ use crate::patch::{
+ AffordanceDeclaration, ComponentOp, DraftHandle, OutcomeBand, Ref as PatchRef, ResolvedOp,
+ RoleSpec,
+ };
+ use crate::tests::{
+ ADMIT_KIND, COMMAND_KIND, Civic, LEVY_KIND, OPENING_BALANCE, SEIZURE_GRIEVANCE, Topology,
+ WARDEN_OFFICE, act, affordance_named, authority_kind, civic_world,
+ command, custody_world, grant_to, grievance, office, operations, over_place,
+ over_subject, play_caller, reject_play, submit_play, tick_body,
+ };
+ use crate::{
+ AffordanceKindName, AuthenticatedCaller, AuthoredSource, CommandBody, Confidence,
+ Declaration, EffectSlot, EntityKind, ProposedEffect, RoleBinding, Statement, CommitReceipt,
+ WorldEffect, WorldKernel, WorldPatch, WorldSnapshot, apply_effect,
+ };
+ use std::collections::BTreeSet;
+
+ struct Bench {
+ kernel: WorldKernel,
+ active: WorldSnapshot,
+ carry: AffordanceId,
+ clerk: SubjectId,
+ keeper: SubjectId,
+ tithe: EntityId,
+ ingot: EntityId,
+ yard: EntityId,
+ gate: EntityId,
+ shutter: EdgeId,
+ }
+
+ fn bench(title: &str) -> Bench {
+ let mut kernel = custody_kernel(title);
+ let (topology, custody, active) = custody_world(&mut kernel);
+ let carry = affordance_named(&active, "carry");
+ Bench {
+ kernel,
+ active,
+ carry,
+ clerk: custody.holder,
+ keeper: custody.counterparty,
+ tithe: custody.tithe,
+ ingot: custody.ingot,
+ yard: topology.yard,
+ gate: topology.gate,
+ shutter: topology.shutter,
+ }
+ }
+
+ /// `exercise` only accepts a grant the kernel resolved, so a test walks the
+ /// same gate `reduce` does rather than reaching into the catalog.
+ fn draw_once(
+ state: &WorldState,
+ command_id: CommandId,
+ actor: SubjectId,
+ invocation: &DecisionInvocation,
+ ) -> Result {
+ let granted = crate::require_granted(state, actor, invocation.affordance)?;
+ exercise(state, command_id, actor, &granted, invocation)
+ }
+
+ /// Commit `invocation` as the first command whose derived id draws `band`.
+ /// A band is a pure function of the pre-commit state and the command id,
+ /// and a command's id derives from the revision it targets, so a test
+ /// reaches a band by committing ordinary ticks until the id it would
+ /// carry draws it.
+ fn act_drawing(
+ kernel: &mut WorldKernel,
+ actor: SubjectId,
+ invocation: &DecisionInvocation,
+ band: usize,
+ ) -> CommitReceipt {
+ for _ in 0..256 {
+ let snapshot = kernel.snapshot().unwrap();
+ let envelope = command(
+ &snapshot,
+ play_caller(),
+ CommandBody::Act {
+ actor,
+ invocation: invocation.clone(),
+ },
+ );
+ let draws = draw_once(&kernel.state, envelope.id(), actor, invocation)
+ .expect("the invocation is admissible")
+ .band;
+ if draws == band {
+ return kernel
+ .submit(envelope, &AuthenticatedCaller::verified_play())
+ .expect("the invocation commits");
+ }
+ submit_play(kernel, &snapshot, tick_body(1));
+ }
+ panic!("a two-band entry reaches both bands within 256 revisions");
+ }
+
+ fn binding(role: &str, target: Target) -> RoleBinding {
+ RoleBinding {
+ role: Role(role.into()),
+ target,
+ }
+ }
+
+ impl Bench {
+ /// A Carry the clerk proposes. The actor is never a role, so a Carry
+ /// that moves the actor's own goods binds `from` to its own id.
+ fn carry_of(&self, qty: u64, place: EntityId, resource: EntityId) -> DecisionInvocation {
+ DecisionInvocation {
+ affordance: self.carry,
+ bindings: vec![
+ binding("from", Target::Subject(self.clerk)),
+ binding("recipient", Target::Subject(self.keeper)),
+ binding("place", Target::Entity(place)),
+ binding("resource", Target::Entity(resource)),
+ ],
+ proposed: vec![ProposedEffect {
+ slot: 0,
+ magnitude: Magnitude::Quantity(Quantity(qty)),
+ }],
+ speech: None,
+ display: None,
+ }
+ }
+
+ fn carry(&self, qty: u64, place: EntityId) -> DecisionInvocation {
+ self.carry_of(qty, place, self.tithe)
+ }
+
+ fn try_exercise(
+ &self,
+ invocation: &DecisionInvocation,
+ ) -> Result {
+ draw_once(
+ &self.kernel.state,
+ CommandId::issue(),
+ self.clerk,
+ invocation,
+ )
+ }
+
+ fn rejections(&self, invocation: &DecisionInvocation) -> Vec {
+ match self.try_exercise(invocation) {
+ Err(KernelError::ActionRejected(rejected)) => rejected,
+ other => panic!("expected an action rejection, got {other:?}"),
+ }
+ }
+
+ fn commit(&mut self, invocation: DecisionInvocation) -> CommitReceipt {
+ act(&mut self.kernel, self.clerk, invocation).expect("the invocation commits")
+ }
+
+ fn held(&self, holder: SubjectId) -> u64 {
+ self.kernel
+ .state
+ .holdings
+ .get(&holder)
+ .and_then(|held| held.get(&self.tithe))
+ .map_or(0, |quantity| quantity.0)
+ }
+
+ /// The same Carry attempt against a sibling entry: one dial moved, one
+ /// name. The catalog is declared structure, so a variant is declared rather
+ /// than patched into committed state.
+ fn variant(&self, invocation: &DecisionInvocation, kind: &str) -> DecisionInvocation {
+ DecisionInvocation {
+ affordance: affordance_named(&self.active, kind),
+ ..invocation.clone()
+ }
+ }
+
+ fn refresh(&mut self) {
+ self.active = self.kernel.snapshot().unwrap();
+ }
+ }
+
+ #[test]
+ fn a_missing_present_precondition_names_itself() {
+ let bench = bench("Present");
+ let before = bench.kernel.state.clone();
+ let before_events = bench.kernel.events();
+
+ // The clerk stands in the yard, so a Carry bound to the gate fails the
+ // first precondition and nothing else.
+ assert_eq!(
+ bench.rejections(&bench.carry(1, bench.gate)),
+ vec![ActionMismatch::ActorNotPresent { precondition: 0 }]
+ );
+ assert_eq!(bench.kernel.state.revision, before.revision);
+ assert_eq!(bench.kernel.state.holdings, before.holdings);
+ assert_eq!(bench.kernel.events(), before_events);
+ }
+
+ #[test]
+ fn spending_more_than_held_fails_the_holds_precondition() {
+ let bench = bench("Holds");
+ let greedy = bench.variant(&bench.carry(1, bench.yard), "carry_greedy");
+ assert_eq!(
+ bench.rejections(&greedy),
+ vec![ActionMismatch::InsufficientHolding { precondition: 1 }]
+ );
+
+ // Absence is zero, so a resource the clerk holds none of gives the same
+ // name at the boundary rather than a second one.
+ let ingot = bench.variant(&bench.carry_of(1, bench.yard, bench.ingot), "carry_holds");
+ assert_eq!(
+ bench.rejections(&ingot),
+ vec![ActionMismatch::InsufficientHolding { precondition: 0 }]
+ );
+ }
+
+ /// `at_least` is inclusive: holding exactly the threshold passes. The clerk
+ /// spends down to one ingot-equivalent, and `carry_holds` asks for one.
+ #[test]
+ fn holding_exactly_the_threshold_satisfies_holds() {
+ let mut bench = bench("HoldsBoundary");
+ for _ in 0..2 {
+ bench.commit(bench.carry(3, bench.yard));
+ bench.refresh();
+ }
+ assert_eq!(bench.held(bench.clerk), OPENING_BALANCE - 6);
+ let exact = bench.variant(&bench.carry(1, bench.yard), "carry_holds");
+ bench
+ .try_exercise(&exact)
+ .expect("one held satisfies at_least one");
+
+ bench.commit(bench.carry(1, bench.yard));
+ bench.refresh();
+ assert_eq!(bench.held(bench.clerk), 0);
+ assert_eq!(
+ bench.rejections(&bench.variant(&bench.carry(1, bench.yard), "carry_holds")),
+ vec![ActionMismatch::InsufficientHolding { precondition: 0 }]
+ );
+ }
+
+ #[test]
+ fn a_reachable_precondition_reads_only_open_public_routes() {
+ let mut bench = bench("Reachable");
+ // Yard to gate over open public routes is the ramp (12) plus the span
+ // (7): the shutter is closed and the toll stair is restricted. A budget
+ // of NEAR_REACH covers only the shutter, FAR_REACH covers the two-hop
+ // path.
+ let attempt = bench.carry(1, bench.gate);
+ let near = bench.variant(&attempt, "carry_near");
+ let far = bench.variant(&attempt, "carry_far");
+ assert_eq!(
+ bench.rejections(&near),
+ vec![ActionMismatch::TargetUnreachable { precondition: 0 }]
+ );
+ assert!(bench.try_exercise(&far).is_ok());
+
+ // Opening the one-hop shutter shortens the path, and closing it again
+ // restores the two-hop cost: the check reads the live graph rather than
+ // anything the proposal was bound against.
+ let before = bench.kernel.snapshot().unwrap();
+ submit_play(
+ &mut bench.kernel,
+ &before,
+ operations(vec![ComponentOp::OpenRoute {
+ route: PatchRef::Existing(bench.shutter),
+ }]),
+ );
+ bench.refresh();
+ assert!(bench.try_exercise(&near).is_ok());
+
+ let before = bench.kernel.snapshot().unwrap();
+ submit_play(
+ &mut bench.kernel,
+ &before,
+ operations(vec![ComponentOp::CloseRoute {
+ route: PatchRef::Existing(bench.shutter),
+ }]),
+ );
+ bench.refresh();
+ assert_eq!(
+ bench.rejections(&near),
+ vec![ActionMismatch::TargetUnreachable { precondition: 0 }]
+ );
+ }
+
+ #[test]
+ fn an_unbound_or_miskinded_role_is_rejected_with_the_complete_set() {
+ let bench = bench("Roles");
+ let mut invocation = bench.carry(1, bench.yard);
+ // Drop `recipient`, add an undeclared role, and bind `resource` to a
+ // place: one rejection carrying all three, sorted.
+ invocation.bindings = vec![
+ binding("from", Target::Subject(bench.clerk)),
+ binding("place", Target::Entity(bench.yard)),
+ binding("resource", Target::Entity(bench.yard)),
+ binding("porter", Target::Subject(bench.keeper)),
+ ];
+ let mut expected = vec![
+ ActionMismatch::UnboundRole {
+ role: Role("recipient".into()),
+ },
+ ActionMismatch::UnknownRole {
+ role: Role("porter".into()),
+ },
+ ActionMismatch::TargetKindMismatch {
+ role: Role("resource".into()),
+ expected: RefKind::Entity(EntityKind::Resource),
+ actual: RefKind::Entity(EntityKind::Place),
+ },
+ ];
+ expected.sort();
+ assert_eq!(bench.rejections(&invocation), expected);
+ }
+
+ #[test]
+ fn a_duplicated_or_unknown_binding_target_is_rejected() {
+ let bench = bench("Bindings");
+ let mut twice = bench.carry(1, bench.yard);
+ twice
+ .bindings
+ .push(binding("resource", Target::Entity(bench.tithe)));
+ assert!(
+ bench
+ .rejections(&twice)
+ .contains(&ActionMismatch::DuplicateRoleBinding {
+ role: Role("resource".into())
+ })
+ );
+
+ let mut unknown = bench.carry(1, bench.yard);
+ unknown.bindings[3] = binding("resource", Target::Entity(EntityId::issue()));
+ assert!(
+ bench
+ .rejections(&unknown)
+ .contains(&ActionMismatch::UnknownTarget {
+ role: Role("resource".into())
+ })
+ );
+ }
+
+ #[test]
+ fn a_magnitude_over_its_slot_ceiling_is_rejected_and_within_it_commits() {
+ let mut bench = bench("Ceiling");
+ assert_eq!(
+ bench.rejections(&bench.carry(4, bench.yard)),
+ vec![ActionMismatch::MagnitudeOverCeiling { slot: 0 }]
+ );
+
+ let clerk_before = bench.held(bench.clerk);
+ let keeper_before = bench.held(bench.keeper);
+ let receipt = bench.commit(bench.carry(3, bench.yard));
+ assert!(receipt.resulting_revision > 0);
+ assert_eq!(bench.held(bench.clerk), clerk_before - 3);
+ assert_eq!(bench.held(bench.keeper), keeper_before + 3);
+ assert_eq!(
+ bench.held(bench.clerk) + bench.held(bench.keeper),
+ clerk_before + keeper_before,
+ "the conserved total is unchanged"
+ );
+ }
+
+ #[test]
+ fn a_magnitude_of_the_wrong_shape_or_zero_is_rejected() {
+ let bench = bench("Shape");
+ for magnitude in [Magnitude::Cost(Cost(2)), Magnitude::None] {
+ let mut invocation = bench.carry(1, bench.yard);
+ invocation.proposed[0].magnitude = magnitude;
+ assert_eq!(
+ bench.rejections(&invocation),
+ vec![ActionMismatch::MagnitudeShapeMismatch { slot: 0 }]
+ );
+ }
+ assert_eq!(
+ bench.rejections(&bench.carry(0, bench.yard)),
+ vec![ActionMismatch::ZeroMagnitude { slot: 0 }]
+ );
+ }
+
+ #[test]
+ fn every_slot_must_be_proposed_exactly_once() {
+ let bench = bench("Slots");
+ let mut missing = bench.carry(1, bench.yard);
+ missing.proposed.clear();
+ assert_eq!(
+ bench.rejections(&missing),
+ vec![ActionMismatch::SlotNotProposed { slot: 0 }]
+ );
+
+ let mut twice = bench.carry(1, bench.yard);
+ twice.proposed.push(twice.proposed[0]);
+ assert_eq!(
+ bench.rejections(&twice),
+ vec![ActionMismatch::DuplicateSlotProposal { slot: 0 }]
+ );
+
+ let mut unknown = bench.carry(1, bench.yard);
+ unknown.proposed.push(ProposedEffect {
+ slot: 7,
+ magnitude: Magnitude::None,
+ });
+ assert_eq!(
+ bench.rejections(&unknown),
+ vec![ActionMismatch::UnknownSlot { slot: 7 }]
+ );
+ }
+
+ #[test]
+ fn speech_is_required_exactly_when_the_entry_carries_it() {
+ let bench = bench("Speech");
+ let mut spoken_carry = bench.carry(1, bench.yard);
+ spoken_carry.speech = Some(Statement::new("Take it.").unwrap());
+ assert_eq!(
+ bench.rejections(&spoken_carry),
+ vec![ActionMismatch::SpeechNotCarried]
+ );
+
+ let speak = affordance_named(&bench.active, "speak");
+ let mut silent_speak = DecisionInvocation {
+ affordance: speak,
+ bindings: Vec::new(),
+ proposed: Vec::new(),
+ speech: None,
+ display: None,
+ };
+ assert_eq!(
+ bench.rejections(&silent_speak),
+ vec![ActionMismatch::SpeechRequired]
+ );
+
+ // `Statement` is serde-transparent, so a value that arrived without the
+ // constructor is re-checked here rather than trusted.
+ silent_speak.speech = Some(serde_json::from_str::("\" \"").unwrap());
+ assert_eq!(
+ bench.rejections(&silent_speak),
+ vec![ActionMismatch::EmptySpeech]
+ );
+ }
+
+ #[test]
+ fn the_same_command_id_always_selects_the_same_band() {
+ let bench = bench("Bands");
+ // Three equally weighted bands, so the draw alone decides.
+ let invocation = bench.variant(&bench.carry(1, bench.yard), "carry_chance");
+ let draw = |command_id: CommandId, invocation: &DecisionInvocation| {
+ draw_once(&bench.kernel.state, command_id, bench.clerk, invocation)
+ .expect("the invocation is admissible")
+ .band
+ };
+
+ let command_id = CommandId::issue();
+ let fixed = draw(command_id, &invocation);
+ for _ in 0..100 {
+ assert_eq!(draw(command_id, &invocation), fixed);
+ }
+
+ // No caller-supplied value influences the draw: not a binding order,
+ // not a magnitude.
+ let mut reordered = invocation.clone();
+ reordered.bindings.reverse();
+ assert_eq!(draw(command_id, &reordered), fixed);
+ let mut heavier = invocation.clone();
+ heavier.proposed[0].magnitude = Magnitude::Quantity(Quantity(3));
+ assert_eq!(draw(command_id, &heavier), fixed);
+
+ // The command id is the only varying term at one revision.
+ let mut seen = BTreeSet::new();
+ for _ in 0..64 {
+ seen.insert(draw(CommandId::issue(), &invocation));
+ }
+ assert!(
+ seen.len() > 1,
+ "varying only the command id must reach more than one band"
+ );
+ }
+
+ #[test]
+ fn a_zero_effect_band_commits_nothing_but_the_event() {
+ let mut bench = bench("EmptyBand");
+ let idle = bench.variant(&bench.carry(3, bench.yard), "carry_idle");
+
+ let holdings = bench.kernel.state.holdings.clone();
+ let positions = bench.kernel.state.positions.clone();
+ let edges = bench.kernel.state.edges.clone();
+ let revision = bench.kernel.state.revision;
+
+ let event = bench
+ .try_exercise(&idle)
+ .expect("an empty band is admissible");
+ assert_eq!(event.band, 0);
+ assert!(event.effects.is_empty());
+
+ let receipt = bench.commit(idle);
+ assert!(receipt.resulting_revision > 0);
+ assert_eq!(bench.kernel.state.holdings, holdings);
+ assert_eq!(bench.kernel.state.positions, positions);
+ assert_eq!(bench.kernel.state.edges, edges);
+ assert_eq!(bench.kernel.events().len(), 1);
+ assert_eq!(bench.kernel.state.revision, revision + 1);
+ }
+
+ #[test]
+ fn a_committed_event_carries_the_exact_lowered_operations() {
+ let mut bench = bench("Lowering");
+ let receipt = bench.commit(bench.carry(2, bench.yard));
+ assert!(receipt.resulting_revision > 0);
+ let events = bench.kernel.events();
+ let event = events.last().expect("the committed event");
+ assert_eq!(
+ event.effects,
+ vec![ResolvedOp::Transfer {
+ from: bench.clerk,
+ to: bench.keeper,
+ resource: bench.tithe,
+ qty: Quantity(2),
+ }]
+ );
+ }
+
+ /// Soul: contract 10's discriminating case. `a_zero_effect_band_commits_
+ /// nothing_but_the_event` proves an empty band commits nothing, and
+ /// `a_committed_event_carries_the_exact_lowered_operations` proves a
+ /// one-slot entry lowers what it declares — neither separates a slot the
+ /// proposer offered from a slot the draw admitted. This entry declares two
+ /// slots on disjoint bands and proposes both within their ceilings: only
+ /// the drawn band's slot may appear in `event.effects`, and the other slot
+ /// must move no partition. Both bands are exercised, so neither branch
+ /// passes by never being taken.
+ #[test]
+ fn soul_only_the_selected_bands_effects_are_committed() {
+ let mut bench = bench("SelectedBand");
+ let split_id = affordance_named(&bench.active, "carry_split");
+ let split = DecisionInvocation {
+ affordance: split_id,
+ bindings: vec![
+ binding("from", Target::Subject(bench.clerk)),
+ binding("recipient", Target::Subject(bench.keeper)),
+ binding("place", Target::Entity(bench.yard)),
+ binding("resource", Target::Entity(bench.tithe)),
+ ],
+ proposed: vec![
+ ProposedEffect {
+ slot: 0,
+ magnitude: Magnitude::Quantity(Quantity(2)),
+ },
+ ProposedEffect {
+ slot: 1,
+ magnitude: Magnitude::Quantity(Quantity(1)),
+ },
+ ],
+ speech: None,
+ display: None,
+ };
+ let mut seen: BTreeSet = BTreeSet::new();
+
+ for wanted in [0usize, 1] {
+ // The draw is a pure function of the pre-commit state and the
+ // command id; `act_drawing` finds the revision whose id reaches it.
+ let before_clerk = bench.held(bench.clerk);
+ let before_keeper = bench.held(bench.keeper);
+ let receipt = act_drawing(&mut bench.kernel, bench.clerk, &split, wanted);
+ assert!(receipt.resulting_revision > 0);
+ bench.refresh();
+ let event = bench
+ .kernel
+ .events()
+ .last()
+ .expect("the committed event")
+ .clone();
+ assert_eq!(event.band, wanted);
+ seen.insert(event.band);
+ match event.band {
+ 0 => {
+ assert_eq!(
+ event.effects,
+ vec![ResolvedOp::Transfer {
+ from: bench.clerk,
+ to: bench.keeper,
+ resource: bench.tithe,
+ qty: Quantity(2),
+ }]
+ );
+ assert_eq!(bench.held(bench.clerk), before_clerk - 2);
+ assert_eq!(bench.held(bench.keeper), before_keeper + 2);
+ }
+ 1 => {
+ assert_eq!(
+ event.effects,
+ vec![ResolvedOp::Consume {
+ holder: bench.clerk,
+ resource: bench.tithe,
+ qty: Quantity(1),
+ }]
+ );
+ assert_eq!(bench.held(bench.clerk), before_clerk - 1);
+ assert_eq!(bench.held(bench.keeper), before_keeper);
+ }
+ other => panic!("the entry declares two bands, drew {other}"),
+ }
+ }
+
+ assert_eq!(
+ seen.len(),
+ 2,
+ "both declared bands must be reachable across command ids"
+ );
+ }
+
+ /// Soul: `RoleSpec` persists inside the catalog, so `RefKind` had to become
+ /// serializable this pass. An internally tagged newtype over an `Option`
+ /// does not serialize; this one is adjacently tagged, and a stored
+ /// `Subject(None)` role is what would fault on first write if that were
+ /// wrong. The fixture catalog carries four such roles.
+ #[test]
+ fn soul_a_stored_role_spec_over_an_optional_subject_kind_round_trips() {
+ let bench = bench("OptionalSubjectKind");
+ let entry = bench
+ .kernel
+ .state
+ .affordance_catalog
+ .get(&bench.carry)
+ .expect("the fixture entry");
+ assert!(
+ entry
+ .roles
+ .iter()
+ .any(|spec| spec.kind == RefKind::Subject(None))
+ );
+
+ // The affordance document round-trips through the `to_vec_named` path the
+ // state digest hashes.
+ let catalog = rmp_serde::to_vec_named(&bench.kernel.state.affordance_catalog)
+ .expect("the affordance document encodes");
+ let decoded: std::collections::BTreeMap<_, crate::Affordance> =
+ rmp_serde::from_slice(&catalog).expect("the affordance document decodes");
+ assert_eq!(decoded, *bench.kernel.state.affordance_catalog.as_map());
+ assert!(bench.kernel.state.full_state_digest().is_ok());
+ }
+
+ #[test]
+ fn a_forged_band_or_forged_effect_does_not_apply() {
+ let bench = bench("ForgedAction");
+ let command_id = CommandId::issue();
+ let invocation = bench.carry(2, bench.yard);
+ let honest = draw_once(&bench.kernel.state, command_id, bench.clerk, &invocation).unwrap();
+ let caller = play_caller();
+
+ for forged in [
+ DecisionEvent {
+ band: 3,
+ ..honest.clone()
+ },
+ DecisionEvent {
+ effects: vec![ResolvedOp::Transfer {
+ from: bench.clerk,
+ to: bench.keeper,
+ resource: bench.tithe,
+ qty: Quantity(OPENING_BALANCE),
+ }],
+ ..honest.clone()
+ },
+ ] {
+ let mut candidate = bench.kernel.state.clone();
+ let error = apply_effect(
+ &mut candidate,
+ command_id,
+ &caller,
+ &WorldEffect::Acted {
+ invocation: invocation.clone(),
+ event: forged,
+ },
+ )
+ .unwrap_err();
+ assert!(matches!(error, KernelError::Invariant(_)), "{error:?}");
+ assert_eq!(candidate, bench.kernel.state);
+ }
+
+ // An event naming another actor does not apply either: the actor is
+ // read from the event, so a swapped actor is re-derived for the swap.
+ let mut candidate = bench.kernel.state.clone();
+ assert!(
+ apply_effect(
+ &mut candidate,
+ command_id,
+ &caller,
+ &WorldEffect::Acted {
+ invocation: invocation.clone(),
+ event: DecisionEvent {
+ actor: bench.keeper,
+ ..honest.clone()
+ },
+ },
+ )
+ .is_err()
+ );
+ assert_eq!(candidate, bench.kernel.state);
+
+ // The honest event still applies through the same arm.
+ let mut candidate = bench.kernel.state.clone();
+ apply_effect(
+ &mut candidate,
+ command_id,
+ &caller,
+ &WorldEffect::Acted {
+ invocation: invocation.clone(),
+ event: honest,
+ },
+ )
+ .unwrap();
+ assert_ne!(candidate.holdings, bench.kernel.state.holdings);
+ }
+
+ #[test]
+ fn the_kernel_speak_entry_commits_its_utterance_and_no_operation() {
+ let mut kernel = custody_kernel("SpeakEntry");
+ let _topology = kernel.snapshot().unwrap();
+ let active = kernel.snapshot().unwrap();
+ let speak = affordance_named(&active, "speak");
+ let human = active
+ .subjects
+ .iter()
+ .find(|subject| subject.label == "The Human")
+ .expect("the human subject")
+ .id;
+ let holdings = kernel.state.holdings.clone();
+ let receipt = act(
+ &mut kernel,
+ human,
+ DecisionInvocation {
+ affordance: speak,
+ bindings: Vec::new(),
+ proposed: Vec::new(),
+ speech: Some(Statement::new("I open the door.").unwrap()),
+ display: None,
+ },
+ )
+ .expect("the Speak entry commits");
+ assert!(receipt.resulting_revision > 0);
+ let events = kernel.events();
+ let event = events.last().unwrap();
+ assert_eq!(event.band, 0);
+ // The two the speech lowering prepends, and nothing from a slot.
+ assert_eq!(event.effects.len(), 2);
+ assert_eq!(
+ crate::tests::spoken(&kernel.state, event),
+ Some("I open the door.")
+ );
+ assert_eq!(kernel.state.holdings, holdings);
+ }
+
+ /// The civic bench: one world where an institution holds jurisdiction over
+ /// a hall, a person holds the same jurisdiction only through an office, and
+ /// two more people stand inside and outside that ground.
+ struct Civics {
+ kernel: WorldKernel,
+ active: WorldSnapshot,
+ topology: Topology,
+ civic: Civic,
+ }
+
+ fn civics(title: &str) -> Civics {
+ let mut kernel = custody_kernel(title);
+ let (topology, civic, active) = civic_world(&mut kernel);
+ Civics {
+ kernel,
+ active,
+ topology,
+ civic,
+ }
+ }
+
+ impl Civics {
+ fn refresh(&mut self) {
+ self.active = self.kernel.snapshot().unwrap();
+ }
+
+ fn call(
+ &self,
+ kind: &str,
+ bindings: Vec,
+ proposed: Vec,
+ speech: Option,
+ ) -> DecisionInvocation {
+ DecisionInvocation {
+ affordance: affordance_named(&self.active, kind),
+ bindings,
+ proposed,
+ speech,
+ display: None,
+ }
+ }
+
+ /// A levy of `qty` from `payer`, always paid to the actor: the payee is
+ /// the reserved role, so it is not a binding the caller supplies.
+ fn levy(&self, payer: SubjectId, qty: u64) -> DecisionInvocation {
+ self.call(
+ "levy",
+ vec![
+ binding("payer", Target::Subject(payer)),
+ binding("resource", Target::Entity(self.civic.grain)),
+ ],
+ vec![ProposedEffect {
+ slot: 0,
+ magnitude: Magnitude::Quantity(Quantity(qty)),
+ }],
+ None,
+ )
+ }
+
+ fn delegate(&self, deputy: SubjectId, ground: EntityId) -> DecisionInvocation {
+ self.call(
+ "delegate",
+ vec![
+ binding("deputy", Target::Subject(deputy)),
+ binding("ground", Target::Entity(ground)),
+ ],
+ vec![ProposedEffect {
+ slot: 0,
+ magnitude: Magnitude::None,
+ }],
+ None,
+ )
+ }
+
+ /// Commands a subordinate to traverse a route: the fixture's one
+ /// `Relocate`-lowering affordance, gated by `command` authority over
+ /// the subordinate rather than by the subordinate's own consent.
+ fn deploy(&self, subordinate: SubjectId, via: EdgeId) -> DecisionInvocation {
+ self.call(
+ "deploy",
+ vec![
+ binding("subordinate", Target::Subject(subordinate)),
+ binding("via", Target::Edge(via)),
+ ],
+ vec![ProposedEffect {
+ slot: 0,
+ magnitude: Magnitude::None,
+ }],
+ None,
+ )
+ }
+
+ /// Strips `holder`'s `levy` grant over `ground`: the fixture's one
+ /// `RevokeAuthority`-lowering affordance, carrying no precondition of
+ /// its own so a rejection can only be the action lane's revocation
+ /// envelope.
+ fn revoke(&self, holder: SubjectId, ground: EntityId) -> DecisionInvocation {
+ self.call(
+ "revoke",
+ vec![
+ binding("holder", Target::Subject(holder)),
+ binding("ground", Target::Entity(ground)),
+ ],
+ vec![ProposedEffect {
+ slot: 0,
+ magnitude: Magnitude::None,
+ }],
+ None,
+ )
+ }
+
+ fn try_as(
+ &self,
+ actor: SubjectId,
+ invocation: &DecisionInvocation,
+ ) -> Result {
+ draw_once(
+ &self.kernel.state,
+ CommandId::issue(),
+ actor,
+ invocation,
+ )
+ }
+
+ fn rejected_as(
+ &self,
+ actor: SubjectId,
+ invocation: &DecisionInvocation,
+ ) -> Vec {
+ match self.try_as(actor, invocation) {
+ Err(KernelError::ActionRejected(rejected)) => rejected,
+ other => panic!("expected an action rejection, got {other:?}"),
+ }
+ }
+
+ fn commit_as(&mut self, actor: SubjectId, invocation: DecisionInvocation) -> CommitReceipt {
+ let receipt = act(&mut self.kernel, actor, invocation).expect("the invocation commits");
+ self.refresh();
+ receipt
+ }
+
+ fn admit(&mut self, ops: Vec) {
+ let before = self.kernel.snapshot().unwrap();
+ let receipt = submit_play(&mut self.kernel, &before, operations(ops));
+ assert!(receipt.resulting_revision > 0);
+ self.refresh();
+ }
+
+ fn refuse(&mut self, ops: Vec) -> Vec {
+ let before = self.kernel.snapshot().unwrap();
+ reject_play(&mut self.kernel, &before, operations(ops))
+ }
+ }
+
+ /// Contract 7's third rejection: commanding outside authority, with the
+ /// exact failed precondition and no allocation.
+ #[test]
+ fn an_unauthorized_actor_names_the_failed_precondition() {
+ let bench = civics("Unauthorized");
+ let before = bench.kernel.state.clone();
+ let before_events = bench.kernel.events();
+ assert_eq!(
+ bench.rejected_as(bench.civic.farmer, &bench.levy(bench.civic.reeve, 1)),
+ vec![ActionMismatch::NotAuthorized { precondition: 0 }]
+ );
+ assert_eq!(bench.kernel.state.revision, before.revision);
+ assert_eq!(bench.kernel.state.holdings, before.holdings);
+ assert_eq!(bench.kernel.events(), before_events);
+ }
+
+ /// A place jurisdiction reaches everything under it and nothing else, and
+ /// the answer is read live: a target that walks out of the subtree stops
+ /// being authorized without any digest moving.
+ #[test]
+ fn place_jurisdiction_reaches_a_containment_subtree_and_stops_at_its_edge() {
+ let mut bench = civics("Subtree");
+ let treasury = bench.civic.treasury;
+ let farmer = bench.civic.farmer;
+
+ // The farmer stands in the chamber, whose container is the hall.
+ assert!(bench.try_as(treasury, &bench.levy(farmer, 1)).is_ok());
+
+ // The pedlar stands on the road, outside the hall entirely, and an
+ // unplaced subject is covered by no place target.
+ assert_eq!(
+ bench.rejected_as(treasury, &bench.levy(bench.civic.outsider, 1)),
+ vec![ActionMismatch::NotAuthorized { precondition: 0 }]
+ );
+ let unplaced = *bench
+ .kernel
+ .state
+ .subjects
+ .keys()
+ .find(|subject_id| !bench.kernel.state.positions.contains_key(subject_id))
+ .expect("the genesis world declares an unplaced subject");
+ assert_eq!(
+ bench.rejected_as(treasury, &bench.levy(unplaced, 1)),
+ vec![ActionMismatch::NotAuthorized { precondition: 0 }]
+ );
+
+ // Walking the farmer out of the hall flips the same invocation, and a
+ // grant naming the subject directly authorizes it again.
+ bench.admit(vec![
+ ComponentOp::Relocate {
+ subject: PatchRef::Existing(farmer),
+ via: PatchRef::Existing(bench.civic.passage),
+ },
+ ComponentOp::Relocate {
+ subject: PatchRef::Existing(farmer),
+ via: PatchRef::Existing(bench.civic.causeway),
+ },
+ ]);
+ assert_eq!(
+ bench.rejected_as(treasury, &bench.levy(farmer, 1)),
+ vec![ActionMismatch::NotAuthorized { precondition: 0 }]
+ );
+ bench.admit(vec![grant_to(treasury, LEVY_KIND, over_subject(farmer))]);
+ assert!(bench.try_as(treasury, &bench.levy(farmer, 1)).is_ok());
+ }
+
+ /// An office lends jurisdiction its holder does not own, and vacating takes
+ /// it back: the act is refused at admission.
+ #[test]
+ fn office_delegation_grants_and_vacating_revokes() {
+ let mut bench = civics("Office");
+ let reeve = bench.civic.reeve;
+ let farmer = bench.civic.farmer;
+ assert!(bench.kernel.state.authority.get(&reeve).is_none());
+ assert!(bench.try_as(reeve, &bench.levy(farmer, 1)).is_ok());
+
+ // The vacated office lends nothing: the act is refused at admission.
+ let invocation = bench.levy(farmer, 1);
+ bench.admit(vec![ComponentOp::VacateOffice {
+ institution: PatchRef::Existing(bench.civic.treasury),
+ office: office(WARDEN_OFFICE),
+ }]);
+
+ let holdings = bench.kernel.state.holdings.clone();
+ let error = act(&mut bench.kernel, reeve, invocation).unwrap_err();
+ assert!(matches!(error, KernelError::ActionRejected(_)), "{error:?}");
+ assert_eq!(bench.kernel.state.holdings, holdings);
+ assert_eq!(
+ bench.rejected_as(reeve, &bench.levy(farmer, 1)),
+ vec![ActionMismatch::NotAuthorized { precondition: 0 }]
+ );
+ }
+
+ /// The reserved role in both directions: an invocation may not bind it, and
+ /// a catalog entry may not declare it.
+ #[test]
+ fn a_levy_cannot_be_directed_away_from_the_actor() {
+ let bench = civics("ActorRole");
+ let mut redirected = bench.levy(bench.civic.farmer, 1);
+ redirected
+ .bindings
+ .push(binding("actor", Target::Subject(bench.civic.outsider)));
+ assert_eq!(
+ bench.rejected_as(bench.civic.treasury, &redirected),
+ vec![ActionMismatch::ActorRoleBound]
+ );
+
+ // The declaration half runs at genesis, so it runs against a fresh world.
+ let mut draft = custody_kernel("ReservedRole");
+ let before = draft.snapshot().unwrap();
+ let handle = DraftHandle::new("thief");
+ let rejected = reject_play(
+ &mut draft,
+ &before,
+ CommandBody::AdmitPatch {
+ patch: WorldPatch {
+ declarations: vec![Declaration::Affordance(AffordanceDeclaration {
+ handle: handle.clone(),
+ kind: AffordanceKindName("thief".into()),
+ roles: vec![RoleSpec {
+ role: Role("actor".into()),
+ kind: RefKind::Subject(None),
+ }],
+ preconditions: vec![Precondition::CanBroadcast {
+ via: AudienceSpec::Colocated,
+ }],
+ effect_slots: Vec::new(),
+ outcome_bands: vec![OutcomeBand {
+ weight: 1,
+ effects: Vec::new(),
+ }],
+ carries_speech: true,
+ })],
+ operations: Vec::new(),
+ evidence: Vec::new(),
+ },
+ },
+ );
+ assert!(rejected.contains(&crate::Mismatch::ReservedRole { handle }));
+ }
+
+ /// The two rejection lanes stay distinguishable: an over-levy inside its
+ /// declared ceiling passes every affordance check and dies in the ledger.
+ #[test]
+ fn an_over_levy_fails_in_the_ledger_not_in_the_contract() {
+ let bench = civics("OverLevy");
+ let error = bench
+ .try_as(bench.civic.treasury, &bench.levy(bench.civic.farmer, 9))
+ .unwrap_err();
+ let KernelError::PatchRejected(rejected) = error else {
+ panic!("an over-levy is a ledger rejection");
+ };
+ assert_eq!(
+ rejected,
+ vec![crate::Mismatch::InsufficientCustody { operation: 0 }]
+ );
+ }
+
+ /// A delegated grant may not exceed the granter's own, and the grant it
+ /// does mint is still subject to disjointness.
+ #[test]
+ fn a_delegated_grant_may_not_exceed_the_granter() {
+ let mut bench = civics("Monotone");
+ let treasury = bench.civic.treasury;
+ let outsider = bench.civic.outsider;
+
+ // The treasury commands the road but does not levy it, so the
+ // precondition passes and the delegation alone is refused.
+ let road = bench.topology.road;
+ bench.admit(vec![grant_to(treasury, COMMAND_KIND, over_place(road))]);
+ let outside = bench.delegate(outsider, road);
+ assert_eq!(
+ bench.rejected_as(treasury, &outside),
+ vec![ActionMismatch::DelegationNotMonotone { slot: 0 }]
+ );
+
+ // The chamber is inside it, so the same act commits and the deputy can
+ // then levy there.
+ let inside = bench.delegate(outsider, bench.civic.chamber);
+ assert!(bench.commit_as(treasury, inside).resulting_revision > 0);
+ assert!(
+ bench
+ .try_as(outsider, &bench.levy(bench.civic.farmer, 1))
+ .is_ok()
+ );
+
+ // An office lends exactly the kinds it delegates: the warden's `levy`
+ // does not make its holder a commander.
+ let again = bench.delegate(outsider, bench.civic.chamber);
+ assert_eq!(
+ bench.rejected_as(bench.civic.reeve, &again),
+ vec![ActionMismatch::NotAuthorized { precondition: 0 }]
+ );
+
+ // The minted grant is ordinary state: repeating it changes nothing, and
+ // widening it to the hall would overlap what the deputy already holds.
+ let error = bench.try_as(treasury, &again).unwrap_err();
+ let KernelError::PatchRejected(rejected) = error else {
+ panic!("a duplicate delegation is a patch rejection");
+ };
+ assert_eq!(
+ rejected,
+ vec![crate::Mismatch::NoOperationEffect { operation: 0 }]
+ );
+ let hall = bench.civic.hall;
+ assert_eq!(
+ bench.refuse(vec![grant_to(outsider, LEVY_KIND, over_place(hall))]),
+ vec![crate::Mismatch::OverlappingJurisdiction { operation: 0 }]
+ );
+ }
+
+ /// The revocation envelope is the same predicate as the grant one, read
+ /// the other way: an actor may strip a `levy` grant only over ground its
+ /// own authority covers, so a bystander cannot use `revoke` to reach past
+ /// what it may otherwise touch.
+ #[test]
+ fn revoking_a_grant_requires_covering_authority_over_its_ground() {
+ let mut bench = civics("RevokeEnvelope");
+ let treasury = bench.civic.treasury;
+ let farmer = bench.civic.farmer;
+ let hall = bench.civic.hall;
+
+ // The farmer holds no authority at all, so stripping the treasury's
+ // own `levy` grant over the hall fails the envelope before the patch
+ // lane ever sees the operation.
+ assert_eq!(
+ bench.rejected_as(farmer, &bench.revoke(treasury, hall)),
+ vec![ActionMismatch::DelegationNotMonotone { slot: 0 }]
+ );
+
+ // The treasury's own `levy` grant over the hall covers the hall, so
+ // the treasury may strip its own grant, and the ledger loses it.
+ assert!(bench.commit_as(treasury, bench.revoke(treasury, hall)).resulting_revision > 0);
+ assert!(
+ !bench
+ .kernel
+ .state
+ .authority
+ .get(&treasury)
+ .is_some_and(|grants| grants.contains(&crate::AuthorityGrant {
+ kind: authority_kind(LEVY_KIND),
+ over: crate::AuthorityTarget::PlaceSubtree(hall),
+ })),
+ "the revoked grant is gone from the ledger"
+ );
+ }
+
+ /// The fixture's one `Relocate`-lowering affordance: a commander may move
+ /// a subordinate standing under its ground, and one standing outside it
+ /// fails the same `Authorized` precondition every other civic act reads.
+ #[test]
+ fn deploy_relocates_a_subordinate_under_command_and_refuses_one_outside_it() {
+ let mut bench = civics("Deploy");
+ let treasury = bench.civic.treasury;
+ let farmer = bench.civic.farmer;
+ let outsider = bench.civic.outsider;
+ let chamber = bench.civic.chamber;
+ let hall = bench.civic.hall;
+ let passage = bench.civic.passage;
+
+ // The pedlar stands on the road, outside the hall the treasury
+ // commands, so the precondition alone refuses the attempt.
+ assert_eq!(
+ bench.rejected_as(treasury, &bench.deploy(outsider, passage)),
+ vec![ActionMismatch::NotAuthorized { precondition: 0 }]
+ );
+
+ // The farmer stands in the chamber, under the treasury's command, and
+ // the passage carries it into the hall the same way a direct
+ // `Relocate` would.
+ assert_eq!(
+ bench
+ .kernel
+ .state
+ .positions
+ .get(&farmer)
+ .map(|position| position.place),
+ Some(chamber)
+ );
+ assert!(bench.commit_as(treasury, bench.deploy(farmer, passage)).resulting_revision > 0);
+ assert_eq!(
+ bench
+ .kernel
+ .state
+ .positions
+ .get(&farmer)
+ .map(|position| position.place),
+ Some(hall)
+ );
+ }
+
+ /// `Redress` with a reducer reader: standing is the covering predicate over
+ /// the forum's target, and closing the forum removes the verb's ground.
+ #[test]
+ fn a_petition_requires_standing() {
+ let mut bench = civics("Petition");
+ let petition = bench.call(
+ "petition",
+ Vec::new(),
+ Vec::new(),
+ Some(Statement::new("The tithe was taken twice.").unwrap()),
+ );
+ assert_eq!(
+ bench.rejected_as(bench.civic.outsider, &petition),
+ vec![ActionMismatch::NoStanding { precondition: 0 }]
+ );
+
+ let farmer = bench.civic.farmer;
+ assert!(bench.commit_as(farmer, petition.clone()).resulting_revision > 0);
+ let events = bench.kernel.events();
+ let event = events.last().expect("the committed event");
+ assert_eq!(event.effects.len(), 2);
+ assert_eq!(
+ crate::tests::spoken(&bench.kernel.state, event),
+ Some("The tithe was taken twice.")
+ );
+
+ bench.admit(vec![ComponentOp::CloseForum {
+ grievance: grievance(SEIZURE_GRIEVANCE),
+ }]);
+ assert_eq!(
+ bench.rejected_as(farmer, &petition),
+ vec![ActionMismatch::NoStanding { precondition: 0 }]
+ );
+ }
+
+ /// One predicate, two callers: the resolver's `Relocate` arm and
+ /// `Reachable`'s edge admission read the same `Restricted` rule, and a
+ /// same-patch grant then move resolves through the candidate shadow.
+ #[test]
+ fn a_restricted_route_admits_exactly_its_named_authority() {
+ let mut bench = civics("Restricted");
+ let walker = bench.topology.walker;
+ let step = ComponentOp::Relocate {
+ subject: PatchRef::Existing(walker),
+ via: PatchRef::Existing(bench.civic.postern),
+ };
+
+ // Holding nothing, and holding `admit` over the origin only, are both
+ // refused: the rule asks about the destination.
+ assert!(
+ bench
+ .refuse(vec![step.clone()])
+ .contains(&crate::Mismatch::RouteAccessRestricted { operation: 0 })
+ );
+ let yard = bench.topology.yard;
+ bench.admit(vec![grant_to(walker, ADMIT_KIND, over_place(yard))]);
+ assert!(
+ bench
+ .refuse(vec![step.clone()])
+ .contains(&crate::Mismatch::RouteAccessRestricted { operation: 0 })
+ );
+
+ // Reachable reads the same rule from the other side.
+ let authority = crate::subject_authority(&bench.kernel.state, walker);
+ assert!(!reachable(
+ &bench.kernel.state,
+ walker,
+ &authority,
+ bench.civic.chamber,
+ Cost(4)
+ ));
+
+ // A grant covering the destination, minted in the same patch as the
+ // move, resolves through the candidate authority shadow.
+ let hall = bench.civic.hall;
+ let authority = crate::subject_authority(&bench.kernel.state, walker);
+ assert!(!patch::route_admits(
+ &bench.kernel.state,
+ &authority,
+ bench.kernel.state.edges[&bench.civic.postern].access(),
+ bench.civic.chamber
+ ));
+ bench.admit(vec![grant_to(walker, ADMIT_KIND, over_place(hall)), step]);
+ assert_eq!(
+ bench.kernel.state.positions[&walker].place,
+ bench.civic.chamber
+ );
+ let authority = crate::subject_authority(&bench.kernel.state, walker);
+ assert!(patch::route_admits(
+ &bench.kernel.state,
+ &authority,
+ bench.kernel.state.edges[&bench.civic.postern].access(),
+ bench.civic.chamber
+ ));
+ }
+
+ /// The remaining institutional affordances, each proving one lowering arm:
+ /// `sanction` closes shared topology under a legitimacy check with an
+ /// interdiction band that fails, and `appoint` makes succession an act
+ /// someone performs under authority rather than a declared method string.
+ #[test]
+ fn sanction_and_appoint_reach_the_reducer_under_authority() {
+ let mut bench = civics("Institutional");
+ let treasury = bench.civic.treasury;
+ let passage = bench.civic.passage;
+ let sanction = bench.call(
+ "sanction",
+ vec![binding("road", Target::Edge(passage))],
+ vec![ProposedEffect {
+ slot: 0,
+ magnitude: Magnitude::None,
+ }],
+ None,
+ );
+
+ // The reeve holds the verb but its office lends only `levy`, so the same
+ // act names the precondition it failed.
+ assert_eq!(
+ bench.rejected_as(bench.civic.reeve, &sanction),
+ vec![ActionMismatch::NotAuthorized { precondition: 0 }]
+ );
+
+ // The treasury commands the hall, and the passage has both endpoints
+ // under it. The draw decides whether the interdiction lands.
+ let receipt = act_drawing(&mut bench.kernel, treasury, &sanction, 0);
+ assert!(receipt.resulting_revision > 0);
+ bench.refresh();
+ assert!(!bench.kernel.state.edges[&passage].is_open());
+
+ // Appointment installs an incumbent through the action lane.
+ let farmer = bench.civic.farmer;
+ let appoint = bench.call(
+ "appoint",
+ vec![
+ binding("institution", Target::Subject(treasury)),
+ binding("candidate", Target::Subject(farmer)),
+ ],
+ vec![ProposedEffect {
+ slot: 0,
+ magnitude: Magnitude::None,
+ }],
+ None,
+ );
+ assert!(bench.commit_as(treasury, appoint).resulting_revision > 0);
+ assert_eq!(
+ bench.kernel.state.selection[&treasury][&office("bailiff")].incumbent,
+ Some(farmer)
+ );
+ }
+
+ // --- Soul: pass-5 falsification -------------------------------------
+
+ /// Submits an invocation through the real command path and hands back
+ /// whatever the kernel decided, refusal included.
+ fn soul_submit(
+ bench: &mut Civics,
+ actor: SubjectId,
+ invocation: DecisionInvocation,
+ ) -> Result {
+ act(&mut bench.kernel, actor, invocation)
+ }
+
+ /// `DelegationNotMonotone` is not a fixture-only verdict: the real `submit`
+ /// path reaches it, and the refused act commits nothing.
+ #[test]
+ fn soul_delegation_not_monotone_reaches_the_real_command_path() {
+ let mut bench = civics("SoulMonotone");
+ let treasury = bench.civic.treasury;
+ let road = bench.topology.road;
+ let outsider = bench.civic.outsider;
+ bench.admit(vec![grant_to(treasury, COMMAND_KIND, over_place(road))]);
+ let invocation = bench.delegate(outsider, road);
+ let before = bench.kernel.state.clone();
+ let before_events = bench.kernel.events();
+ let error = soul_submit(&mut bench, treasury, invocation).unwrap_err();
+ let KernelError::ActionRejected(rejected) = error else {
+ panic!("an over-wide delegation is an action rejection");
+ };
+ assert_eq!(
+ rejected,
+ vec![ActionMismatch::DelegationNotMonotone { slot: 0 }]
+ );
+ assert_eq!(bench.kernel.state.revision, before.revision);
+ assert_eq!(bench.kernel.state.authority, before.authority);
+ assert_eq!(bench.kernel.events().len(), before_events.len());
+ }
+
+ /// The `Restricted` rule is enforced by the component writer, not only by
+ /// the resolver: a forged `ResolvedOp` that skipped `resolve_patch` still
+ /// cannot walk a subject through a door it holds no key to, and the same
+ /// operation succeeds the moment the key exists.
+ #[test]
+ fn soul_a_restricted_relocate_is_refused_by_the_component_writer() {
+ let bench = civics("SoulReducerGate");
+ let walker = bench.topology.walker;
+ let step = ResolvedOp::Relocate {
+ subject_id: walker,
+ edge_id: bench.civic.postern,
+ };
+
+ let mut forged = bench.kernel.state.clone();
+ forged.positions.insert(
+ walker,
+ crate::patch::Position {
+ place: bench.topology.yard,
+ },
+ );
+ let mut refused = forged.clone();
+ let resolves_to = refused.revision + 1;
+ let error =
+ crate::apply_operations(&mut refused, std::slice::from_ref(&step), &[], resolves_to)
+ .unwrap_err();
+ assert!(matches!(error, KernelError::Invariant(_)));
+
+ let mut admitted = forged;
+ admitted.authority.insert(
+ walker,
+ BTreeSet::from([crate::AuthorityGrant {
+ kind: crate::tests::authority_kind(ADMIT_KIND),
+ over: crate::AuthorityTarget::PlaceSubtree(bench.civic.hall),
+ }]),
+ );
+ let resolves_to = admitted.revision + 1;
+ crate::apply_operations(&mut admitted, std::slice::from_ref(&step), &[], resolves_to)
+ .expect("the named key opens the door at the component writer too");
+ assert_eq!(admitted.positions[&walker].place, bench.civic.chamber);
+ }
+
+ /// A grant change on the *granter* reaches the delegate: once the
+ /// treasury's levy ground is revoked, the reeve's act is refused at
+ /// admission, and nothing commits.
+ #[test]
+ fn soul_a_granter_revocation_refuses_the_delegates_act() {
+ let mut bench = civics("SoulRebind");
+ let reeve = bench.civic.reeve;
+ let farmer = bench.civic.farmer;
+ let treasury = bench.civic.treasury;
+ let hall = bench.civic.hall;
+
+ assert!(bench.try_as(reeve, &bench.levy(farmer, 1)).is_ok());
+ let invocation = bench.levy(farmer, 1);
+ bench.admit(vec![ComponentOp::RevokeAuthority {
+ holder: PatchRef::Existing(treasury),
+ grant: crate::tests::grant_of(LEVY_KIND, over_place(hall)),
+ }]);
+ let events = bench.kernel.events().len();
+ let error = act(&mut bench.kernel, reeve, invocation).unwrap_err();
+ assert!(
+ matches!(error, KernelError::ActionRejected(_)),
+ "a revoked lend is a rejection: {error:?}"
+ );
+ assert_eq!(bench.kernel.events().len(), events);
+ }
+
+ /// Structural overlap alone does not see a `Subject` grant sitting inside
+ /// a `PlaceSubtree` grant of the same kind: `targets_overlap` compares
+ /// shapes, not position, and stays that way so the answer cannot decay
+ /// when a subject walks somewhere. Admission catches the cross-shape case
+ /// live instead, in the resolver where the second grant lands, using the
+ /// same covering predicate `Authorized` reads. Both directions fire the
+ /// identical check, so whichever grant is minted second is the one that
+ /// is refused.
+ #[test]
+ fn soul_a_subject_grant_inside_a_place_grant_is_a_second_source() {
+ let mut bench = civics("SoulOverlap");
+ let treasury = bench.civic.treasury;
+ let farmer = bench.civic.farmer;
+ let hall = bench.civic.hall;
+
+ // The farmer stands under the hall the treasury already levies, so the
+ // covering predicate says both grants would answer for the same
+ // target, and admission refuses the narrower grant landing second.
+ assert!(crate::covers(
+ &bench.kernel.state,
+ crate::AuthorityTarget::PlaceSubtree(hall),
+ Target::Subject(farmer)
+ ));
+ assert_eq!(
+ bench.refuse(vec![grant_to(treasury, LEVY_KIND, over_subject(farmer))]),
+ vec![crate::Mismatch::OverlappingJurisdiction { operation: 0 }]
+ );
+
+ // The symmetric order: a direct grant over the farmer, minted first
+ // under a fresh kind, blocks a later place grant that would cover
+ // him too.
+ const AUDIT_KIND: &str = "audit";
+ bench.admit(vec![grant_to(treasury, AUDIT_KIND, over_subject(farmer))]);
+ assert_eq!(
+ bench.refuse(vec![grant_to(treasury, AUDIT_KIND, over_place(hall))]),
+ vec![crate::Mismatch::OverlappingJurisdiction { operation: 0 }]
+ );
+ }
+
+ /// Replay for the new arms is not a separate machine: `reduce` is a pure
+ /// function of committed state and the envelope, so running it twice on the
+ /// same pre-state yields the same effect, and that effect is exactly what
+ /// the commit stored. No clock and no draw entropy enter.
+ #[test]
+ fn soul_reduce_is_pure_for_every_new_civic_arm() {
+ let mut bench = civics("SoulReplay");
+ let treasury = bench.civic.treasury;
+ let farmer = bench.civic.farmer;
+ let outsider = bench.civic.outsider;
+ let chamber = bench.civic.chamber;
+ let passage = bench.civic.passage;
+
+ let sanction = bench.call(
+ "sanction",
+ vec![binding("road", Target::Edge(passage))],
+ vec![ProposedEffect {
+ slot: 0,
+ magnitude: Magnitude::None,
+ }],
+ None,
+ );
+ let appoint = bench.call(
+ "appoint",
+ vec![
+ binding("institution", Target::Subject(treasury)),
+ binding("candidate", Target::Subject(farmer)),
+ ],
+ vec![ProposedEffect {
+ slot: 0,
+ magnitude: Magnitude::None,
+ }],
+ None,
+ );
+ for invocation in [
+ bench.levy(farmer, 2),
+ bench.delegate(outsider, chamber),
+ sanction,
+ appoint,
+ ] {
+ let before = bench.kernel.state.clone();
+ let caller = play_caller();
+ let envelope = command(
+ &bench.active,
+ caller.clone(),
+ CommandBody::Act {
+ actor: treasury,
+ invocation,
+ },
+ );
+ let first = crate::reduce(&before, &envelope).expect("the act reduces");
+ let second = crate::reduce(&before, &envelope).expect("the act reduces again");
+ assert_eq!(first, second, "reduce is not a pure function of the state");
+ let receipt = bench
+ .kernel
+ .submit(envelope, &AuthenticatedCaller::fixture(caller))
+ .expect("the act commits");
+ assert!(receipt.resulting_revision > 0);
+ bench.refresh();
+ let WorldEffect::Acted { event, .. } = first else {
+ panic!("an acted effect");
+ };
+ assert_eq!(
+ bench.kernel.events().last().expect("a committed event"),
+ &event,
+ "the committed event is not what reduce produced"
+ );
+ }
+ }
+
+ /// `resolve_patch`'s candidate knowledge map never models `Communicate`'s
+ /// fan-out (see the comment beside its construction in `patch.rs`), and
+ /// that omission is safe only because no `ComponentOpKind` an affordance
+ /// may declare can lower to a knowledge write carrying
+ /// `KnowledgeSource::Told`. Two kinds touch knowledge: `AcquireKnowledge`,
+ /// whose source `lower` fixes to `AuthoredSource::Witnessed` — a type with
+ /// no `Told` variant to begin with — and `Witness`, which carries no source
+ /// field and no speaker field at all. This test pins both lowerings, at the
+ /// call sites that turn a declared slot into a `ComponentOp`, so a future
+ /// author cannot widen either without this assertion naming the change.
+ #[test]
+ fn no_component_op_kind_lowers_to_a_told_knowledge_write() {
+ let bench = bench("AcquireKnowledgeLowering");
+ let entry = Affordance {
+ kind: AffordanceKindName("witness".into()),
+ roles: Vec::new(),
+ preconditions: Vec::new(),
+ effect_slots: vec![EffectSlot {
+ op_kind: ComponentOpKind::AcquireKnowledge {
+ confidence: Confidence::Believed,
+ },
+ roles: vec![Role("subject".into()), Role("fact".into())],
+ bounds: Bounds::None,
+ }],
+ outcome_bands: vec![OutcomeBand {
+ weight: 1,
+ effects: vec![0],
+ }],
+ carries_speech: false,
+ };
+ let bindings = BTreeMap::from([
+ (Role("subject".into()), Target::Subject(bench.clerk)),
+ (Role("fact".into()), Target::Entity(bench.tithe)),
+ ]);
+ let invocation = DecisionInvocation {
+ affordance: bench.carry,
+ bindings: Vec::new(),
+ proposed: vec![ProposedEffect {
+ slot: 0,
+ magnitude: Magnitude::None,
+ }],
+ speech: None,
+ display: None,
+ };
+ let lowered = lower(
+ &entry,
+ 0,
+ bench.clerk,
+ FictionalMinutes::default(),
+ &invocation,
+ &bindings,
+ )
+ .expect("the acquire slot lowers");
+ assert_eq!(
+ lowered,
+ vec![ComponentOp::AcquireKnowledge {
+ subject: PatchRef::Existing(bench.clerk),
+ fact: PatchRef::Existing(bench.tithe),
+ source: AuthoredSource::Witnessed,
+ confidence: Confidence::Believed,
+ }],
+ "AcquireKnowledge must lower with a Witnessed source, never a forged teller"
+ );
+
+ let witnessing = Affordance {
+ kind: AffordanceKindName("beacon".into()),
+ roles: Vec::new(),
+ preconditions: Vec::new(),
+ effect_slots: vec![EffectSlot {
+ op_kind: ComponentOpKind::Witness {
+ confidence: Confidence::Believed,
+ },
+ roles: vec![Role("fact".into()), Role("place".into())],
+ bounds: Bounds::None,
+ }],
+ outcome_bands: vec![OutcomeBand {
+ weight: 1,
+ effects: vec![0],
+ }],
+ carries_speech: false,
+ };
+ let places = BTreeMap::from([
+ (Role("fact".into()), Target::Entity(bench.tithe)),
+ (Role("place".into()), Target::Entity(bench.yard)),
+ ]);
+ let lowered = lower(
+ &witnessing,
+ 0,
+ bench.clerk,
+ FictionalMinutes::default(),
+ &invocation,
+ &places,
+ )
+ .expect("the witness slot lowers");
+ assert_eq!(
+ lowered,
+ vec![ComponentOp::Witness {
+ fact: PatchRef::Existing(bench.tithe),
+ place: PatchRef::Existing(bench.yard),
+ confidence: Confidence::Believed,
+ }],
+ "Witness must lower with no speaker field to forge"
+ );
+ }
+
+ /// The pin above names two knowledge-touching kinds by example, and a list
+ /// by example goes stale in silence. This match is exhaustive, so a new
+ /// `ComponentOpKind` breaks the build here and its author must say whether
+ /// it touches knowledge. The set that does is `AcquireKnowledge`, `Witness`,
+ /// and `Forget`; the first two are pinned above as unable to carry a teller,
+ /// and `Forget` writes no row at all — it only removes one, so it has no
+ /// source to forge.
+ #[test]
+ fn soul_every_knowledge_touching_op_kind_is_named_by_the_told_pin() {
+ fn touches_knowledge(kind: &ComponentOpKind) -> bool {
+ match kind {
+ ComponentOpKind::AcquireKnowledge { .. }
+ | ComponentOpKind::Witness { .. }
+ | ComponentOpKind::Forget => true,
+ ComponentOpKind::Relocate
+ | ComponentOpKind::OpenRoute
+ | ComponentOpKind::CloseRoute
+ | ComponentOpKind::AlterCost
+ | ComponentOpKind::Transfer
+ | ComponentOpKind::Transform
+ | ComponentOpKind::Consume
+ | ComponentOpKind::Bind
+ | ComponentOpKind::Release
+ | ComponentOpKind::GrantAuthority { .. }
+ | ComponentOpKind::RevokeAuthority { .. }
+ | ComponentOpKind::InstallIncumbent { .. }
+ | ComponentOpKind::VacateOffice { .. }
+ | ComponentOpKind::CreateCommitment { .. }
+ | ComponentOpKind::AdvancePressure { .. }
+ | ComponentOpKind::ReducePressure { .. }
+ | ComponentOpKind::ResolvePressure => false,
+ }
+ }
+
+ let confidence = Confidence::Believed;
+ let touching = [
+ ComponentOpKind::AcquireKnowledge { confidence },
+ ComponentOpKind::Witness { confidence },
+ ComponentOpKind::Forget,
+ ComponentOpKind::Relocate,
+ ComponentOpKind::Transfer,
+ ComponentOpKind::ResolvePressure,
+ ]
+ .iter()
+ .filter(|kind| touches_knowledge(kind))
+ .count();
+ assert_eq!(
+ touching, 3,
+ "the knowledge-touching set is not the one this pin names"
+ );
+ }
+}
diff --git a/native/aetherlight/src/clock.rs b/native/aetherlight/src/clock.rs
new file mode 100644
index 000000000..eaee01512
--- /dev/null
+++ b/native/aetherlight/src/clock.rs
@@ -0,0 +1,250 @@
+//! The world clock and the motion one tick produces.
+//!
+//! One entry point into the reducer, [`derive_motion`], reached from `reduce`'s
+//! `AdvanceTime` arm and from `apply_effect`'s `TimeAdvanced` arm, so a forged
+//! tick is re-derived by the same function that produced the honest one. It is
+//! pure over `(state, to)`: no wall clock, no entropy, no caller value beyond
+//! the span.
+
+use super::patch::{Commitment, CommitmentKey, CommitmentKind, DependencyTarget, MAX_ROUTE_COST};
+use super::{PressureMagnitude, PressureSource, SubjectId, WorldState, action, views};
+#[cfg(test)]
+use super::is_retired;
+use serde::{Deserialize, Serialize};
+use std::collections::BTreeMap;
+
+/// Minutes since genesis. Monotonic, kernel-owned, world-level. `u64` because a
+/// world clock has no bound; `Cost` is `1..=MAX_ROUTE_COST` because it weighs
+/// one edge, and reusing it here would put an edge's bound on the world's age.
+#[derive(
+ Clone, Copy, Debug, Default, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash,
+)]
+#[serde(transparent)]
+pub struct FictionalMinutes(pub u64);
+
+impl FictionalMinutes {
+ pub(crate) fn checked_add(self, span: TickMinutes) -> Option {
+ self.0.checked_add(u64::from(span.0)).map(Self)
+ }
+}
+
+/// The span one `AdvanceTime` names, `1..=MAX_ROUTE_COST` (one year of
+/// minutes), reusing pass 2's constant as a span bound rather than an edge
+/// bound: an unbounded span lets one command jump the clock past every due date
+/// in the world and makes the size of a commit a caller-chosen number.
+///
+/// The type owns its bound at every door: `new` and decoding both go through
+/// it, so a command, a routine's period or a stored commit that names a span
+/// outside the bound cannot be read at all, and no reducer or replay clause
+/// re-checks it.
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[serde(try_from = "u32", into = "u32")]
+pub struct TickMinutes(u32);
+
+impl TryFrom for TickMinutes {
+ type Error = &'static str;
+
+ fn try_from(minutes: u32) -> Result {
+ Self::new(minutes).ok_or("a tick span is 1..=525600 minutes")
+ }
+}
+
+impl From for u32 {
+ fn from(span: TickMinutes) -> u32 {
+ span.0
+ }
+}
+
+impl TickMinutes {
+ pub fn new(minutes: u32) -> Option {
+ (1..=MAX_ROUTE_COST)
+ .contains(&minutes)
+ .then_some(Self(minutes))
+ }
+
+ pub fn minutes(self) -> u32 {
+ self.0
+ }
+}
+
+/// Everything one tick moves, stated as outcomes rather than deltas so the
+/// effect says what the world became.
+#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(deny_unknown_fields)]
+pub(crate) struct Motion {
+ /// Routines that fulfilled, in `(subject, key)` order.
+ pub(crate) fulfilled: Vec,
+ /// Pressure rows written, in `(target, source)` order, with the resulting
+ /// magnitude — not the delta.
+ pub(crate) pressed: Vec,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(deny_unknown_fields)]
+pub(crate) struct RoutineFulfilled {
+ pub(crate) subject: SubjectId,
+ pub(crate) key: CommitmentKey,
+ pub(crate) next_due: FictionalMinutes,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(deny_unknown_fields)]
+pub(crate) struct PressureWritten {
+ pub(crate) target: SubjectId,
+ pub(crate) source: PressureSource,
+ pub(crate) magnitude: PressureMagnitude,
+}
+
+/// The whole magnitude policy, in one place, with no per-world tuning. A
+/// blocked routine raises none at all: it retries on the next tick, which is
+/// what keeps an unattended subject free of spurious pressure.
+mod step {
+ pub(super) const OBLIGATION_PAST_DUE: u32 = 1;
+ pub(super) const GOAL_PAST_DUE: u32 = 1;
+ pub(super) const DEPENDENCY_UNAVAILABLE: u32 = 1;
+}
+
+/// Three stages, each reading only committed `state` and `to`. No stage sees
+/// another stage's writes, which is what makes this a one-pass total function
+/// with no ordering hazard and no partial state to reason about.
+///
+/// Pressure accrues per command, not per minute: one thousand one-minute ticks
+/// and one thousand-minute tick over the same span produce different
+/// magnitudes. The kernel stays an exact function of the command sequence, and
+/// the tick cadence is one operational constant in `runtime.rs`.
+///
+/// What is due, and which dependencies fail, is read from `Views` (the one owner
+/// of both questions: a live subject's due commitments and a live subject's
+/// unavailable dependencies), so a tick reads the work it does and not the
+/// world. A view is true only with clean logs, so it is read behind a check
+/// that holds in every build (six flag tests), and both callers (`reduce`, and
+/// `apply_effect`'s `TimeAdvanced` arm before its first write) call it clean.
+pub(super) fn derive_motion(state: &WorldState, to: FictionalMinutes) -> Motion {
+ assert!(views::readable(state), "the views are read with an open log");
+ motion_of(state, to, &state.views.due_by(to), state.views.failing().copied())
+}
+
+/// What `derive_motion` was before the views: every subject holding a promise
+/// and every dependency row, with retirement and availability judged on the
+/// spot. The view reads must derive the same motion.
+#[cfg(test)]
+pub(super) fn derive_motion_by_scan(state: &WorldState, to: FictionalMinutes) -> Motion {
+ let live = |subject: &SubjectId| !is_retired(state, *subject);
+ let promisors = state.commitments.keys().copied().filter(live).collect();
+ let failing: Vec<_> = state
+ .dependencies
+ .iter()
+ .filter(|(subject, _)| live(subject))
+ .flat_map(|(subject, targets)| targets.iter().map(move |target| (*subject, *target)))
+ .filter(|(subject, target)| dependency_unavailable(state, *subject, *target))
+ .collect();
+ motion_of(state, to, &promisors, failing.into_iter())
+}
+
+/// The motion over `promisors`, which must hold every live subject with a
+/// commitment due by `to`, and the `failing` dependencies of live subjects.
+fn motion_of(
+ state: &WorldState,
+ to: FictionalMinutes,
+ promisors: &std::collections::BTreeSet,
+ failing: impl Iterator- ,
+) -> Motion {
+ let mut fulfilled = Vec::new();
+ let mut pressed: BTreeMap<(SubjectId, PressureSource), u32> = BTreeMap::new();
+
+ for subject in promisors {
+ let held = &state.commitments[subject];
+ for (key, commitment) in held {
+ if commitment.due > to {
+ continue;
+ }
+ match commitment.kind {
+ CommitmentKind::Routine => {
+ if let Some(next_due) = routine_rolls(state, *subject, commitment) {
+ fulfilled.push(RoutineFulfilled {
+ subject: *subject,
+ key: *key,
+ next_due,
+ });
+ }
+ }
+ CommitmentKind::Obligation | CommitmentKind::Goal => {
+ let step = if commitment.kind == CommitmentKind::Obligation {
+ step::OBLIGATION_PAST_DUE
+ } else {
+ step::GOAL_PAST_DUE
+ };
+ let source = PressureSource::Commitment {
+ subject: *subject,
+ key: *key,
+ };
+ *pressed.entry((*subject, source)).or_default() += step;
+ }
+ }
+ }
+ }
+
+ for (subject, target) in failing {
+ let source = PressureSource::Dependency(target);
+ *pressed.entry((subject, source)).or_default() += step::DEPENDENCY_UNAVAILABLE;
+ }
+
+ Motion {
+ fulfilled,
+ pressed: pressed
+ .into_iter()
+ .map(|((target, source), step)| PressureWritten {
+ target,
+ source,
+ magnitude: PressureMagnitude(
+ state
+ .pressures
+ .get(&target)
+ .and_then(|held| held.get(&source))
+ .map_or(0, |magnitude| magnitude.0)
+ .saturating_add(step),
+ ),
+ })
+ .collect(),
+ }
+}
+
+/// A routine fulfils when every one of its checks holds, and its `due` then
+/// rolls forward by exactly one period per command. Catch-up arithmetic would
+/// make the number of fulfilments a function of the operator's tick cadence in
+/// a second place; one roll converges over subsequent ticks.
+fn routine_rolls(
+ state: &WorldState,
+ subject: SubjectId,
+ commitment: &Commitment,
+) -> Option {
+ if !action::preconditions_hold(state, subject, &commitment.checks).is_empty() {
+ return None;
+ }
+ commitment.due.checked_add(commitment.period?)
+}
+
+/// Whether a subject's dependency is currently failing it. A closed route is a
+/// supply failure; an unusable one is a permission question, and reading
+/// authority here would drag `effective_authority` into every tick for every
+/// dependency in the world.
+pub(super) fn dependency_unavailable(
+ state: &WorldState,
+ subject: SubjectId,
+ target: DependencyTarget,
+) -> bool {
+ match target {
+ DependencyTarget::Route(edge_id) => !state
+ .edges
+ .get(&edge_id)
+ .is_some_and(super::EdgeRecord::is_open),
+ // Absence is zero, per pass 3: the depender holds none of what it
+ // depends on.
+ DependencyTarget::Resource(entity_id) => !state
+ .holdings
+ .get(&subject)
+ .is_some_and(|held| held.contains_key(&entity_id)),
+ // The subject it depends on is nowhere in the world's topology.
+ DependencyTarget::Subject(other) => !state.positions.contains_key(&other),
+ }
+}
diff --git a/native/aetherlight/src/digest.rs b/native/aetherlight/src/digest.rs
new file mode 100644
index 000000000..1cf891244
--- /dev/null
+++ b/native/aetherlight/src/digest.rs
@@ -0,0 +1,295 @@
+//! The state digest: a homomorphic set hash over per-document digests.
+//!
+//! Each document (one row of a partition, or the world header) has a digest
+//! `sha256(len schema, schema, len key, key, rmp named value)`. The world's
+//! accumulator is LtHash16 (Lewi et al. 2019): a document digest is expanded to
+//! 2048 bytes and added lane-wise as 1024 wrapping `u16`; removing a document
+//! subtracts it, and updating one subtracts the old and adds the new. So the
+//! digest of a commit costs what the commit changed, not the size of the world,
+//! and it depends on the set of documents alone, never on the order they were
+//! written. `state_digest` seals the accumulator with the revision.
+
+use crate::docs::{DocKey, Docs, Tracked};
+use crate::{KernelError, STATE_SCHEMA};
+use serde::Serialize;
+use sha2::{Digest, Sha256};
+
+const LANES: usize = 1024;
+/// 64 blocks of 32 bytes: 2048 bytes, 1024 lanes.
+const BLOCKS: u8 = 64;
+
+pub(crate) type DocDigest = [u8; 32];
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) struct LtHash16(Box<[u16; LANES]>);
+
+impl Default for LtHash16 {
+ fn default() -> Self {
+ Self(Box::new([0; LANES]))
+ }
+}
+
+impl LtHash16 {
+ fn lanes(doc: &DocDigest) -> impl Iterator
- + '_ {
+ (0..BLOCKS).flat_map(move |block| {
+ let mut hasher = Sha256::new();
+ hasher.update(doc);
+ hasher.update([block]);
+ let expanded: [u8; 32] = hasher.finalize().into();
+ (0..16).map(move |lane| u16::from_le_bytes([expanded[2 * lane], expanded[2 * lane + 1]]))
+ })
+ }
+
+ pub(crate) fn add(&mut self, doc: &DocDigest) {
+ for (slot, lane) in self.0.iter_mut().zip(Self::lanes(doc)) {
+ *slot = slot.wrapping_add(lane);
+ }
+ }
+
+ pub(crate) fn subtract(&mut self, doc: &DocDigest) {
+ for (slot, lane) in self.0.iter_mut().zip(Self::lanes(doc)) {
+ *slot = slot.wrapping_sub(lane);
+ }
+ }
+
+ /// The commit-facing digest: the accumulator sealed with the revision.
+ pub(crate) fn state_digest(&self, revision: u64) -> String {
+ let mut hasher = Sha256::new();
+ hasher.update(STATE_SCHEMA.as_bytes());
+ hasher.update(revision.to_be_bytes());
+ for lane in self.0.iter() {
+ hasher.update(lane.to_le_bytes());
+ }
+ format!("sha256:{:x}", hasher.finalize())
+ }
+}
+
+#[cfg(test)]
+thread_local! {
+ /// Document digests computed on this thread, for the work-bound test.
+ pub(crate) static DOC_DIGESTS: std::cell::Cell = const { std::cell::Cell::new(0) };
+}
+
+pub(crate) fn doc_digest(
+ schema: &str,
+ key: &str,
+ value: &V,
+) -> Result {
+ #[cfg(test)]
+ DOC_DIGESTS.with(|count| count.set(count.get() + 1));
+ let bytes = rmp_serde::to_vec_named(value)
+ .map_err(|error| KernelError::Serialization(error.to_string()))?;
+ let mut hasher = Sha256::new();
+ hasher.update((schema.len() as u64).to_be_bytes());
+ hasher.update(schema.as_bytes());
+ hasher.update((key.len() as u64).to_be_bytes());
+ hasher.update(key.as_bytes());
+ hasher.update(bytes);
+ Ok(hasher.finalize().into())
+}
+
+/// One change of one document: subtract the old, add the new.
+pub(crate) fn fold_change(
+ acc: &mut LtHash16,
+ schema: &str,
+ key: &str,
+ old: Option<&V>,
+ new: Option<&V>,
+) -> Result<(), KernelError> {
+ if let Some(old) = old {
+ acc.subtract(&doc_digest(schema, key, old)?);
+ }
+ if let Some(new) = new {
+ acc.add(&doc_digest(schema, key, new)?);
+ }
+ Ok(())
+}
+
+/// What `WorldState` needs of a partition, whatever its key and value types.
+pub(crate) trait Partition {
+ fn is_clean(&self) -> bool;
+ fn rollback(&mut self);
+ fn finish_log(&mut self);
+ /// Folds the open transaction's changes into `acc`.
+ fn fold_changes(&self, schema: &str, acc: &mut LtHash16) -> Result<(), KernelError>;
+ /// Every document's digest, by (schema, key): the full enumeration the
+ /// incremental digest is checked against.
+ #[cfg(test)]
+ fn documents(
+ &self,
+ schema: &str,
+ out: &mut std::collections::BTreeMap<(String, String), DocDigest>,
+ ) -> Result<(), KernelError>;
+ /// The partition as encoded: the bytes a test scans for what must never appear.
+ #[cfg(test)]
+ fn encoded(&self) -> Vec;
+ /// How many documents the partition holds.
+ #[cfg(test)]
+ fn rows(&self) -> usize;
+ /// Removes the first document, logged like any write; false when empty.
+ #[cfg(test)]
+ fn remove_first(&mut self) -> bool;
+ /// Whether the read index is exactly the projection of the documents.
+ #[cfg(test)]
+ fn index_is_derived(&self) -> bool;
+ /// Damages the read index in one place (a stray entry, else a missing one);
+ /// false when there is nothing to damage.
+ #[cfg(test)]
+ fn corrupt_index_first(&mut self, stray: bool) -> bool;
+}
+
+impl Partition for Docs
+where
+ K: Ord + Clone + DocKey + Serialize,
+ V: Clone + PartialEq + Serialize,
+ P: crate::docs::Projection,
+{
+ fn is_clean(&self) -> bool {
+ Docs::is_clean(self)
+ }
+
+ fn rollback(&mut self) {
+ Docs::rollback(self);
+ }
+
+ fn finish_log(&mut self) {
+ self.finish();
+ }
+
+ fn fold_changes(&self, schema: &str, acc: &mut LtHash16) -> Result<(), KernelError> {
+ for (key, old, new) in self.changes() {
+ fold_change(acc, schema, &key.key_text(), old, new)?;
+ }
+ Ok(())
+ }
+
+ #[cfg(test)]
+ fn documents(
+ &self,
+ schema: &str,
+ out: &mut std::collections::BTreeMap<(String, String), DocDigest>,
+ ) -> Result<(), KernelError> {
+ for (key, value) in self.iter() {
+ let key = key.key_text();
+ let digest = doc_digest(schema, &key, value)?;
+ out.insert((schema.to_owned(), key), digest);
+ }
+ Ok(())
+ }
+
+ #[cfg(test)]
+ fn encoded(&self) -> Vec {
+ rmp_serde::to_vec_named(self).expect("a partition encodes")
+ }
+
+ #[cfg(test)]
+ fn rows(&self) -> usize {
+ self.len()
+ }
+
+ #[cfg(test)]
+ fn remove_first(&mut self) -> bool {
+ let Some(key) = self.keys().next().cloned() else {
+ return false;
+ };
+ self.remove(&key).is_some()
+ }
+
+ #[cfg(test)]
+ fn index_is_derived(&self) -> bool {
+ Docs::index_is_derived(self)
+ }
+
+ #[cfg(test)]
+ fn corrupt_index_first(&mut self, stray: bool) -> bool {
+ self.corrupt_index_for_test(stray)
+ }
+}
+
+/// The header's one change, keyed by its own world id.
+pub(crate) fn fold_header(
+ acc: &mut LtHash16,
+ schema: &str,
+ key: &str,
+ header: &Tracked,
+) -> Result<(), KernelError> {
+ if let Some((old, new)) = header.change() {
+ fold_change(acc, schema, key, old, Some(new))?;
+ }
+ Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ fn documents(count: u32) -> Vec {
+ (0..count)
+ .map(|index| doc_digest("aetherlight.test.v1", &index.to_string(), &index).unwrap())
+ .collect()
+ }
+
+ /// Order never matters and a subtraction undoes an addition, so the digest
+ /// is a function of the set of documents alone.
+ #[test]
+ fn lthash_add_then_subtract_is_zero() {
+ let docs = documents(300);
+ let mut acc = LtHash16::default();
+ for doc in &docs {
+ acc.add(doc);
+ }
+ assert_ne!(acc, LtHash16::default());
+
+ let mut backwards = LtHash16::default();
+ for doc in docs.iter().rev() {
+ backwards.add(doc);
+ }
+ assert_eq!(acc, backwards, "equal sets in two orders differ");
+
+ let mut strided = LtHash16::default();
+ for index in (0..docs.len()).map(|step| (step * 7) % docs.len()) {
+ strided.add(&docs[index]);
+ }
+ assert_eq!(acc, strided, "equal sets in a third order differ");
+
+ for index in (0..docs.len()).map(|step| (step * 11) % docs.len()) {
+ acc.subtract(&docs[index]);
+ }
+ assert_eq!(acc, LtHash16::default(), "add then subtract left a residue");
+ }
+
+ /// A lane that carries must wrap: 40 additions of one document overflow
+ /// nearly every lane of a `u16`, and the subtractions still return to zero.
+ #[test]
+ fn lanes_wrap_instead_of_saturating() {
+ let doc = documents(1)[0];
+ let mut acc = LtHash16::default();
+ for _ in 0..40 {
+ acc.add(&doc);
+ }
+ for _ in 0..40 {
+ acc.subtract(&doc);
+ }
+ assert_eq!(acc, LtHash16::default());
+ }
+
+ #[test]
+ fn the_state_digest_seals_the_revision_and_every_lane() {
+ let docs = documents(3);
+ let mut acc = LtHash16::default();
+ docs.iter().for_each(|doc| acc.add(doc));
+ assert_ne!(acc.state_digest(1), acc.state_digest(2), "the revision is not sealed");
+ let mut other = acc.clone();
+ other.0[1023] = other.0[1023].wrapping_add(1);
+ assert_ne!(acc.state_digest(1), other.state_digest(1), "the last lane is not hashed");
+ }
+
+ #[test]
+ fn a_document_digest_separates_schema_key_and_value() {
+ let one = doc_digest("ab", "c", &1u8).unwrap();
+ assert_ne!(one, doc_digest("a", "bc", &1u8).unwrap(), "schema and key run together");
+ assert_ne!(one, doc_digest("ab", "c", &2u8).unwrap());
+ assert_ne!(one, doc_digest("ab", "d", &1u8).unwrap());
+ assert_eq!(one, doc_digest("ab", "c", &1u8).unwrap());
+ }
+}
diff --git a/native/aetherlight/src/docs.rs b/native/aetherlight/src/docs.rs
new file mode 100644
index 000000000..c9120754b
--- /dev/null
+++ b/native/aetherlight/src/docs.rs
@@ -0,0 +1,766 @@
+//! Tracked documents: the one writer of a partition and the one recorder of
+//! what a transaction changed.
+//!
+//! A `Docs` is a map whose every write goes through a method that remembers the
+//! key's value as it stood before the transaction (first touch wins). `finish`
+//! turns that record into the keys whose value really changed, with their old
+//! values; `rollback` puts every touched key back. Reads see the plain map
+//! through inherent methods, and no method hands out the map, so a write cannot skip the log.
+//! The fields are private to this module for the same reason.
+
+use serde::{Serialize, Serializer};
+use std::collections::{BTreeMap, BTreeSet};
+use std::collections::btree_map::Entry;
+use std::ops::Deref;
+
+#[cfg(test)]
+thread_local! {
+ /// Rows any `Docs` iterator has yielded on this thread, and entries any
+ /// `indexed` read has returned: the work a read did, counted where the
+ /// reads are owned so no reader can skip it.
+ static ROWS_READ: std::cell::Cell = const { std::cell::Cell::new(0) };
+}
+
+/// The rows read on this thread so far (test builds only).
+#[cfg(test)]
+pub(crate) fn rows_read() -> u64 {
+ ROWS_READ.with(|rows| rows.get())
+}
+
+/// Counts rows a view read, where the view is owned (test builds).
+#[cfg(test)]
+pub(crate) fn count_rows(rows: u64) {
+ ROWS_READ.with(|count| count.set(count.get() + rows));
+}
+
+/// A partition iterator that counts every row it yields (test builds); in a
+/// shipped build it is the map's own iterator.
+pub(crate) struct Counted(I);
+
+impl Iterator for Counted {
+ type Item = I::Item;
+ fn next(&mut self) -> Option {
+ let item = self.0.next();
+ #[cfg(test)]
+ if item.is_some() {
+ count_rows(1);
+ }
+ item
+ }
+}
+
+impl DoubleEndedIterator for Counted {
+ fn next_back(&mut self) -> Option {
+ let item = self.0.next_back();
+ #[cfg(test)]
+ if item.is_some() {
+ count_rows(1);
+ }
+ item
+ }
+}
+
+/// A key whose value changed in a transaction, with the value it had before
+/// (`None` when the key was absent). The new value is whatever the map holds.
+pub(crate) type Changed = (K, Option);
+
+/// Where a document sits in a partition's read index: a pure function of one
+/// document's value, so the index can always be rebuilt from the map and never
+/// disagrees with it.
+pub(crate) trait Projection {
+ type Point: Ord + Clone + std::fmt::Debug;
+ /// Appends every point `value` sits at (duplicates allowed).
+ fn points(value: &V, out: &mut Vec);
+}
+
+/// The projection of a partition nothing reads by value.
+#[derive(Clone, Debug, Default)]
+pub(crate) struct NoIndex;
+
+impl Projection for NoIndex {
+ type Point = ();
+ fn points(_: &V, _: &mut Vec<()>) {}
+}
+
+/// A partition: its documents, the log of the open transaction, and the read
+/// index (the projection of the documents as of the last `finish`). The index
+/// is derived state: it is not digested, not encoded, and ignored by equality.
+#[derive(Clone, Debug)]
+pub(crate) struct Docs = NoIndex> {
+ map: BTreeMap,
+ touched: BTreeMap>,
+ index: BTreeMap>,
+}
+
+impl> Default for Docs {
+ fn default() -> Self {
+ Self {
+ map: BTreeMap::new(),
+ touched: BTreeMap::new(),
+ index: BTreeMap::new(),
+ }
+ }
+}
+
+/// Equality is the documents, never the log: two worlds with the same content
+/// are equal whatever transaction state they are in.
+impl> PartialEq for Docs {
+ fn eq(&self, other: &Self) -> bool {
+ self.map == other.map
+ }
+}
+
+impl> Eq for Docs {}
+
+impl<'a, K: Ord + Clone, V: Clone + PartialEq, P: Projection> IntoIterator for &'a Docs {
+ type Item = (&'a K, &'a V);
+ type IntoIter = Counted>;
+ fn into_iter(self) -> Self::IntoIter {
+ self.iter()
+ }
+}
+
+/// A partition encodes as its map, so the encoded world is what it was before
+/// the partitions were tracked.
+impl> Serialize for Docs {
+ fn serialize(&self, serializer: S) -> Result {
+ self.map.serialize(serializer)
+ }
+}
+
+impl> std::ops::Index<&K> for Docs {
+ type Output = V;
+ fn index(&self, key: &K) -> &V {
+ &self.map[key]
+ }
+}
+
+impl> Docs {
+ pub(crate) fn get(&self, key: &K) -> Option<&V> {
+ self.map.get(key)
+ }
+
+ pub(crate) fn contains_key(&self, key: &K) -> bool {
+ self.map.contains_key(key)
+ }
+
+ pub(crate) fn len(&self) -> usize {
+ self.map.len()
+ }
+
+ pub(crate) fn is_empty(&self) -> bool {
+ self.map.is_empty()
+ }
+
+ pub(crate) fn iter(&self) -> Counted> {
+ Counted(self.map.iter())
+ }
+
+ pub(crate) fn keys(&self) -> Counted> {
+ Counted(self.map.keys())
+ }
+
+ pub(crate) fn values(&self) -> Counted> {
+ Counted(self.map.values())
+ }
+
+ pub(crate) fn range