Compare commits

...

4 commits

7 changed files with 263 additions and 135 deletions

View file

@ -158,7 +158,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
type: 3 type: 3
objectId: bab5c804-640f-445c-90c5-fda732b56ca6 objectId: bab5c804-640f-445c-90c5-fda732b56ca6
randomNum: 78440909 randomNum: 87404118
unityVersion: 2021.3.41f1 unityVersion: 2021.3.41f1
cckVersion: 3.10:132 cckVersion: 3.10:132
--- !u!114 &97266995 --- !u!114 &97266995
@ -1367,14 +1367,170 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1500710831} m_GameObject: {fileID: 1500710831}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalPosition: {x: 0, y: 0, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &1557152369
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1557152376}
- component: {fileID: 1557152375}
- component: {fileID: 1557152374}
- component: {fileID: 1557152373}
- component: {fileID: 1557152372}
- component: {fileID: 1557152371}
- component: {fileID: 1557152370}
m_Layer: 0
m_Name: QuineGolfSurface
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1557152370
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1557152369}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 990f6f4efb7f4ec98ad99f6dff1bc6f6, type: 3}
m_Name:
m_EditorClassIdentifier:
type: 3
objectId: bab5c804-640f-445c-90c5-fda732b56ca6
randomNum: 87404118
unityVersion: 2021.3.41f1
cckVersion: 3.10:132
--- !u!114 &1557152371
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1557152369}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a37fd8d654d5c2840a0ab3a5ad65a5ae, type: 3}
m_Name:
m_EditorClassIdentifier:
spawnHeight: 0
useAdditionalValues: 0
syncValues: []
propPrivacy: 1
subSyncs: []
spawnableType: 0
preGeneratedInstanceId:
--- !u!114 &1557152372
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1557152369}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 12974925555b471580cacf5d2d5fa9e3, type: 3}
m_Name:
m_EditorClassIdentifier:
gripType: 1
gripOrigin: {fileID: 0}
disallowTheft: 0
maximumGrabDistance: 0
snappingReferences: []
autoHold: 0
updateWithPhysics: 1
ikReference: {fileID: 0}
--- !u!65 &1557152373
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1557152369}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 0.05}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1557152374
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1557152369}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a912cfd0d29b182919c919ffe9311039, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1557152375
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1557152369}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1557152376
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1557152369}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 1, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1001 &2026983552 --- !u!1001 &2026983552
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1628,7 +1784,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
type: 3 type: 3
objectId: 9fee86b2-a9bd-46a3-a364-5f94506c4253 objectId: 9fee86b2-a9bd-46a3-a364-5f94506c4253
randomNum: 50966792 randomNum: 75621475
unityVersion: 2021.3.41f1 unityVersion: 2021.3.41f1
cckVersion: 3.10:132 cckVersion: 3.10:132
--- !u!114 &2046637845 --- !u!114 &2046637845

File diff suppressed because one or more lines are too long

View file

@ -1,4 +1,4 @@
Shader"S"{SubShader{Pass{CGPROGRAM#pragma vertex a Shader"S"{SubShader{Pass{CGPROGRAM#pragma vertex a
#pragma fragment f #pragma fragment f
#include"UnityCG.cginc" #include"UnityCG.cginc"
struct A{float4 v:POSITION;float2 u:TEXCOORD0;UNITY_VERTEX_INPUT_INSTANCE_ID};struct V{float2 u:TEXCOORD0;float4 v:SV_POSITION;UNITY_VERTEX_OUTPUT_STEREO};V a(A v){V o;UNITY_SETUP_INSTANCE_ID(v);UNITY_INITIALIZE_OUTPUT(V,o);UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);o.v=UnityObjectToClipPos(v.v);o.u=v.u;return o;}float3 f(V U):SV_Target{const uint t[]={0x2f00576f,0x33f2c1f7,0x2f1fb204,0x1b49dda7,0x3d618237,0x42c83a2e,0x4541a121,0x53a72e14,0x1adea1c5,0x5d3cd90b,0x603c289b,0x568d5310,0x339e664f,0x62d0e527,0x51d53c3a,0x3b06de0b,0x62ec13db,0x45bce019,0x620fc24a,0x5d6c6c36,0x00f4742a,0x70a7a790,0x5bc6aa73,0x76b38992,0x7d04286b,0x5cdd77af,0x793c758e,0x4a25d683,0x6a865f87,0x8a7a6d41,0x80979732,0x3e5dcab0,0x7aab42e2,0x4386c736,0x8f2b05f5,0x3b014639,0x38a8286b,0x5cdd77af,0x793c758e,0x4a25d683,0x285ca196,0x0c38abc3,0x8ce0fa73,0x76b38992,0x7dd7e131,0x8802215d,0x793c7e9e,0x6a7c4ea1,0x8951495d,0x7fe41a29,0x005bbcb0,0x5c2c10d0,0x71e0b2d0,0x79542e24,0x78f372b0,0x7aab42e2,0x4386c736,0x9131fc1b,0x7b8dda68,0x76bb5f80,0x4d905394,0x89a6a269,0x6a7fa4e2,0x7227c8a2,0x76b440b0,0x7b8dd81f,0x966a1e78,0x8cc22484,0x831d7ba1,0x3e5dca93,0x793a255e,0x91784c1e,0x6f044498,0x6546356c,0x9cb68111,0x712516f2,0x3e72fc95,0x6f03fc1e,0x6e9eb2bd,0x3c2881d6,0x3b3ff82e,0x7e49bd4e,0x1c044410,0x91c85dac,0x735912b1,0x1b827fd6,0x38911a9a,0x5cc864f8,0x5cc9ca92,0x9a8869fd,0x718915e0,0x3bdc43e0,0x48cf55c7,0x02fdec45,0x114e19a7,0x16307b32,0x076b20e2,0x0ef5e343,0x1600e954,0x2c214599,0x2c30e687,0x027939a2,0x02b83338,0x18f6ec44,0x111f52a8,0x113e4349,0x07e05131,0x02bfd142,0x076ad596,0x09ecd345,0x0288d9a7,0x0528a0a9,0x114e474a,0x02fe5131,0x052149a2,0x0c4d2181,0x13b0d341,0x04fa0892,0x0501c2a2,0x0c73b523,0x0a13e2a1,0x1640315a,0x2c28fba1,0x2c11a68a,0x075c9393,0x112f6cd1,0x2c212dd7,0x2c313093,0x0509aba2,0x09e38ce1,0x2c2948d8,0x115e04a2,0x0c73cd35,0x0c6d7487,0x0c4ced5a,0x2c0236f6,0x0eaeb342,0x076b3857,0x18aa42a9,0x13a78cea,0x0a50d2a6,0x04fa51a1,0x2c11a4a3,0x1155e9a2,0x07a16c42,0x13b0d2a2,0x189949a6,0x0799a0a8,0x079249a2,0x16305fa5,0x13b0d485,0x1147a2a1,0x0c83d044,0x2c11a6d3,0x11a49c85,0x0518cb42,0x0edd7993,0x11a3d2f9,0x2c098b32,0x052a12a4,0x04f98962,0x0509f1a6,0x0a0302a4,0x078a2da2,0x0ede72a9,0x0c739b81,0x0f32d342,0x075b52a2,0x0ee531d7,0x077402a9,0x0511ab21,0x0f330542,0x18729b32,0x0528b724,0x076a8ea4,0x056ed4d5,0x027968d1,0x2c09bc91,0x113e60a5,0x0789e526,0x11a41e97,0x0c833962,0x04eab1f5,0x0512a2a6,0x18b8a026,0x18f71eea,0x075aeea5,0x053102e7,0x11a404a8,0x189977f2,0x09dba344,0x13d7e344,0x075bcc42,0x0509a7e4,0x11a468a7,0x1685ebf4,0x11465f42,0x13a06be6,0x05303ea5,0x0789cc24,0x07e09be8,0x02a0db02,0x077a8ee9,0x0c5ca702,0x078a6041,0x1070202a,0x70a7a6f0,0x54f27128,0xa3ca5608,0x6555360d,0x2d342342,0x83549021,0x7e36e1cd,0x6cfe84e5,0xa7d1a0d5,0x88224d36,0x7dc4f299,0xab0d8f77,0xae9e5944,0x02b5633d,0x9ba00695,0x0c7972d2,0x0671c8bd,0xafe6bc7d,0xb1fb1004,0x065288ef,0x04f10aa9,0x748fba8b,0x66348e98,0x94c622e2,0xad0eb578,0xaa47b755,0x092eb1bc,0x94880007,0x0516d142,0x7e49a43a,0x2556c6cf,0x91522795,0x15634bf9,0x1123cf4f,0x5ec5e876,0xa2b20e75,0x915284b6,0x7dca59c3,0x6632f6cd,0xb9081183,0x21fd79d1,0x7e4d92eb,0x5465f1c7,0x94882f25,0x9b9f5021,0xaa1900f7,0x7d2892f8,0x347d8951,0x21c78c1b,0x837db3f6,0x94a6f72b,0x839828f3,0x8f3532fb,0x4626dc20,};const uint R[]={0,234663,68679,2265159,3280003,5348,7376003,1088679,233604,7641382,6600966,2234534,34023,6182,8665390,6601774,4267074,301257,134,14719239,1088809,6210,337920,4262980,5286,7642145,133250,6587686,14726446,7642409,15255086,2270697,18732593,11512810,3312673,12923174,11953,5282,72774,8661474,7465,1049633,33826,9741606,567426,128,206118,131200,14815374,32641156,18470705,131204,15768623,18157905,3319079,18393220,31,18400580,2240642,4261956,4464900,1082415,15994959,459200,4198566,3179555,3213379,332096,145536,7168,2236546,72955190,4260932,9570592,244584452,266305};float2 p=U.u*65;uint c,i,Y,X=p.x;Y=p.y;i=X+(64-Y)*65;if(i>446&&i<3307){c=(i-447)%11;c=c<2?(c<<4)+1:c==10?18:(t[(i-447)/11]>>((7-((c-2)&7))*4)&15)+1;}else{i-=(i>447)*2860;c=t[i/5];for(i%=5;i<4;i++)c/=80;c%=80;}Y=(p.y-Y)*6;X=(p.x-X)*6;return R[c]>>(X+Y*5)&1*(X<5);}ENDCG}}} struct A{float4 v:POSITION;float2 u:TEXCOORD0;UNITY_VERTEX_INPUT_INSTANCE_ID};struct V{float2 u:TEXCOORD0;float4 v:SV_POSITION;UNITY_VERTEX_OUTPUT_STEREO};V a(A v){V o;UNITY_SETUP_INSTANCE_ID(v);UNITY_INITIALIZE_OUTPUT(V,o);UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);o.v=UnityObjectToClipPos(v.v);o.u=v.u;return o;}float3 f(V U):SV_Target{const uint t[]={0x2f00576f,0x33f2c1f7,0x2f1fb204,0x1b49dda7,0x3d618237,0x42c83a2e,0x4541a121,0x53a72e14,0x1adea1c5,0x5d3cd90b,0x603c289b,0x568d5310,0x339e664f,0x62d0e527,0x51d53c3a,0x3b06de0b,0x62ec13db,0x45bce019,0x620fc24a,0x5d6c6c36,0x00f4742a,0x70a7a790,0x5bc6aa73,0x76b38992,0x7d04286b,0x5cdd77af,0x793c758e,0x4a25d683,0x6a865f87,0x8a7a6d41,0x80979732,0x3e5dcab0,0x7aab42e2,0x4386c736,0x8f2b05f5,0x3b014639,0x38a8286b,0x5cdd77af,0x793c758e,0x4a25d683,0x285ca196,0x0c38abc3,0x8ce0fa73,0x76b38992,0x7dd7e131,0x8802215d,0x793c7e9e,0x6a7c4ea1,0x8951495d,0x7fe41a29,0x005bbcb0,0x5c2c10d0,0x71e0b2d0,0x79542e24,0x78f372b0,0x7aab42e2,0x4386c736,0x9131fc1b,0x7b8dda68,0x76bb5f80,0x4d905394,0x89a6a269,0x6a7fa4e2,0x7227c8a2,0x76b440b0,0x7b8dd81f,0x966a1e78,0x8cc22484,0x831d7ba1,0x3e5dca93,0x793a255e,0x91784c1e,0x6f044498,0x6546356c,0x9cb68111,0x712516f2,0x3e72fc95,0x6f03fc1e,0x6e9eb2bd,0x3c2881d6,0x3b3ff82e,0x7e49bd4e,0x1c044410,0x91c85dac,0x735912b1,0x1b827fd6,0x38911a9a,0x5cc864f8,0x5cc9ca92,0x9a8869fd,0x718915e0,0x3bdc43e0,0x48cf55c7,0x02fdec45,0x114e19a7,0x16307b32,0x076b20e2,0x0ef5e343,0x1600e954,0x2c214599,0x2c30e687,0x027939a4,0x0528e8d4,0x056eec44,0x111f52a7,0x0ef46dd1,0x11a45131,0x02bfd142,0x076ad596,0x09ecd345,0x0288d9a7,0x0528a0a9,0x114e474a,0x02fe5131,0x052149a2,0x0c4d2181,0x13b0d341,0x04fa0892,0x1147a434,0x09cc8042,0x2c01bbd9,0x1601cfa7,0x0762bea4,0x0a037af1,0x2c195d33,0x18b06ea6,0x079a04a8,0x113e5ba5,0x0f32d344,0x0781fea7,0x0eed1a39,0x11a45044,0x13ceb6e2,0x09e372f9,0x02c0e436,0x1899c389,0x2c09bd81,0x1165eda6,0x16284724,0x2c01d3e2,0x07998262,0x09e372f7,0x13a902a3,0x1881d4a8,0x0cc1d2aa,0x0ec703e3,0x16123483,0x13c702a3,0x13a05337,0x2c30ff36,0x2c01ba9a,0x1136a9a4,0x0a0a9d42,0x09cc4e93,0x07e03838,0x0c4d24a4,0x07dfeb57,0x04f286a2,0x09d3eb51,0x2c30fd58,0x115e1da3,0x09d42021,0x2c115b37,0x028262a4,0x04f98a02,0x13a809ea,0x04f362a9,0x0511ab21,0x0f330542,0x18729b32,0x0edd7993,0x168604b2,0x0ee4ff89,0x1685ebf5,0x02a82e02,0x0763045a,0x13d012a2,0x0518fbf6,0x2c11a6d4,0x056ed3ea,0x18920bea,0x2c09be27,0x027a92f1,0x18b86d38,0x2c11748a,0x0ed57ba4,0x07630548,0x18f6d437,0x0298f6a8,0x079231e2,0x139851e2,0x04f1d4d3,0x13a90483,0x189976aa,0x02fe1df7,0x02bf8502,0x1899a856,0x188332f2,0x04ea3451,0x075c92f7,0x11365b1a,0x7d04286b,0x5cdd7adf,0x6a5cfcf7,0x0dc5d4f8,0x5cc74ac9,0x2da182cf,0x54634927,0x9add12f3,0x660a727b,0x113d0e6c,0xa3ca3d19,0x28e106e5,0x0c72b559,0xafe78ce3,0x933108eb,0x66348e98,0x94b682d3,0x21aa8b83,0xb6784bc8,0x0e1064cf,0x21af57a1,0xb4ba8feb,0x5ec7a015,0x0c5ceb0b,0x04f82826,0x90504fab,0x21d86e07,0x1562b0f5,0xad674904,0x06761eda,0x3ff17c15,0x9ba006e5,0x0c7970f3,0x160175fd,0x9afe461b,0x10aea02e,0x3516080f,0x10388785,0x7dca097c,0x220d19d1,0x7cefc4b9,0x04052b6f,0x91191305,0x88224d63,0x8356fdcd,0x2ba15003,0x12a781d6,0x3b400aa5,0xaffcd10d,0x9f1d1826,0x91afc573,0x1081afd3,0x8f3532fb,0x4626dc20,};const uint R[]={0,234663,68679,2265159,3280003,5348,7376003,3185831,233604,6592806,6600966,2234534,34023,6182,8665390,6601774,4267074,301257,65,6330631,1088809,6210,337920,4262980,5286,7642145,133250,6587686,6337838,3312809,6595878,2270697,585393,11512810,3312673,12923174,11953,5282,72774,272866,7465,1049633,33826,304422,567426,32,206118,131200,7407687,231490,306601,131202,7375911,18157905,3319079,567428,31,574788,2240642,2130978,1116225,33831,15994959,229600,2099267,3179555,3213379,166048,72768,7168,1118273,72955190,4260932,9570592,211030020,266305};float2 p=U.u*64;uint c,i,Y,X=p.x;Y=p.y;i=X+(63-Y)*64;if(i>446&&i<3252){c=(i-447)%11;c=c<2?(c<<4)+1:c==10?18:(t[(i-447)/11]>>(7-((c-2)&7))*4&15)+1;}else{i-=(i>447)*2805;c=t[i/5];for(i%=5;i<4;i++)c/=80;c%=80;}Y=(p.y-Y)*6;X=(p.x-X)*6;return(X<5)*R[c]>>(X+Y*5)&1;}ENDCG}}}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8 KiB

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,5 @@
const uint t[]={0x2f00576f,0x33f2c1f7,0x2f1fb204,0x1b49dda7,0x3d618237,0x42c83a2e,0x4541a121,0x53a72e14,0x1adea1c5,0x5d3cd90b,0x603c289b,0x568d5310,0x339e664f,0x62d0e527,0x51d53c3a,0x3b06de0b,0x62ec13db,0x45bce019,0x620fc24a,0x5d6c6c36,0x00f4742a,0x70a7a790,0x5bc6aa73,0x76b38992,0x7d04286b,0x5cdd77af,0x793c758e,0x4a25d683,0x6a865f87,0x8a7a6d41,0x80979732,0x3e5dcab0,0x7aab42e2,0x4386c736,0x8f2b05f5,0x3b014639,0x38a8286b,0x5cdd77af,0x793c758e,0x4a25d683,0x285ca196,0x0c38abc3,0x8ce0fa73,0x76b38992,0x7dd7e131,0x8802215d,0x793c7e9e,0x6a7c4ea1,0x8951495d,0x7fe41a29,0x005bbcb0,0x5c2c10d0,0x71e0b2d0,0x79542e24,0x78f372b0,0x7aab42e2,0x4386c736,0x9131fc1b,0x7b8dda68,0x76bb5f80,0x4d905394,0x89a6a269,0x6a7fa4e2,0x7227c8a2,0x76b440b0,0x7b8dd81f,0x966a1e78,0x8cc22484,0x831d7ba1,0x3e5dca93,0x793a255e,0x91784c1e,0x6f044498,0x6546356c,0x9cb68111,0x712516f2,0x3e72fc95,0x6f03fc1e,0x6e9eb2bd,0x3c2881d6,0x3b3ff82e,0x7e49bd4e,0x1c044410,0x91c85dac,0x735912b1,0x1b827fd6,0x38911a9a,0x5cc864f8,0x5cc9ca92,0x9a8869fd,0x718915e0,0x3bdc43e0,0x48cf55c7,0x02fdec45,0x114e19a7,0x16307b32,0x076b20e2,0x0ef5e343,0x1600e954,0x2c214599,0x2c30e687,0x027939a2,0x02b83338,0x18f6ec44,0x111f52a8,0x113e4349,0x07e05131,0x02bfd142,0x076ad596,0x09ecd345,0x0288d9a7,0x0528a0a9,0x114e474a,0x02fe5131,0x052149a2,0x0c4d2181,0x13b0d341,0x04fa0892,0x0501c2a2,0x0c73b523,0x0a13e2a1,0x1640315a,0x2c28fba1,0x2c11a68a,0x075c9393,0x112f6cd1,0x2c212dd7,0x2c313093,0x0509aba2,0x09e38ce1,0x2c2948d8,0x115e04a2,0x0c73cd35,0x0c6d7487,0x0c4ced5a,0x2c0236f6,0x0eaeb342,0x076b3857,0x18aa42a9,0x13a78cea,0x0a50d2a6,0x04fa51a1,0x2c11a4a3,0x1155e9a2,0x07a16c42,0x13b0d2a2,0x189949a6,0x0799a0a8,0x079249a2,0x16305fa5,0x13b0d485,0x1147a2a1,0x0c83d044,0x2c11a6d3,0x11a49c85,0x0518cb42,0x0edd7993,0x11a3d2f9,0x2c098b32,0x052a12a4,0x04f98962,0x0509f1a6,0x0a0302a4,0x078a2da2,0x0ede72a9,0x0c739b81,0x0f32d342,0x075b52a2,0x0ee531d7,0x077402a9,0x0511ab21,0x0f330542,0x18729b32,0x0528b724,0x076a8ea4,0x056ed4d5,0x027968d1,0x2c09bc91,0x113e60a5,0x0789e526,0x11a41e97,0x0c833962,0x04eab1f5,0x0512a2a6,0x18b8a026,0x18f71eea,0x075aeea5,0x053102e7,0x11a404a8,0x189977f2,0x09dba344,0x13d7e344,0x075bcc42,0x0509a7e4,0x11a468a7,0x1685ebf4,0x11465f42,0x13a06be6,0x05303ea5,0x0789cc24,0x07e09be8,0x02a0db02,0x077a8ee9,0x0c5ca702,0x078a6041,0x1070202a,0x70a7a6f0,0x54f27128,0xa3ca5608,0x6555360d,0x2d342342,0x83549021,0x7e36e1cd,0x6cfe84e5,0xa7d1a0d5,0x88224d36,0x7dc4f299,0xab0d8f77,0xae9e5944,0x02b5633d,0x9ba00695,0x0c7972d2,0x0671c8bd,0xafe6bc7d,0xb1fb1004,0x065288ef,0x04f10aa9,0x748fba8b,0x66348e98,0x94c622e2,0xad0eb578,0xaa47b755,0x092eb1bc,0x94880007,0x0516d142,0x7e49a43a,0x2556c6cf,0x91522795,0x15634bf9,0x1123cf4f,0x5ec5e876,0xa2b20e75,0x915284b6,0x7dca59c3,0x6632f6cd,0xb9081183,0x21fd79d1,0x7e4d92eb,0x5465f1c7,0x94882f25,0x9b9f5021,0xaa1900f7,0x7d2892f8,0x347d8951,0x21c78c1b,0x837db3f6,0x94a6f72b,0x839828f3,0x8f3532fb,0x4626dc20,}; const uint t[]={0x2f00576f,0x33f2c1f7,0x2f1fb204,0x1b49dda7,0x3d618237,0x42c83a2e,0x4541a121,0x53a72e14,0x1adea1c5,0x5d3cd90b,0x603c289b,0x568d5310,0x339e664f,0x62d0e527,0x51d53c3a,0x3b06de0b,0x62ec13db,0x45bce019,0x620fc24a,0x5d6c6c36,0x00f4742a,0x70a7a790,0x5bc6aa73,0x76b38992,0x7d04286b,0x5cdd77af,0x793c758e,0x4a25d683,0x6a865f87,0x8a7a6d41,0x80979732,0x3e5dcab0,0x7aab42e2,0x4386c736,0x8f2b05f5,0x3b014639,0x38a8286b,0x5cdd77af,0x793c758e,0x4a25d683,0x285ca196,0x0c38abc3,0x8ce0fa73,0x76b38992,0x7dd7e131,0x8802215d,0x793c7e9e,0x6a7c4ea1,0x8951495d,0x7fe41a29,0x005bbcb0,0x5c2c10d0,0x71e0b2d0,0x79542e24,0x78f372b0,0x7aab42e2,0x4386c736,0x9131fc1b,0x7b8dda68,0x76bb5f80,0x4d905394,0x89a6a269,0x6a7fa4e2,0x7227c8a2,0x76b440b0,0x7b8dd81f,0x966a1e78,0x8cc22484,0x831d7ba1,0x3e5dca93,0x793a255e,0x91784c1e,0x6f044498,0x6546356c,0x9cb68111,0x712516f2,0x3e72fc95,0x6f03fc1e,0x6e9eb2bd,0x3c2881d6,0x3b3ff82e,0x7e49bd4e,0x1c044410,0x91c85dac,0x735912b1,0x1b827fd6,0x38911a9a,0x5cc864f8,0x5cc9ca92,0x9a8869fd,0x718915e0,0x3bdc43e0,0x48cf55c7,0x02fdec45,0x114e19a7,0x16307b32,0x076b20e2,0x0ef5e343,0x1600e954,0x2c214599,0x2c30e687,0x027939a4,0x0528e8d4,0x056eec44,0x111f52a7,0x0ef46dd1,0x11a45131,0x02bfd142,0x076ad596,0x09ecd345,0x0288d9a7,0x0528a0a9,0x114e474a,0x02fe5131,0x052149a2,0x0c4d2181,0x13b0d341,0x04fa0892,0x1147a434,0x09cc8042,0x2c01bbd9,0x1601cfa7,0x0762bea4,0x0a037af1,0x2c195d33,0x18b06ea6,0x079a04a8,0x113e5ba5,0x0f32d344,0x0781fea7,0x0eed1a39,0x11a45044,0x13ceb6e2,0x09e372f9,0x02c0e436,0x1899c389,0x2c09bd81,0x1165eda6,0x16284724,0x2c01d3e2,0x07998262,0x09e372f7,0x13a902a3,0x1881d4a8,0x0cc1d2aa,0x0ec703e3,0x16123483,0x13c702a3,0x13a05337,0x2c30ff36,0x2c01ba9a,0x1136a9a4,0x0a0a9d42,0x09cc4e93,0x07e03838,0x0c4d24a4,0x07dfeb57,0x04f286a2,0x09d3eb51,0x2c30fd58,0x115e1da3,0x09d42021,0x2c115b37,0x028262a4,0x04f98a02,0x13a809ea,0x04f362a9,0x0511ab21,0x0f330542,0x18729b32,0x0edd7993,0x168604b2,0x0ee4ff89,0x1685ebf5,0x02a82e02,0x0763045a,0x13d012a2,0x0518fbf6,0x2c11a6d4,0x056ed3ea,0x18920bea,0x2c09be27,0x027a92f1,0x18b86d38,0x2c11748a,0x0ed57ba4,0x07630548,0x18f6d437,0x0298f6a8,0x079231e2,0x139851e2,0x04f1d4d3,0x13a90483,0x189976aa,0x02fe1df7,0x02bf8502,0x1899a856,0x188332f2,0x04ea3451,0x075c92f7,0x11365b1a,0x7d04286b,0x5cdd7adf,0x6a5cfcf7,0x0dc5d4f8,0x5cc74ac9,0x2da182cf,0x54634927,0x9add12f3,0x660a727b,0x113d0e6c,0xa3ca3d19,0x28e106e5,0x0c72b559,0xafe78ce3,0x933108eb,0x66348e98,0x94b682d3,0x21aa8b83,0xb6784bc8,0x0e1064cf,0x21af57a1,0xb4ba8feb,0x5ec7a015,0x0c5ceb0b,0x04f82826,0x90504fab,0x21d86e07,0x1562b0f5,0xad674904,0x06761eda,0x3ff17c15,0x9ba006e5,0x0c7970f3,0x160175fd,0x9afe461b,0x10aea02e,0x3516080f,0x10388785,0x7dca097c,0x220d19d1,0x7cefc4b9,0x04052b6f,0x91191305,0x88224d63,0x8356fdcd,0x2ba15003,0x12a781d6,0x3b400aa5,0xaffcd10d,0x9f1d1826,0x91afc573,0x1081afd3,0x8f3532fb,0x4626dc20,};
b=447; b=447;
uint magic_number_L_plus_b= 3307; uint magic_number_L_plus_b= 3252;
uint magic_number_L= 2860; uint magic_number_L= 2805;
const uint R[]={0,234663,68679,2265159,3280003,5348,7376003,1088679,233604,7641382,6600966,2234534,34023,6182,8665390,6601774,4267074,301257,134,14719239,1088809,6210,337920,4262980,5286,7642145,133250,6587686,14726446,7642409,15255086,2270697,18732593,11512810,3312673,12923174,11953,5282,72774,8661474,7465,1049633,33826,9741606,567426,128,206118,131200,14815374,32641156,18470705,131204,15768623,18157905,3319079,18393220,31,18400580,2240642,4261956,4464900,1082415,15994959,459200,4198566,3179555,3213379,332096,145536,7168,2236546,72955190,4260932,9570592,244584452,266305}; const uint R[]={0,234663,68679,2265159,3280003,5348,7376003,3185831,233604,6592806,6600966,2234534,34023,6182,8665390,6601774,4267074,301257,65,6330631,1088809,6210,337920,4262980,5286,7642145,133250,6587686,6337838,3312809,6595878,2270697,585393,11512810,3312673,12923174,11953,5282,72774,272866,7465,1049633,33826,304422,567426,32,206118,131200,7407687,231490,306601,131202,7375911,18157905,3319079,567428,31,574788,2240642,2130978,1116225,33831,15994959,229600,2099267,3179555,3213379,166048,72768,7168,1118273,72955190,4260932,9570592,211030020,266305};

View file

@ -41,17 +41,17 @@ fn main() {
encoded_text.push(temp); encoded_text.push(temp);
} }
let mut out_string = String::new(); let mut out_string = String::new();
out_string += "\t\t\t\tconst uint text[] = {"; out_string += "\t\tconst uint text[] = {";
for t in &encoded_text { for t in &encoded_text {
out_string += &format!("{t:#010x},"); out_string += &format!("{t:#010x},");
} }
out_string += "};\n"; out_string += "};\n";
out_string += &format!("\t\t\t\tconst uint text_len = {};\n", encoded_text.len()); out_string += &format!("\t\tconst uint text_len = {};\n", encoded_text.len());
out_string += &format!("\t\t\t\tconst uint blob_start = {blob_start};\n"); out_string += &format!("\t\tconst uint blob_start = {blob_start};\n");
// font // font
let img = ImageReader::open("vgafont.png").unwrap().decode().unwrap(); let img = ImageReader::open("vgafont.png").unwrap().decode().unwrap();
let mut out = Vec::new(); let mut encoded_font = Vec::new();
for &c in FULL_CHARSET { for &c in FULL_CHARSET {
let col = c as u32 & 0b1_1111; let col = c as u32 & 0b1_1111;
let row = (c as u32 >> 5) & 0b111; let row = (c as u32 >> 5) & 0b111;
@ -67,16 +67,14 @@ fn main() {
} }
} }
} }
out.push(encoded); encoded_font.push(encoded);
} }
out_string += "\n\t\t\t\tconst uint font_a[48][4] = {"; out_string += &format!("\n\t\tconst uint font[{}][4] = {{", encoded_font.len());
for (i, c) in out.iter().enumerate() { for c in encoded_font {
if i == 48 {
out_string += &format!("}};\n\t\t\t\tconst uint font_b[{}][4] = {{", out.len() - 48);
}
out_string += &format!("{{{},{},{},{}}},", c[0], c[1], c[2], c[3]); out_string += &format!("{{{},{},{},{}}},", c[0], c[1], c[2], c[3]);
} }
out_string.pop();
out_string += "};\n"; out_string += "};\n";
let mut file = File::create("out.h").unwrap(); let mut file = File::create("out.h").unwrap();
file.write_all(out_string.as_bytes()).unwrap(); file.write_all(out_string.as_bytes()).unwrap();
@ -132,7 +130,7 @@ fn golfed() {
// font // font
let img = ImageReader::open("6x6.png").unwrap().decode().unwrap(); let img = ImageReader::open("6x6.png").unwrap().decode().unwrap();
let mut out = Vec::new(); let mut encoded_font = Vec::new();
for c in used_charset { for c in used_charset {
let col = c as u32 & 0b1_1111; let col = c as u32 & 0b1_1111;
let row = (c as u32 >> 5) & 0b111; let row = (c as u32 >> 5) & 0b111;
@ -146,11 +144,11 @@ fn golfed() {
encoded |= pixel << offset; encoded |= pixel << offset;
} }
} }
out.push(encoded); encoded_font.push(encoded);
} }
out_string += "const uint R[]={"; out_string += "const uint R[]={";
for (_i, c) in out.iter().enumerate() { for c in encoded_font {
out_string += &format!("{c},"); out_string += &format!("{c},");
} }
out_string.pop(); out_string.pop();