A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
perf(lightmap): charts are laid out by their outlines at the largest size that fits, about half of an atlas where it was a third
yhh00cf3fdd0e83
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 91303093f..0aa72e02d 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -38,6 +38,8 @@ published separately; it ships inside the editor.### Changed+- **A lightmap or a baked normal map gets nearly twice as many texels on its model.** Charts are laid out by their outlines and at the largest size that fits, so they fill about half of their atlas where they filled about a third. A model's lightmap UVs change the next time it is imported, so bake its scene again.+- **Phones and tablets take Medium when a project names no level.** Full-screen water on a Snapdragon 8 Elite is 8.6 ms a frame there against 25.8 as authored, mostly by leaving four samples behind. Naming a level still wins, Off included, and the setting gains Default for naming none. Mini games keep their own defaults. Such a project on a handheld also draws without multisampling, with Medium's particle limit of 5000, three shadow cascades and streamed textures: name a level to keep what it had.- **The temporal smoothing of a quality level leaves orthographic cameras alone.** Medium and any level set to `temporal` put it on every camera, which softened a 2D game's sprites and text and gave it a full-screen chain. A `taa` an author lists on an orthographic camera still runs.- **The blank template starts in the linear pipeline.** A lit mesh in gamma clips and washes out, and blank is where a project with no other plan starts. Only the template changes: a project that says nothing stays gamma.diff --git a/examples/physics-3d/assets/scenes/main.esscene b/examples/physics-3d/assets/scenes/main.essceneindex 1489b9aa8..b67a63dd5 100644--- a/examples/physics-3d/assets/scenes/main.esscene+++ b/examples/physics-3d/assets/scenes/main.esscene@@ -91,8 +91,8 @@"data": {"lightmap": "@uuid:b55cdc1e-9d77-4868-aa6e-e24c4156a10f","scaleOffset": {- "x": 0.59765625,- "y": 0.59765625,+ "x": 0.5263671875,+ "y": 0.5263671875,"z": 0,"w": 0}@@ -159,10 +159,10 @@"data": {"lightmap": "@uuid:b55cdc1e-9d77-4868-aa6e-e24c4156a10f","scaleOffset": {- "x": 0.1455078125,- "y": 0.1455078125,- "z": 0.59765625,- "w": 0.21875+ "x": 0.1279296875,+ "y": 0.1279296875,+ "z": 0.8681640625,+ "w": 0}}}@@ -227,9 +227,9 @@"data": {"lightmap": "@uuid:b55cdc1e-9d77-4868-aa6e-e24c4156a10f","scaleOffset": {- "x": 0.169921875,- "y": 0.169921875,- "z": 0.81640625,+ "x": 0.1494140625,+ "y": 0.1494140625,+ "z": 0.71875,"w": 0}}@@ -295,9 +295,9 @@"data": {"lightmap": "@uuid:b55cdc1e-9d77-4868-aa6e-e24c4156a10f","scaleOffset": {- "x": 0.21875,- "y": 0.21875,- "z": 0.59765625,+ "x": 0.1923828125,+ "y": 0.1923828125,+ "z": 0.5263671875,"w": 0}}@@ -537,10 +537,10 @@"data": {"lightmap": "@uuid:b55cdc1e-9d77-4868-aa6e-e24c4156a10f","scaleOffset": {- "x": 0.0712890625,- "y": 0.0712890625,- "z": 0.7431640625,- "w": 0.21875+ "x": 0.0625,+ "y": 0.0625,+ "z": 0.71875,+ "w": 0.1494140625}}}@@ -968,10 +968,10 @@"data": {"lightmap": "@uuid:b55cdc1e-9d77-4868-aa6e-e24c4156a10f","scaleOffset": {- "x": 0.15234375,- "y": 0.15234375,- "z": 0.81640625,- "w": 0.169921875+ "x": 0.1142578125,+ "y": 0.1142578125,+ "z": 0.8681640625,+ "w": 0.1279296875}}}@@ -1035,10 +1035,10 @@"data": {"lightmap": "@uuid:b55cdc1e-9d77-4868-aa6e-e24c4156a10f","scaleOffset": {- "x": 0.033203125,- "y": 0.033203125,- "z": 0.810546875,- "w": 0.322265625+ "x": 0.029296875,+ "y": 0.029296875,+ "z": 0.8330078125,+ "w": 0.1494140625}}}@@ -1292,10 +1292,10 @@"data": {"lightmap": "@uuid:b55cdc1e-9d77-4868-aa6e-e24c4156a10f","scaleOffset": {- "x": 0.0283203125,- "y": 0.0283203125,- "z": 0.96875,- "w": 0.169921875+ "x": 0.0244140625,+ "y": 0.0244140625,+ "z": 0.8330078125,+ "w": 0.1787109375}}}@@ -1423,10 +1423,10 @@"data": {"lightmap": "@uuid:b55cdc1e-9d77-4868-aa6e-e24c4156a10f","scaleOffset": {- "x": 0.025390625,- "y": 0.025390625,- "z": 0.96875,- "w": 0.1982421875+ "x": 0.0224609375,+ "y": 0.0224609375,+ "z": 0.5263671875,+ "w": 0.1923828125}}}@@ -1657,10 +1657,10 @@"data": {"lightmap": "@uuid:b55cdc1e-9d77-4868-aa6e-e24c4156a10f","scaleOffset": {- "x": 0.0673828125,- "y": 0.0673828125,- "z": 0.7431640625,- "w": 0.2900390625+ "x": 0.0517578125,+ "y": 0.0517578125,+ "z": 0.78125,+ "w": 0.1494140625}}}diff --git a/examples/physics-3d/assets/scenes/main_lightmap.png b/examples/physics-3d/assets/scenes/main_lightmap.pngindex 6536f430f..d4be298f0 100644Binary files a/examples/physics-3d/assets/scenes/main_lightmap.png and b/examples/physics-3d/assets/scenes/main_lightmap.png differdiff --git a/examples/physics-3d/assets/scenes/main_probes_50.esprobes b/examples/physics-3d/assets/scenes/main_probes_50.esprobesindex 31064ed12..cbda1b7b9 100644--- a/examples/physics-3d/assets/scenes/main_probes_50.esprobes+++ b/examples/physics-3d/assets/scenes/main_probes_50.esprobes@@ -1,5 +1,5 @@{"version": 1,"resolution": [7,3,5],- "irradiance": [0.787525,0.947183,1.21709,-0.0128871,-0.0145809,-0.0199165,-0.0216912,-0.024515,-0.0335227,-0.0226589,-0.0256378,-0.0350183,-0.00620364,-0.00699162,-0.00958744,-0.00623858,-0.00705768,-0.00964144,-0.00212922,-0.00240502,-0.00329061,-0.0105509,-0.0119378,-0.0163059,-0.00414027,-0.00468563,-0.00639859,0.738265,0.891448,1.14096,-0.0415297,-0.0469878,-0.0641822,-0.0613031,-0.0693331,-0.0947412,-0.00666444,-0.00754116,-0.0102996,-0.000164008,-0.000158209,-0.000253468,-0.0219174,-0.0247971,-0.0338723,-0.00980345,-0.0110879,-0.0151508,-0.00276039,-0.00312344,-0.00426606,-0.00145615,-0.00164875,-0.0022504,0.729309,0.881314,1.12712,-0.0423377,-0.047902,-0.0654308,-0.0694891,-0.0785949,-0.107392,-0.00111113,-0.00125799,-0.00171721,0.000277233,0.000341024,0.000428451,-0.0223998,-0.0253429,-0.0346179,-0.012195,-0.0137937,-0.0188468,0.000610242,0.000690194,0.0009431,-0.00289992,-0.00328227,-0.00448168,0.730707,0.882808,1.12998,-0.0422219,-0.0477847,-0.0651816,-0.0681888,-0.0772125,-0.104719,-0.000105739,-0.000157315,0.00028999,0.000345285,0.000414414,0.000566514,-0.0223234,-0.0252667,-0.0344513,-0.0118302,-0.0134136,-0.0180826,0.00130522,0.00145183,0.00232894,-0.00266381,-0.0030229,-0.00401197,0.72871,0.880371,1.12656,-0.042488,-0.0481302,-0.0655913,-0.0700922,-0.0795621,-0.107909,-0.000917724,-0.00100318,-0.00141457,0.000312197,0.000387325,0.00048253,-0.0225097,-0.0255122,-0.034729,-0.0124137,-0.0141612,-0.0189932,0.000737173,0.000856444,0.00114404,-0.00293781,-0.0033316,-0.00454241,0.733278,0.885576,1.13353,-0.0419621,-0.047508,-0.0648129,-0.0656175,-0.0743816,-0.101206,0.00226046,0.00275908,0.0032482,0.00053198,0.000649137,0.000798054,-0.0221305,-0.0250547,-0.0341818,-0.0109466,-0.0123941,-0.016902,0.00285925,0.00334212,0.00428876,-0.00236481,-0.00274025,-0.00357782,0.790954,0.950547,1.22174,-0.00960914,-0.0109881,-0.0149956,-0.0201508,-0.0228443,-0.0312323,0.0199909,0.0231963,0.0316186,0.00565002,0.00651476,0.00885036,-0.00446563,-0.00506353,-0.0069162,-0.00271103,-0.00292566,-0.00401773,0.00975895,0.0111002,0.0151556,-0.00394222,-0.00468825,-0.00637588,0.800498,0.959564,1.21963,0.00644706,0.008211,0.0191193,-0.022796,-0.0271337,-0.0408272,-0.00119756,-0.00315519,-0.0193011,0.000040834,0.000592715,0.00593887,0.00555764,0.00664348,0.0113348,-0.0101426,-0.0114591,-0.0114747,-0.00492963,-0.00625834,-0.0121216,0.00339572,0.00346775,0.000937562,0.860871,1.01938,1.24144,-0.0272274,-0.0267538,0.00751219,0.0300575,0.0255756,-0.0176981,0.0249137,0.0250348,0.0119226,-0.00560589,-0.00568009,-0.00224824,-0.0138035,-0.0135731,0.00301931,0.00308987,0.00200317,-0.0030293,0.0108666,0.0109266,0.00605532,-0.00242782,-0.00338041,-0.00243581,0.862349,1.02183,1.23466,-0.0322227,-0.0320379,0.00582689,0.0275135,0.0239846,-0.0242201,-0.00537591,-0.00596647,-0.00850743,0.00162107,0.00191565,0.00185988,-0.0150153,-0.0148553,0.00306701,0.00103957,0.000379819,-0.00421849,-0.00426181,-0.00476225,-0.00560898,-0.00292707,-0.00395712,-0.00509123,0.88751,1.04669,1.25697,-0.0338026,-0.0335294,0.00483955,0.0479799,0.0438554,-0.00579573,-0.0260166,-0.0260075,-0.0229529,0.0043234,0.00465394,0.00392388,-0.0157185,-0.0154217,0.00267941,0.0043364,0.00316006,-0.00131731,-0.0172908,-0.0174812,-0.0152821,0.00321578,0.00231392,0.000262888,0.860906,1.02005,1.24154,-0.0291718,-0.0285755,0.00781472,0.0279506,0.0234507,-0.0185361,0.00188057,0.00324109,0.00620558,0.000174754,0.000126678,-0.000234615,-0.0129673,-0.0123648,0.00479953,0.00152831,-0.00016023,-0.00367055,0.000477666,0.000930851,0.0014656,-0.00311585,-0.00372689,-0.00314294,0.852004,1.01337,1.24106,-0.028092,-0.0280754,0.00567179,0.0203721,0.0180982,-0.0200936,-0.00189919,-0.000409201,0.0121622,0.00259356,0.00257306,-0.000565682,-0.0127473,-0.0125429,0.00392074,-0.00138562,-0.00226722,-0.0055742,0.000623175,0.00136291,0.00549433,-0.00420041,-0.00468323,-0.00303971,0.837733,1.00022,1.25399,-0.010854,-0.0107294,0.00332398,0.0114332,0.0104302,-0.00919021,-0.0125045,-0.0115853,0.00701999,0.00563715,0.00570464,-0.000606739,-0.0044717,-0.00430582,0.00227023,-0.000358609,-0.000615237,-0.00239533,-0.00414434,-0.00367076,0.00379269,0.00128043,0.000988809,-0.00141113,0.822954,0.98456,1.24419,-0.00418009,-0.0028449,0.0134422,-0.00377807,-0.0056525,-0.0174684,0.00797475,0.00737909,-0.00648875,-0.00309925,-0.00273475,0.00377749,0.00165074,0.00249458,0.00774289,-0.00530499,-0.00581176,-0.00421836,0.00191516,0.00155919,-0.00347615,0.0011147,0.00136022,0.00236153,0.854914,1.01683,1.25791,-0.0321192,-0.0312452,0.00329404,0.0195864,0.0181533,-0.00371789,0.00197168,0.00163837,-0.0085014,-0.00108477,-0.00103021,0.00347402,-0.011243,-0.0106459,0.00121958,-0.00178347,-0.00201649,0.000402512,0.000657756,0.000603049,-0.00364101,-0.00869065,-0.00887022,-0.00134258,0.854747,1.01285,1.24118,-0.0294049,-0.0267369,0.0158184,0.0187656,0.0150889,-0.0161215,0.0037868,0.00201416,-0.0026566,0.000263157,0.000864865,0.00225349,-0.00986281,-0.0085635,0.00746986,-0.00211248,-0.00213961,-0.000844576,0.000703419,-0.0000409559,-0.00157562,-0.00617271,-0.00698804,0.000921678,0.849948,1.01008,1.2403,-0.0229279,-0.0206988,0.0206733,0.0138419,0.011115,-0.0184278,-0.0118924,-0.0124476,-0.0111024,0.00447526,0.00487669,0.00408064,-0.00584611,-0.00456812,0.0106753,-0.00357365,-0.0038708,-0.00225329,-0.00635533,-0.0068051,-0.00607938,-0.00224009,-0.00213042,0.00528326,0.858124,1.017,1.24561,-0.0314371,-0.0289926,0.0131094,0.0220573,0.0184529,-0.0130411,-0.00115652,-0.0018715,0.00287353,0.00121966,0.00176101,0.0000875829,-0.0108611,-0.00939934,0.00664003,-0.00147665,-0.00191584,-0.000877438,-0.000364811,-0.0011843,0.0000261559,-0.00615871,-0.0065558,0.0011342,0.855363,1.01206,1.24357,-0.0289972,-0.0254601,0.0146203,0.0179333,0.010986,-0.0171108,-0.011662,-0.0111853,0.00137111,0.00553361,0.00554909,0.000663616,-0.00865102,-0.00598065,0.00863058,-0.00282911,-0.0051659,-0.00314004,-0.00419779,-0.00399892,0.0000983564,-0.00523437,-0.00485754,0.00236352,0.835127,0.993163,1.24984,-0.0129034,-0.0100217,0.00941044,0.00532719,0.000906739,-0.0120506,-0.0109295,-0.00740022,0.00738043,0.00566318,0.00451567,-0.00230639,-0.00275676,-0.00105727,0.00556438,-0.00359933,-0.00425901,-0.00211844,-0.00265412,-0.000813344,0.00408228,-0.00100431,-0.00139677,0.000645711,0.729509,0.881399,1.12839,-0.0467424,-0.0530276,-0.0712735,-0.00356342,-0.00403267,-0.00531706,-0.0666252,-0.075459,-0.102446,-0.0236764,-0.0268164,-0.0362123,-0.000963635,-0.00110976,-0.00135106,0.00324216,0.00370843,0.00476489,-0.00185991,-0.00211556,-0.00279986,-0.00858882,-0.00968229,-0.0135223,0.563616,0.693843,0.871043,-0.163331,-0.184797,-0.252421,-0.00312799,-0.00351208,-0.00483417,-0.00570718,-0.00645809,-0.00882019,-0.000219454,-0.000220942,-0.000339157,-0.000316014,-0.000356715,-0.000488385,0.00451025,0.00510706,0.00697039,-0.00326112,-0.00368997,-0.00503991,0.00737592,0.0083441,0.0113992,0.558189,0.687495,0.862693,-0.164101,-0.185704,-0.253604,-0.00644702,-0.00727783,-0.00996171,-0.00282568,-0.00343343,-0.0043244,0.0000356534,0.0000384371,0.0000604703,-0.000642574,-0.000727317,-0.00099287,0.00451963,0.00517458,0.00697461,-0.00120126,-0.00136814,-0.00185493,0.00570266,0.00635639,0.00883024,0.556418,0.683723,0.864382,-0.167018,-0.190358,-0.256482,-0.00684113,-0.00744186,-0.0117001,0.00829701,0.00817313,0.0170444,0.000436146,-0.000050206,0.00175217,-0.000646604,-0.000608417,-0.00126299,0.00494531,0.00583923,0.00704142,-0.00328745,-0.00361991,-0.00571979,0.00743027,0.00840923,0.0127357,0.636202,0.773727,1.01852,-0.107938,-0.123673,-0.142421,-0.00873854,-0.00977028,-0.0150059,-0.000951478,-0.000963839,-0.00329603,-0.00020291,-0.000184486,-0.000601835,-0.00120158,-0.00134282,-0.00212771,0.00195993,0.00231153,0.00157805,-0.00225331,-0.00254749,-0.00354334,-0.000294205,-0.000213799,-0.00235455,0.564091,0.694089,0.872507,-0.163334,-0.18487,-0.25236,-0.0012593,-0.00141044,-0.00212137,0.0107621,0.0124973,0.0158129,0.00137096,0.00163216,0.0020655,-0.00027098,-0.000307812,-0.000428955,0.00526789,0.00603849,0.00796702,0.000554288,0.000638355,0.0009992,0.00712257,0.00793546,0.0113389,0.752697,0.907175,1.15645,-0.0276135,-0.0316344,-0.0483254,0.00192,0.00228869,0.00374418,0.0567952,0.0647225,0.0922712,0.0168116,0.0192403,0.0286925,0.0010311,0.00120527,0.00212307,0.00454369,0.00524966,0.0080726,-0.000970871,-0.0011425,-0.00170238,-0.0131332,-0.014885,-0.0196908,0.674555,0.815024,1.06506,0.0495696,0.0574047,0.0732287,-0.0217849,-0.0252712,-0.0300659,-0.109856,-0.127845,-0.149824,0.0207393,0.024107,0.0302933,0.00523577,0.00607406,0.00741895,0.00786213,0.00923883,0.0105487,-0.00607644,-0.00709569,-0.00812058,-0.017887,-0.0209324,-0.0222696,0.883544,1.02875,1.18087,-0.0686544,-0.0644375,0.0286699,-0.00472892,-0.00869841,-0.0175622,0.031498,0.043985,0.0323616,-0.00758852,-0.00886981,-0.00051048,0.00214168,0.00294567,0.00455063,-0.00196317,-0.000504172,0.00711637,-0.00139523,-0.00101845,-0.000853955,-0.0218029,-0.025839,-0.0137625,0.912413,1.06591,1.20075,-0.081279,-0.0796043,0.0257195,0.0176846,0.016769,0.00242249,-0.0074571,-0.00846615,-0.0132135,0.00247471,0.00285684,0.00339515,-0.00505324,-0.00495552,-0.000934777,-0.0016013,0.000270191,0.00995938,0.0108499,0.0130015,0.0107701,-0.0182177,-0.0219705,-0.0115837,0.907382,1.05138,1.1772,-0.0804499,-0.0781001,0.0239309,0.0231253,0.022569,0.00663867,0.0237574,0.029111,0.0300727,-0.00309681,-0.00190998,0.0019186,-0.0059568,-0.0047665,0.00200542,-0.00408181,-0.00326542,0.00687542,-0.00985084,-0.0158604,-0.0181134,-0.015413,-0.0191222,-0.0113969,0.945707,1.09109,1.23363,-0.100328,-0.0909026,0.00615641,-0.00416417,-0.0180951,-0.0337689,-0.0277022,-0.0312447,-0.0254531,0.0131783,0.0139428,0.0141753,0.00464819,0.00931988,0.0134087,-0.0127299,-0.0151942,-0.0077453,-0.00591935,-0.00907067,-0.0100264,-0.0155276,-0.0153846,-0.00906503,0.906882,1.05086,1.19709,-0.0620061,-0.0531249,0.0456679,-0.015837,-0.0346715,-0.0475522,-0.0227531,-0.0204182,0.00330498,0.00812815,0.00758906,0.001696,0.0150274,0.0212729,0.0228551,-0.00779932,-0.0128518,-0.00553187,-0.000441054,0.000438,0.000802626,-0.00499337,-0.00493099,0.00686785,0.850226,1.009,1.23215,-0.0235833,-0.0219351,0.0143695,-0.0109869,-0.015063,-0.0187087,-0.0204038,-0.0165888,0.026714,0.0106352,0.00983902,-0.00739607,0.0036441,0.00480044,0.00563833,-0.00439129,-0.00479039,0.000497885,0.0077172,0.00980611,0.0104849,-0.00122392,-0.00214403,-0.00552252,0.835638,0.99072,1.24579,0.00265753,0.00882108,0.0266447,0.00971133,0.00788933,0.00290127,0.0316135,0.025865,0.00455376,-0.00887405,-0.00648754,0.00220626,-0.00325766,-0.00245231,-0.000926017,-0.00474045,-0.00319845,0.00157449,0.00774244,0.0068163,0.00394381,0.0173379,0.0175245,0.0156443,0.897285,1.05734,1.27082,-0.0664915,-0.0632237,-0.00350519,0.0150273,0.0143125,-0.000947217,0.0152207,0.0176816,-0.00927399,-0.00606151,-0.00748427,0.00587065,-0.00718684,-0.00683062,0.000739172,-0.009919,-0.00964066,-0.000362895,0.00372217,0.00398736,-0.000488986,-0.0122663,-0.0114893,0.000748659,0.893784,1.04899,1.24351,-0.0623369,-0.0575578,0.0176885,0.0242519,0.0223259,-0.000746408,0.0199491,0.0166367,0.00568082,-0.00685881,-0.00561326,-0.0016025,-0.0122112,-0.0116986,-0.000344779,-0.00882298,-0.00728206,0.00337885,0.00486313,0.00410035,0.00141105,-0.0111877,-0.0127677,0.00216461,0.899891,1.05486,1.2508,-0.0650875,-0.0589378,0.0149049,0.0274116,0.0256954,0.00153034,0.00133992,0.00027329,-0.00188881,-0.00101387,-0.000228716,0.00134515,-0.012759,-0.0120979,0.0000314,-0.00776352,-0.00597154,0.00376569,-0.00180571,-0.00291958,-0.00194817,-0.0102448,-0.0106831,0.00359506,0.89108,1.04076,1.23956,-0.0644385,-0.0538903,0.017954,0.0191789,0.0113601,-0.0109856,-0.00604845,-0.00818555,0.000130935,0.00553083,0.0072146,0.00386011,-0.00826959,-0.00396998,0.00663778,-0.00693675,-0.00628245,0.00285196,-0.00143075,-0.00321478,-0.00156011,-0.0164009,-0.0150334,-0.000255639,0.897824,1.04435,1.24926,-0.0661389,-0.0514119,0.0156785,0.0252962,0.0136438,-0.00541761,-0.0181556,-0.0168047,0.00340012,0.00818102,0.00739861,-0.00154789,-0.0126078,-0.00551667,0.00396361,-0.0067889,-0.00698827,0.00242845,-0.00281215,-0.00236092,0.000651788,-0.0132003,-0.00932632,0.00474052,0.864486,1.02012,1.25346,-0.0350868,-0.0293262,0.00978135,0.0141562,0.0101815,-0.00134955,-0.0276688,-0.0221489,0.00626477,0.0149559,0.0124313,-0.00185176,-0.00643675,-0.00423084,0.00110793,-0.00483596,-0.00397906,0.00262639,-0.00559889,-0.00378337,0.00073632,-0.003177,-0.00309594,0.00158166,0.72053,0.871234,1.11451,-0.0475521,-0.0539442,-0.072525,0.00408972,0.00462909,0.0065097,-0.0718517,-0.0813773,-0.110522,-0.0239441,-0.0271195,-0.0366261,-0.000412469,-0.000486045,-0.000499316,0.00119227,0.00138952,0.00159679,0.000590996,0.000659491,0.00098732,-0.0102455,-0.0115585,-0.0160822,0.554043,0.682762,0.856505,-0.164178,-0.185771,-0.253713,0.00486246,0.00567046,0.00736907,-0.0115287,-0.0132953,-0.0175601,-0.000514353,-0.000566084,-0.00078312,0.000250663,0.000290947,0.000380709,0.00250558,0.00285799,0.00385269,-0.000564506,-0.000535575,-0.000978515,0.00550317,0.00613435,0.00859816,0.549883,0.678136,0.850139,-0.164764,-0.186429,-0.254615,0.00141022,0.00171929,0.00199814,-0.00725001,-0.00837437,-0.0108846,-0.000110668,-0.000105685,-0.00015636,-0.0000790722,-0.0000841975,-0.000130516,0.00223036,0.00254053,0.00342256,0.00140334,0.00165797,0.00203674,0.00437827,0.00489055,0.00688251,0.545507,0.673312,0.843066,-0.16514,-0.186851,-0.255215,0.00259318,0.00300347,0.00399883,-0.00201245,-0.00229686,-0.00310629,0.000187179,0.000236477,0.00028981,0.00000358028,0.00000971133,0.00000454124,0.00320082,0.0036102,0.00494995,0.000395478,0.000459861,0.000608633,0.00243025,0.00274446,0.00375662,0.549686,0.677862,0.849849,-0.164907,-0.186611,-0.254816,0.000379343,0.000699523,0.000208761,0.0026304,0.00297089,0.00411154,0.000416818,0.0004999,0.000647846,-0.000073289,-0.0000576319,-0.000146185,0.00271013,0.00296216,0.00436443,-0.00154956,-0.0017457,-0.00243399,0.00405615,0.00458275,0.00627093,0.559088,0.68871,0.864048,-0.163703,-0.18522,-0.252995,0.00439774,0.00501152,0.00679482,0.0106475,0.0120547,0.0164536,0.0011909,0.00137585,0.00184028,0.000204575,0.000233385,0.00031595,0.00295751,0.00334878,0.00457098,0.000687408,0.000772403,0.00106334,0.00682936,0.00772332,0.0105549,0.751503,0.905845,1.15286,-0.0280399,-0.0321359,-0.049435,0.00376431,0.00446702,0.00848615,0.0565171,0.0642827,0.0922848,0.0168516,0.0192819,0.0288335,0.00140286,0.00164789,0.0030558,0.00351562,0.00399884,0.00566869,-0.00118207,-0.00137462,-0.00235897,-0.0128373,-0.0144879,-0.0192414,0.66063,0.79867,1.04636,0.0520614,0.0603918,0.0766293,0.000309106,0.000561037,-0.000549619,-0.118535,-0.138012,-0.161404,0.0214998,0.02502,0.0313314,0.0032567,0.00372724,0.00471288,0.00451941,0.0053238,0.00602131,0.00160138,0.00187596,0.00211849,-0.019328,-0.0226004,-0.0241777,0.9017,1.04256,1.18408,-0.0729311,-0.0679613,0.0281244,-0.0202786,-0.0190215,-0.0241151,0.0699189,0.0831358,0.0682412,-0.0164717,-0.0181805,-0.00828213,-0.00147427,-0.00247697,-0.00136184,-0.00414589,-0.00395112,0.00313507,-0.00896513,-0.00812805,-0.00699286,-0.0131257,-0.0172759,-0.00646157,0.990377,1.14293,1.25831,-0.112095,-0.111547,0.00277154,-0.0310692,-0.0286886,-0.0267805,0.00568724,0.00672971,0.000568232,0.00047997,0.000221362,0.00184195,0.00503145,0.00466597,0.00478352,0.000435739,0.0017353,0.0103361,0.0167489,0.0166814,0.0181073,-0.00826697,-0.0130836,-0.00497132,0.943388,1.09394,1.21635,-0.0946893,-0.0915054,0.0202694,0.00445953,0.00936129,0.0054609,-0.0146316,-0.0218428,-0.0134613,0.00823572,0.011589,0.00980028,-0.000989864,-0.00176461,0.000030687,-0.00332771,-0.00183973,0.00729782,-0.00427044,-0.0038221,-0.00378289,-0.0146649,-0.0190147,-0.0100417,0.972634,1.07035,1.19206,-0.124936,-0.0710254,0.0417403,0.00782377,0.00780725,0.00503257,-0.0201063,-0.0377624,-0.0298952,0.00939829,0.017727,0.0158442,-0.00233792,-0.0017079,-0.000648683,-0.00822116,-0.0000422889,0.00904492,-0.00194936,-0.0030476,-0.00209648,-0.0257498,-0.0157091,-0.00658624,1.05129,1.10191,1.22323,-0.170331,-0.0868376,0.0273426,-0.00287092,-0.0035023,-0.00514178,-0.00809715,-0.00656612,0.00591725,0.00198552,0.00180737,-0.000180852,0.00073405,0.00088698,0.00121845,-0.0134096,-0.00808425,0.000651755,0.00182269,0.00184729,0.0022726,-0.0181249,-0.00809011,0.00159574,0.862763,1.00886,1.22881,-0.0242279,-0.0155967,0.0219946,0.00382506,0.00298547,0.000687828,-0.0294913,-0.0132695,0.0303527,0.010474,0.00500245,-0.0123167,-0.000802806,-0.000633561,-0.0000459908,-0.00133052,0.00134656,0.00476882,-0.00184389,-0.0012597,-0.00018693,0.00233677,-0.00140647,-0.00428866,0.802521,0.958428,1.21189,0.0205155,0.0273023,0.0472665,-0.00178076,-0.00166762,0.00197392,0.00595946,0.00278019,-0.0185998,0.000122466,0.002091,0.0114087,-0.000537944,-0.000777996,-0.00251618,-0.00153114,-0.00104326,0.00388962,-0.00259553,-0.00280491,-0.00117331,0.0128128,0.0145349,0.013456,0.90615,1.0626,1.26432,-0.0711845,-0.0659583,0.00195198,-0.00305065,-0.00268392,-0.000922387,0.0145168,0.0139901,-0.0178586,-0.00586138,-0.0063453,0.00889806,-0.000837804,-0.00120591,-0.0015025,-0.0079938,-0.00683992,0.00201149,-0.001554,-0.00176204,-0.000428986,-0.011237,-0.0111375,0.00200094,0.884446,1.04203,1.2244,-0.0625224,-0.0590771,0.0277565,-0.00186661,-0.00162431,-0.0000465102,0.0115241,0.0129685,0.00166629,-0.00583102,-0.00657653,-0.00132088,0.00143527,0.00139638,0.000777222,-0.00491575,-0.00363351,0.007472,0.00144965,0.00171661,0.00245954,-0.0197761,-0.0211114,-0.0030184,0.9142,1.06121,1.23898,-0.0817431,-0.0702858,0.0194275,-0.00581542,-0.00664517,-0.00508237,0.014889,0.00787767,-0.000293704,-0.00659862,-0.00220788,0.00139547,0.00398048,0.00438899,0.00392675,-0.0103503,-0.00624182,0.00646579,0.00414989,0.00410424,0.00485165,-0.0169167,-0.018447,-0.00145447,0.917082,1.06045,1.23844,-0.0875811,-0.0686284,0.0215211,-0.00204503,0.000129995,0.00181737,-0.000800079,-0.00639018,0.00196588,0.00121588,0.00558583,0.00247841,0.00186337,0.000816318,0.00028007,-0.0122811,-0.0072482,0.00504297,-0.00189912,-0.00201309,-0.00208405,-0.0195851,-0.0154328,0.00241354,0.910238,1.04938,1.24767,-0.087322,-0.0615116,0.0133901,0.00314763,0.00359632,-0.00109313,-0.0140161,-0.0110093,0.00923403,0.00921021,0.00746425,-0.00248728,-0.00172386,-0.0020012,0.000528958,-0.0123036,-0.00650741,0.00388243,0.00180144,0.00190434,0.00115478,-0.024939,-0.0163533,0.000595244,0.864367,1.01498,1.24443,-0.037084,-0.0260349,0.0165367,0.00263944,0.00230976,0.00331261,-0.0276968,-0.0187877,0.0125169,0.0162519,0.0113769,-0.00445197,-0.00119607,-0.000814125,-0.00117438,-0.00625271,-0.00308753,0.00486203,-0.00186455,-0.00177291,-0.00147649,-0.00403633,-0.00280219,0.00198018,0.725074,0.876382,1.12152,-0.0470635,-0.0533894,-0.0717842,0.00832833,0.00942228,0.0130582,-0.0688837,-0.0780135,-0.105944,-0.0237157,-0.0268603,-0.0362788,-0.000101161,-0.000133728,-0.0000202226,0.00245645,0.00281908,0.00355428,0.00259516,0.00292515,0.00408413,-0.00957207,-0.0107951,-0.0150382,0.563616,0.693843,0.871043,-0.162846,-0.184249,-0.251671,0.0138529,0.0157006,0.0214091,-0.00780275,-0.00882908,-0.0120588,-0.000249881,-0.000255367,-0.000386179,0.00124164,0.00140566,0.0019189,0.00613283,0.00694291,0.00947802,0.00134433,0.00152077,0.0020776,0.00634808,0.00718118,0.00981068,0.559137,0.688776,0.864122,-0.163452,-0.184934,-0.252608,0.0105819,0.0119997,0.0163539,-0.00384389,-0.00434991,-0.00594055,0.000139135,0.000184776,0.000215026,0.000920217,0.00104199,0.00142215,0.00588196,0.00665907,0.00909031,0.0034442,0.00389662,0.00532286,0.00510713,0.00577713,0.00789285,0.554659,0.68371,0.857201,-0.163816,-0.185346,-0.25317,0.0117386,0.0133084,0.0181414,0.00118296,0.00133761,0.00182821,0.000435512,0.000520105,0.000673063,0.000988412,0.00111915,0.00152755,0.00694578,0.0078627,0.0107344,0.00250135,0.00282985,0.00386572,0.00306904,0.00347117,0.00474305,0.559137,0.688776,0.864122,-0.163533,-0.185026,-0.252733,0.0091934,0.0104287,0.014208,0.00567532,0.0064204,0.00877095,0.000641517,0.000753186,0.000991435,0.000871698,0.000987097,0.00134717,0.00660381,0.00747579,0.0102059,0.000647237,0.000732052,0.00100028,0.00469885,0.00531518,0.00726185,0.563616,0.693843,0.871043,-0.162846,-0.184249,-0.251671,0.00945511,0.0107248,0.0146124,0.0107938,0.0122116,0.0166814,0.00121155,0.00139813,0.00187239,0.000900844,0.00102007,0.00139221,0.00536173,0.00607046,0.00828631,0.000864462,0.000977826,0.00133599,0.00678481,0.00767531,0.0104856,0.751528,0.905878,1.15289,-0.0280379,-0.0321332,-0.049432,0.00375796,0.00445846,0.00847661,0.0564895,0.0642455,0.0922434,0.01685,0.0192797,0.0288311,0.00140249,0.00164738,0.00305523,0.00350978,0.00399097,0.00565992,-0.00117689,-0.00136764,-0.0023512,-0.0128261,-0.0144728,-0.0192246,0.695336,0.837426,1.08271,0.0308742,0.0368234,0.055224,0.033174,0.0375408,0.03591,-0.104026,-0.121797,-0.147061,0.0146549,0.0173656,0.0244975,-0.00727787,-0.00791685,-0.0056617,0.0120507,0.0138782,0.0153342,0.0123752,0.0140502,0.0137217,-0.0211581,-0.0245563,-0.0257718,0.877122,1.02161,1.16481,-0.0684848,-0.0650192,0.0251454,0.00963087,0.0138415,0.0262889,0.0485927,0.0610291,0.0370131,-0.0156077,-0.0177387,-0.00665367,-0.00264643,-0.00342649,-0.00611496,-0.00461262,-0.00314173,0.00624176,-0.00277284,-0.00332364,-0.00339644,-0.0155125,-0.0190865,-0.0101093,0.914859,1.06989,1.19792,-0.0851335,-0.0845644,0.0211499,0.00901242,0.0133142,0.0266001,0.0243643,0.0268769,0.0128557,-0.00675845,-0.00750541,-0.00502173,-0.00406894,-0.00512898,-0.00839518,-0.00918924,-0.00858314,0.00302708,-0.0012591,-0.00137436,-0.00105526,-0.0148917,-0.0178992,-0.00925746,0.953106,1.11029,1.23403,-0.100688,-0.100164,0.0110824,-0.00524365,0.000262618,0.0167953,-0.00207549,-0.00619902,-0.00710178,0.00176693,0.00337713,0.00389967,0.00155879,0.000334709,-0.00361867,-0.0105988,-0.0105472,0.000802635,0.00645651,0.00881611,0.00596021,-0.0110221,-0.0137557,-0.00614045,0.988172,1.13724,1.26004,-0.10505,-0.0991954,0.0128344,-0.0331342,-0.0200123,0.0011499,-0.0304282,-0.0360777,-0.0342194,0.00351717,0.00552308,0.0056748,0.00506319,0.00044405,-0.00445061,-0.00806675,-0.0101651,-0.000816573,0.0154816,0.0185117,0.0166722,-0.00251629,-0.00406628,0.00489118,0.944056,1.0922,1.23312,-0.0922935,-0.0850149,0.0200409,-0.0089949,0.00706024,0.0239636,-0.0218138,-0.0208359,-0.0000722013,0.00646876,0.00612675,0.000582514,0.000420262,-0.00519524,-0.00955478,-0.00840952,-0.012898,-0.00487025,0.00369611,0.00322543,0.00080872,-0.0113631,-0.0111548,0.00235256,0.863897,1.01873,1.2434,-0.0286592,-0.0255423,0.00994933,-0.000115702,0.00755916,0.0158064,-0.0341597,-0.028137,0.0146357,0.0148237,0.0134278,-0.0039819,-0.000603093,-0.00265639,-0.00475721,-0.00596541,-0.00733876,-0.00198133,0.000324702,-0.00308029,-0.00625101,0.00221832,0.000978251,-0.00230243,0.801064,0.957013,1.21371,0.0132136,0.0188958,0.0376621,0.0150168,0.0176718,0.0223797,-0.00692042,-0.0115019,-0.0294644,0.00280353,0.00492906,0.0129875,-0.00717694,-0.00834583,-0.0102222,0.000731549,0.00150048,0.00619812,0.00493363,0.00584408,0.00767239,0.00328953,0.00385796,0.00393075,0.912085,1.06858,1.28607,-0.0740632,-0.0690758,-0.0141858,-0.0413326,-0.0378201,-0.0217337,0.00545191,0.00495543,-0.020538,-0.00240474,-0.00283667,0.00943317,0.0201144,0.0186962,0.0112245,0.000746514,0.00106001,0.00941929,0.000663424,0.00151381,0.00512912,-0.0151781,-0.014852,-0.00436824,0.882912,1.03667,1.22648,-0.0514649,-0.0466451,0.0287647,-0.0176743,-0.0129862,0.0116879,0.0238145,0.0218595,0.00744271,-0.0111623,-0.0110179,-0.00535674,0.00725986,0.00573321,-0.00554573,-0.00638126,-0.00550666,0.0046667,-0.00571804,-0.00474347,-0.00319145,-0.0084139,-0.0101846,0.00221176,0.898185,1.05493,1.24645,-0.0676148,-0.0636739,0.0138885,-0.0196471,-0.0159524,0.00729754,0.0111823,0.0102126,0.00843482,-0.00548332,-0.00459506,-0.0033448,0.0101632,0.00850249,-0.00293899,-0.00833363,-0.0075589,0.00328917,-0.00347719,-0.00241585,-0.00224148,-0.0137341,-0.0147846,0.0000588091,0.907059,1.05847,1.25414,-0.0762589,-0.0665888,0.00853872,-0.027627,-0.0183531,0.00593656,-0.007249,-0.0100185,0.00190778,0.00335528,0.00531325,0.00051317,0.0142605,0.00904354,-0.00273874,-0.00812961,-0.00883224,0.00100756,0.000631153,0.00193789,-0.000464552,-0.0170319,-0.0148848,0.00101702,0.899373,1.05091,1.25916,-0.0674727,-0.057244,0.0068093,-0.0241006,-0.0154137,0.000273299,-0.0251613,-0.023039,-0.000286017,0.0126463,0.0117729,0.00145764,0.011997,0.00680498,-0.000699044,-0.00670079,-0.00692897,0.00301653,0.00567682,0.00459264,0.00132033,-0.0140121,-0.0113869,0.00175256,0.870113,1.02548,1.2561,-0.0366453,-0.0309856,0.008871,-0.0159702,-0.0109542,0.00200707,-0.0336629,-0.0283675,0.00337665,0.0163707,0.0140611,-0.00116708,0.00749559,0.00503211,-0.00104869,-0.00555829,-0.00525774,0.00190971,0.00659602,0.00452175,-0.000074244,-0.00108445,-0.000948982,0.00253733,0.789868,0.949537,1.21631,-0.00911252,-0.0104758,-0.0165453,0.0241234,0.0274545,0.0392661,-0.0181919,-0.0208268,-0.0317287,-0.00366167,-0.00420053,-0.00692165,0.00528928,0.00604637,0.00908243,-0.00492692,-0.00552825,-0.00698758,0.0095642,0.0108941,0.0158683,-0.00355553,-0.00406198,-0.00605875,0.758728,0.913711,1.15937,-0.022514,-0.0260741,-0.0437304,0.0507225,0.0579777,0.0867384,-0.00370833,-0.00425517,-0.00660255,0.0000729396,0.000111922,0.000143064,0.013602,0.0156822,0.025356,-0.0112788,-0.0127476,-0.0172895,0.00181162,0.00204164,0.00268343,-0.00490572,-0.00552338,-0.00716079,0.758728,0.913711,1.15937,-0.022514,-0.0260741,-0.0437304,0.0507225,0.0579777,0.0867384,-0.00370833,-0.00425517,-0.00660255,0.0000729396,0.000111922,0.000143064,0.013602,0.0156822,0.025356,-0.0112788,-0.0127476,-0.0172895,0.00181162,0.00204164,0.00268343,-0.00490572,-0.00552338,-0.00716079,0.75425,0.908644,1.15245,-0.0228776,-0.0264855,-0.0442923,0.0518791,0.0592863,0.0885259,0.00131852,0.00143235,0.00116621,0.000369316,0.000447251,0.000601101,0.0136702,0.0157593,0.0254614,-0.010215,-0.011544,-0.0156455,0.000868765,0.000974867,0.0012263,-0.00694381,-0.00782933,-0.0103106,0.758728,0.913711,1.15937,-0.0225948,-0.0261656,-0.0438552,0.0493339,0.0564066,0.0845925,0.00581088,0.00651513,0.00810895,0.000575321,0.000680332,0.000919473,0.0135535,0.0156273,0.025281,-0.010557,-0.0119309,-0.016174,-0.000985346,-0.00112293,-0.00163915,-0.00531401,-0.00598533,-0.00779178,0.755849,0.91041,1.15562,-0.0226727,-0.0262549,-0.0439569,0.0523576,0.0598737,0.0885384,0.00719001,0.00809654,0.00990879,0.000602426,0.000711411,0.000954845,0.0136129,0.0156954,0.0253585,-0.0117495,-0.0132983,-0.0177302,-0.00203722,-0.00232907,-0.00301189,-0.00555313,-0.00625952,-0.00810385,0.796241,0.956665,1.22493,-0.0068611,-0.00796482,-0.0136065,0.0152788,0.0176076,0.027977,0.0179561,0.0205238,0.0308504,0.00392171,0.00455279,0.00737316,0.00355315,0.00412452,0.00703021,-0.000793993,-0.000942731,-0.00194683,-0.007531,-0.00862594,-0.0131979,-0.00471064,-0.00533534,-0.00734516,0.810671,0.9705,1.2309,0.00230774,0.0035619,0.0153705,0.0113564,0.0148536,0.0281815,0.0000261859,-0.00205916,-0.0186128,0.000173618,0.00070702,0.0068509,-0.00210021,-0.00274358,-0.00723293,-0.00570316,-0.00660273,-0.00598362,0.00188373,0.00311903,0.00969842,0.0016037,0.0014709,-0.000489008,0.851495,1.01076,1.23803,-0.0198484,-0.0187502,0.0171313,-0.0242292,-0.0203943,0.0170053,0.00337817,0.00334071,-0.00939601,-0.000553022,-0.000402838,0.00407707,0.00990799,0.00949239,-0.00634749,0.00348742,0.00259634,0.000215179,-0.00243155,-0.0027282,0.00258371,-0.00374277,-0.00400346,-0.00036672,0.864311,1.02369,1.24052,-0.0276295,-0.0268353,0.013524,-0.0339446,-0.0306866,0.0153166,0.00921122,0.0082105,0.000580969,-0.0000475027,0.000412124,0.00328464,0.0148958,0.0146891,-0.00392412,0.00455747,0.00420807,0.000168371,-0.00557228,-0.00522167,-0.00288586,-0.00152245,-0.00242469,0.0000478238,0.869769,1.03016,1.24098,-0.029164,-0.0285731,0.0133017,-0.0378739,-0.0352208,0.014843,-0.00292918,-0.00418479,-0.00684525,0.00185321,0.00233888,0.00421779,0.0156131,0.0154839,-0.00380674,0.00511978,0.00463868,0.000160897,0.000899155,0.00148611,0.00189167,-0.000447518,-0.00102576,0.0000126403,0.875709,1.0358,1.2533,-0.0294543,-0.0285464,0.011731,-0.0469039,-0.0433948,0.00254362,-0.00681109,-0.00749957,-0.00432864,0.00260774,0.00309397,0.00391282,0.0163642,0.0159229,-0.00273634,0.0105258,0.00929811,0.00475462,0.0022692,0.00269881,0.000749243,-0.00157442,-0.00172877,0.00120345,0.86098,1.01799,1.24046,-0.0243427,-0.0226503,0.0146166,-0.0331143,-0.0262664,0.016798,-0.0115725,-0.0113693,-0.00309192,0.00422959,0.0045342,0.00360394,0.0131573,0.0121329,-0.00502544,0.00613398,0.00346771,-0.0015897,0.00477545,0.00447592,-0.000173458,-0.00231665,-0.00242774,0.00131392,0.846192,1.00622,1.26436,-0.00969652,-0.00884966,0.00227569,-0.0166894,-0.0129769,0.0044015,-0.0224726,-0.0204581,-0.00308799,0.00536151,0.00518464,-0.00000145144,0.00441295,0.0037548,-0.00167316,-0.000484463,-0.00165317,-0.00300473,0.00981904,0.00845944,0.000385,0.0050677,0.00466912,0.00204383,0.821468,0.980118,1.24193,0.00298807,0.00602613,0.0196806,0.00225569,0.0051833,0.0161659,0.0102585,0.00690266,-0.00745607,-0.00266514,-0.00151255,0.00469698,-0.00296688,-0.00428596,-0.00911379,-0.00230023,-0.00194186,-0.000226548,-0.00271816,-0.00153841,0.00341517,0.00575566,0.00550134,0.00502974,0.862898,1.02408,1.26142,-0.0336287,-0.0325218,0.002129,-0.027,-0.0254689,0.00132122,0.00978798,0.00880718,-0.00654104,-0.00408353,-0.00402176,0.00242439,0.0139971,0.0134727,-0.000267927,0.000348939,0.000526338,0.00160165,-0.0034802,-0.00334877,0.00262772,-0.00616216,-0.00670884,-0.000979873,0.870091,1.03275,1.26089,-0.0383652,-0.0381289,0.00428638,-0.0311358,-0.0302108,0.0024473,0.00478767,0.00629449,0.00122939,-0.00198388,-0.00244123,-0.0005046,0.0153488,0.0151996,-0.0016041,0.000317848,0.000245527,0.0010596,-0.00143042,-0.00214431,0.00000478028,-0.00683779,-0.00721978,0.000273657,0.879957,1.03785,1.25926,-0.0446258,-0.0421804,0.00398639,-0.0362348,-0.031092,0.00359237,0.00161176,0.00044476,0.0015101,-0.0000882249,0.000601463,0.0000875778,0.0176921,0.016023,-0.00161275,-0.000228559,-0.00131063,0.000899151,-0.00173388,-0.000735782,0.000154849,-0.00618551,-0.00674795,-0.000655956,0.863949,1.02182,1.25183,-0.0358987,-0.0327077,0.00853394,-0.0245212,-0.0188143,0.0110309,-0.00900998,-0.00911458,0.00178117,0.00452905,0.00479634,0.000362548,0.0133438,0.0110097,-0.00483936,-0.00179453,-0.00350897,-0.00150764,0.00261206,0.00285746,-0.000164333,-0.00652498,-0.00617356,0.000650038,0.859521,1.01651,1.25595,-0.03156,-0.0278862,0.00589085,-0.0231242,-0.0167402,0.00749497,-0.0139855,-0.012272,0.00380115,0.0073596,0.00683736,-0.000605628,0.0122037,0.00961933,-0.0031995,-0.00069909,-0.00250746,-0.000714578,0.00459517,0.00366218,-0.00142368,-0.00565182,-0.00532572,0.000290142,0.846839,1.00918,1.2593,-0.0200197,-0.0192563,0.00376693,-0.0128674,-0.0113459,0.0053999,-0.0175228,-0.0169074,0.00323457,0.00842655,0.00827265,-0.000726327,0.00680173,0.00620661,-0.00207971,-0.00284099,-0.00325209,-0.000642949,0.00524263,0.00476047,-0.0016963,-0.000856337,-0.000812321,0.000127697]+ "irradiance": [0.787525,0.947183,1.21709,-0.0128871,-0.0145809,-0.0199165,-0.0216912,-0.024515,-0.0335227,-0.0226589,-0.0256378,-0.0350183,-0.00620364,-0.00699162,-0.00958744,-0.00623858,-0.00705768,-0.00964144,-0.00212922,-0.00240502,-0.00329061,-0.0105509,-0.0119378,-0.0163059,-0.00414027,-0.00468563,-0.00639859,0.738265,0.891448,1.14096,-0.0415297,-0.0469878,-0.0641822,-0.0613031,-0.0693331,-0.0947412,-0.00666444,-0.00754116,-0.0102996,-0.000164008,-0.000158209,-0.000253468,-0.0219174,-0.0247971,-0.0338723,-0.00980345,-0.0110879,-0.0151508,-0.00276039,-0.00312344,-0.00426606,-0.00145615,-0.00164875,-0.0022504,0.729309,0.881314,1.12712,-0.0423377,-0.047902,-0.0654308,-0.0694891,-0.0785949,-0.107392,-0.00111113,-0.00125799,-0.00171721,0.000277233,0.000341024,0.000428451,-0.0223998,-0.0253429,-0.0346179,-0.012195,-0.0137937,-0.0188468,0.000610242,0.000690194,0.0009431,-0.00289992,-0.00328227,-0.00448168,0.730713,0.882817,1.12999,-0.0422207,-0.0477831,-0.0651795,-0.0681815,-0.0772021,-0.104706,-0.000105567,-0.000157073,0.000290288,0.000345297,0.000414431,0.000566535,-0.0223224,-0.0252653,-0.0344496,-0.0118267,-0.0134087,-0.0180765,0.00130537,0.00145204,0.0023292,-0.0026639,-0.00302302,-0.00401213,0.728741,0.880413,1.1266,-0.0424859,-0.0481277,-0.0655893,-0.0700713,-0.0795351,-0.107882,-0.000960902,-0.00106133,-0.00147903,0.000306268,0.000379351,0.000473721,-0.0225098,-0.0255126,-0.0347301,-0.0124155,-0.0141641,-0.0189978,0.000710847,0.000820995,0.00110476,-0.00292538,-0.00331484,-0.00452375,0.733188,0.885467,1.13337,-0.0419743,-0.0475229,-0.0648339,-0.0656833,-0.0744619,-0.10132,0.00234012,0.00285614,0.00338532,0.000539808,0.000658675,0.000811527,-0.022137,-0.0250626,-0.034193,-0.0109517,-0.0124003,-0.0169107,0.00290151,0.00339361,0.00436149,-0.00238978,-0.00277068,-0.00362079,0.790953,0.950546,1.22174,-0.00960934,-0.0109883,-0.0149955,-0.0201509,-0.0228444,-0.0312322,0.0199919,0.0231972,0.0316182,0.00565018,0.00651489,0.00885029,-0.00446565,-0.00506354,-0.0069162,-0.00271079,-0.00292546,-0.00401783,0.00975905,0.0111003,0.0151556,-0.00394261,-0.00468857,-0.00637572,0.80043,0.959497,1.21964,0.00645412,0.00822088,0.0191277,-0.0228593,-0.0271996,-0.0408302,-0.00124959,-0.00320312,-0.0192731,0.0000442618,0.000596887,0.00593995,0.00556251,0.00664996,0.0113406,-0.0101556,-0.011474,-0.0114822,-0.00496769,-0.00629709,-0.012119,0.00338247,0.00345799,0.00095456,0.848458,1.00687,1.23089,-0.0209843,-0.0200639,0.0131308,0.0205282,0.0159835,-0.0257747,0.0249861,0.026033,0.0126601,-0.00728294,-0.00760983,-0.0038616,-0.0103395,-0.009862,0.00613794,0.00196289,0.000880536,-0.0039639,0.0108324,0.0114116,0.00640161,-0.00283246,-0.0035553,-0.00260995,0.859746,1.01927,1.23207,-0.0309087,-0.0307285,0.00716808,0.025411,0.0219225,-0.0262936,-0.00728665,-0.00787074,-0.0104264,0.00227875,0.00257362,0.00252436,-0.0142463,-0.0140896,0.00384878,0.000711475,0.0000603973,-0.00453586,-0.0053483,-0.00584732,-0.00671187,-0.00309699,-0.00412065,-0.00525722,0.887024,1.04618,1.25643,-0.0336964,-0.0334101,0.00495107,0.0475925,0.0434579,-0.00617526,-0.0257427,-0.0256888,-0.0225421,0.00428324,0.0046078,0.00387745,-0.0156557,-0.0153536,0.00274048,0.00426499,0.00309772,-0.00135446,-0.0171647,-0.0173386,-0.0151042,0.00313787,0.00222937,0.000157575,0.860861,1.01998,1.24142,-0.0291394,-0.0285302,0.00787968,0.0279147,0.0233961,-0.0186315,0.00194643,0.00331597,0.00629931,0.000151121,0.0000981433,-0.000265415,-0.0129466,-0.0123367,0.00484026,0.00152113,-0.000171808,-0.00368937,0.000515942,0.000973695,0.00151363,-0.00311343,-0.00372396,-0.00314515,0.851952,1.01333,1.24106,-0.0280512,-0.028039,0.00569183,0.0203075,0.0180408,-0.0201102,-0.00186027,-0.000383994,0.0121599,0.00257478,0.00255672,-0.000575033,-0.0127177,-0.0125156,0.00393666,-0.00140883,-0.00229186,-0.00558708,0.000670471,0.00140391,0.00551579,-0.00419376,-0.00467296,-0.00302616,0.837801,1.00029,1.25404,-0.0108734,-0.0107503,0.00330604,0.0114898,0.0104906,-0.00914422,-0.0125489,-0.0116374,0.00698482,0.00564566,0.00571437,-0.000597829,-0.00448421,-0.00431887,0.00225954,-0.000345597,-0.000603219,-0.00238484,-0.00416895,-0.00369842,0.0037717,0.00129038,0.00100145,-0.0014038,0.822855,0.98442,1.24401,-0.00413528,-0.00278127,0.0135216,-0.00385839,-0.00576695,-0.017615,0.00793186,0.00731687,-0.00656624,-0.00308398,-0.00271287,0.0038042,0.00167588,0.00253031,0.00778838,-0.00532537,-0.00584045,-0.00425606,0.00189869,0.00153512,-0.00350694,0.00111005,0.00135305,0.00235252,0.856426,1.01829,1.25936,-0.0331005,-0.0321898,0.00236007,0.0209486,0.0194687,-0.00241979,0.00250405,0.00217153,-0.0079661,-0.00134294,-0.00128981,0.00321309,-0.0118914,-0.0112713,0.00060318,-0.00143842,-0.00168379,0.000729419,0.000992747,0.000934859,-0.00330917,-0.00885876,-0.0090276,-0.00149659,0.854941,1.01305,1.2414,-0.0295232,-0.0268548,0.0156954,0.0189124,0.0152432,-0.0159496,0.00376601,0.00200454,-0.00268628,0.000247801,0.000839469,0.00223331,-0.00992807,-0.00863086,0.00739872,-0.00209884,-0.00212305,-0.000825291,0.000678986,-0.0000639187,-0.00161088,-0.00617484,-0.00698776,0.000928884,0.857621,1.01847,1.24728,-0.0280213,-0.0262632,0.0160429,0.0206998,0.0186131,-0.0121911,-0.0094637,-0.009766,-0.0088507,0.00329657,0.0035793,0.00299273,-0.00914595,-0.00817396,0.00767468,-0.00185939,-0.00199672,-0.000694763,-0.00478797,-0.00507665,-0.00463016,-0.00320985,-0.00318618,0.00440399,0.857943,1.01687,1.24553,-0.0313005,-0.0288868,0.0131737,0.0219184,0.0183607,-0.013083,-0.00116127,-0.00185412,0.00289938,0.00121331,0.00174184,0.000062918,-0.0107889,-0.00935007,0.00666338,-0.00149652,-0.00192187,-0.000872913,-0.000378503,-0.00118638,0.0000301679,-0.00612903,-0.00653285,0.00114833,0.859842,1.01594,1.24695,-0.0319444,-0.0280139,0.0123883,0.0219176,0.0144239,-0.0141176,-0.0103569,-0.010106,0.00227779,0.00490684,0.0050293,0.000227109,-0.0105584,-0.00762797,0.00719434,-0.00184338,-0.00432353,-0.0024119,-0.00332948,-0.00327182,0.000712557,-0.00576788,-0.00531447,0.00196526,0.835139,0.993183,1.24986,-0.0129172,-0.0100428,0.00938641,0.00534684,0.000934724,-0.0120198,-0.0109252,-0.00739682,0.00738437,0.00566451,0.00451913,-0.00230207,-0.00276777,-0.00107285,0.00554712,-0.00359169,-0.00424925,-0.00210783,-0.00265897,-0.000820959,0.00407365,-0.00101329,-0.0014089,0.000631897,0.729509,0.881399,1.12839,-0.0467426,-0.0530278,-0.0712738,-0.00356345,-0.00403271,-0.00531712,-0.0666253,-0.0754591,-0.102446,-0.0236764,-0.0268165,-0.0362124,-0.000963657,-0.0011098,-0.00135111,0.0032422,0.00370849,0.00476497,-0.00185992,-0.00211558,-0.00279989,-0.00858878,-0.00968223,-0.0135223,0.563616,0.693843,0.871043,-0.163331,-0.184797,-0.252421,-0.00312799,-0.00351208,-0.00483417,-0.00570718,-0.00645809,-0.00882019,-0.000219454,-0.000220942,-0.000339157,-0.000316014,-0.000356715,-0.000488385,0.00451025,0.00510706,0.00697039,-0.00326112,-0.00368997,-0.00503991,0.00737592,0.0083441,0.0113992,0.558131,0.687417,0.862605,-0.16411,-0.185717,-0.253618,-0.00645017,-0.00728209,-0.0099665,-0.00289118,-0.00352236,-0.00442504,0.000028115,0.0000281891,0.0000488384,-0.000642888,-0.000727741,-0.00099334,0.00453556,0.00519622,0.00699909,-0.00120389,-0.0013717,-0.00185893,0.00567609,0.00632032,0.00878944,0.556993,0.6845,0.865249,-0.166633,-0.189837,-0.255901,-0.00703062,-0.00769724,-0.0119837,0.0087669,0.00880984,0.0177613,0.000675662,0.000274394,0.00211779,-0.000744517,-0.00074035,-0.00140942,0.00489892,0.00577597,0.00696908,-0.00333439,-0.00368336,-0.00579079,0.00745486,0.00844298,0.0127749,0.636202,0.773727,1.01852,-0.107938,-0.123673,-0.142421,-0.00873854,-0.00977028,-0.0150059,-0.000951478,-0.000963839,-0.00329603,-0.00020291,-0.000184486,-0.000601835,-0.00120158,-0.00134282,-0.00212771,0.00195993,0.00231153,0.00157805,-0.00225331,-0.00254749,-0.00354334,-0.000294205,-0.000213799,-0.00235455,0.564185,0.694217,0.872653,-0.163298,-0.18482,-0.252303,-0.00124702,-0.00139391,-0.00210309,0.0106638,0.0123635,0.0156605,0.00134455,0.00159612,0.00202414,-0.000267814,-0.000303581,-0.00042436,0.00524419,0.00600623,0.00793031,0.000544618,0.000625323,0.000984725,0.00715375,0.00797782,0.0113869,0.752768,0.90727,1.15655,-0.0276078,-0.0316267,-0.0483169,0.00190183,0.00226422,0.00371708,0.0567162,0.0646161,0.0921534,0.0168069,0.0192341,0.0286855,0.00103003,0.00120382,0.00212147,0.00452697,0.00522715,0.00804768,-0.000956053,-0.00112256,-0.0016803,-0.0131012,-0.0148419,-0.019643,0.674715,0.81523,1.06536,0.0494932,0.0573048,0.0730834,-0.021824,-0.0253275,-0.0301227,-0.109731,-0.127685,-0.149584,0.0206984,0.0240539,0.030216,0.00527432,0.00612627,0.00748254,0.0078576,0.0092333,0.0105385,-0.00609357,-0.00712035,-0.0081443,-0.0178702,-0.020912,-0.0222376,0.874752,1.01888,1.17202,-0.0623151,-0.0573277,0.0349625,-0.011394,-0.0161854,-0.0242395,0.036359,0.0495073,0.0373801,-0.0100805,-0.0116872,-0.00300913,0.00567534,0.00691519,0.00807799,-0.00255508,-0.00117361,0.00650741,0.0012261,0.0019383,0.0017276,-0.0209696,-0.0248986,-0.0129634,0.910026,1.06415,1.20009,-0.079913,-0.078421,0.0267208,0.015157,0.0144836,0.00025102,-0.00800894,-0.00852628,-0.0121696,0.00282825,0.00312156,0.00353289,-0.00456485,-0.00451594,-0.0005224,-0.00133626,0.000413043,0.00985012,0.00987081,0.0121048,0.00986544,-0.0187869,-0.0223027,-0.011434,0.908828,1.05329,1.17924,-0.0812439,-0.0791396,0.022777,0.0241736,0.0239419,0.00814951,0.024684,0.0303607,0.0315275,-0.00348928,-0.00245628,0.00129575,-0.00634432,-0.00528332,0.00144438,-0.00398694,-0.0031461,0.00700062,-0.00940876,-0.0152763,-0.0174798,-0.015337,-0.0190092,-0.0112715,0.945492,1.09089,1.23353,-0.099991,-0.0905363,0.00647648,-0.00438588,-0.018271,-0.0338954,-0.0282819,-0.0317935,-0.0260218,0.0135146,0.014279,0.0145096,0.00469196,0.00934347,0.0134221,-0.0128379,-0.0152892,-0.0078358,-0.0059198,-0.0090463,-0.00999934,-0.0151699,-0.0149952,-0.00867192,0.906894,1.05089,1.19714,-0.0620612,-0.0532011,0.0455801,-0.0157058,-0.0345185,-0.0474053,-0.0225705,-0.0202029,0.00351824,0.00805647,0.00750347,0.0016097,0.0149567,0.0211908,0.0227765,-0.00775836,-0.0128113,-0.00550164,-0.000453266,0.00042836,0.000800625,-0.00506358,-0.00500996,0.00679538,0.850215,1.00898,1.23213,-0.0235922,-0.0219398,0.0143702,-0.0110014,-0.0150907,-0.018749,-0.0203985,-0.0165914,0.0267005,0.0106448,0.00985148,-0.00738153,0.00364509,0.00480654,0.00564981,-0.00439503,-0.00480136,0.000478881,0.00772459,0.00981456,0.010493,-0.0012264,-0.00214059,-0.00551185,0.834891,0.989987,1.24508,0.00311037,0.00926639,0.0270795,0.0094821,0.00766508,0.00268369,0.0309175,0.0251835,0.00389342,-0.00856788,-0.00618722,0.00249794,-0.00315702,-0.00235386,-0.000830672,-0.00457589,-0.00303694,0.00173088,0.00758677,0.00666406,0.00379657,0.017202,0.0173924,0.0155181,0.897269,1.05734,1.27084,-0.0664859,-0.0632427,-0.00354323,0.0150024,0.0142884,-0.000964352,0.0152205,0.0176884,-0.00925051,-0.00605835,-0.00748671,0.00585448,-0.00717632,-0.00682111,0.000744171,-0.00992025,-0.0096463,-0.000372622,0.00372819,0.00399703,-0.000477135,-0.0122711,-0.0115034,0.00072923,0.893767,1.04897,1.2435,-0.0623196,-0.0575428,0.0176774,0.024191,0.0222509,-0.000801756,0.0199116,0.0165984,0.00565087,-0.00684472,-0.00559776,-0.0015858,-0.0121695,-0.0116469,-0.000304233,-0.00882083,-0.0072795,0.0033832,0.00485596,0.00409228,0.00139014,-0.01118,-0.0127622,0.00214717,0.895395,1.0504,1.24565,-0.0609681,-0.0548429,0.0196345,0.0283959,0.0267048,0.00270815,0.00455811,0.00351368,0.00186128,-0.00315957,-0.00239282,-0.00116619,-0.0133895,-0.0127402,-0.000713896,-0.00658165,-0.00479051,0.005129,-0.00227313,-0.00339104,-0.00249938,-0.00965227,-0.0100955,0.00427666,0.891083,1.04076,1.2395,-0.0644244,-0.0538802,0.0180192,0.0191589,0.0113311,-0.011035,-0.00605382,-0.00818486,0.000142483,0.00551517,0.00719147,0.00383248,-0.00823899,-0.00393235,0.00668387,-0.0069416,-0.00629361,0.00284626,-0.00144711,-0.00323302,-0.00157789,-0.0163961,-0.0150305,-0.000233863,0.897777,1.04431,1.24923,-0.0660986,-0.0513764,0.0157113,0.0252697,0.0136162,-0.0054486,-0.0181212,-0.0167722,0.00343317,0.00815586,0.0073728,-0.00157438,-0.0125914,-0.0054993,0.00398311,-0.00678651,-0.00698746,0.00242856,-0.00280144,-0.00234914,0.000665817,-0.0131927,-0.00931822,0.00474828,0.86456,1.02022,1.25358,-0.0351125,-0.0293698,0.00971955,0.0141615,0.0101978,-0.00132032,-0.0277406,-0.0222364,0.00616662,0.0149675,0.0124482,-0.00183032,-0.0064411,-0.00424256,0.00108754,-0.00485475,-0.00400085,0.0026033,-0.0055989,-0.00378529,0.000732154,-0.00315432,-0.00307322,0.00160195,0.72053,0.871234,1.11451,-0.0475523,-0.0539443,-0.0725253,0.00408954,0.00462884,0.00650939,-0.0718515,-0.0813771,-0.110522,-0.0239441,-0.0271196,-0.0366262,-0.000412498,-0.000486087,-0.000499373,0.00119229,0.00138955,0.00159683,0.000590877,0.000659323,0.000987109,-0.0102454,-0.0115583,-0.0160819,0.554022,0.682733,0.856469,-0.164179,-0.185773,-0.253716,0.00487418,0.00568697,0.00738949,-0.0115494,-0.0133244,-0.0175961,-0.000515301,-0.000567421,-0.000784773,0.000251201,0.000291704,0.000381645,0.00250715,0.00286021,0.00385543,-0.00055597,-0.000523544,-0.000963644,0.00549566,0.00612377,0.00858509,0.549895,0.678153,0.85016,-0.164763,-0.186428,-0.254613,0.00140348,0.00170979,0.00198641,-0.00723812,-0.00835761,-0.0108639,-0.000110123,-0.000104917,-0.00015541,-0.0000793812,-0.0000846329,-0.000131054,0.00222945,0.00253925,0.00342098,0.00139843,0.00165106,0.00202819,0.00438258,0.00489663,0.00689002,0.545447,0.673231,0.842973,-0.165145,-0.186858,-0.255223,0.00266841,0.00310573,0.00411486,-0.00200781,-0.00229071,-0.00309976,0.000188759,0.000238599,0.000292147,0.00000859452,0.000016541,0.0000123315,0.00316018,0.00355502,0.00488748,0.000395235,0.000459619,0.000608615,0.00243435,0.00274999,0.00376277,0.549688,0.67787,0.84984,-0.164904,-0.186607,-0.254813,0.000393155,0.00071103,0.000242418,0.00258541,0.00291131,0.00404263,0.000411519,0.000492851,0.000639791,-0.0000734863,-0.0000584927,-0.000145334,0.002692,0.00294107,0.00433123,-0.00152137,-0.00170858,-0.00239047,0.00406657,0.00459681,0.00628645,0.559089,0.688711,0.864049,-0.163703,-0.18522,-0.252995,0.0043969,0.00501033,0.00679336,0.0106467,0.0120536,0.0164522,0.0011908,0.00137571,0.0018401,0.00020447,0.000233237,0.000315768,0.00295765,0.00334898,0.00457123,0.000687896,0.000773091,0.00106419,0.00682959,0.00772364,0.0105553,0.751503,0.905844,1.15286,-0.0280399,-0.0321359,-0.049435,0.00376437,0.00446712,0.00848626,0.0565173,0.0642831,0.0922853,0.0168517,0.0192819,0.0288335,0.00140287,0.00164789,0.0030558,0.00351568,0.00399893,0.0056688,-0.00118212,-0.0013747,-0.00235906,-0.0128374,-0.0144881,-0.0192416,0.660699,0.798754,1.04654,0.0520551,0.0603856,0.0765828,0.000322358,0.000574966,-0.000530961,-0.118458,-0.137917,-0.161232,0.0214859,0.025003,0.031292,0.00326629,0.00374065,0.00473499,0.00451309,0.00531579,0.00600802,0.00160717,0.00188196,0.00212725,-0.0193015,-0.022567,-0.0241317,0.892092,1.03167,1.17432,-0.0659931,-0.0601096,0.0350835,-0.0273076,-0.0268985,-0.0309736,0.0745136,0.0882462,0.0726963,-0.0188114,-0.0208031,-0.0105572,0.00218146,0.00161891,0.0022198,-0.00481385,-0.00468933,0.00248368,-0.0063125,-0.00514103,-0.00429866,-0.0120981,-0.016128,-0.00545718,0.989778,1.14237,1.2578,-0.111804,-0.111279,0.00299844,-0.0307884,-0.0284351,-0.026542,0.00618648,0.00721632,0.00102069,0.000355939,0.0001132,0.00175501,0.00496608,0.00461215,0.00472917,0.000489946,0.00180001,0.010397,0.0165258,0.0164668,0.0179119,-0.00834952,-0.013166,-0.00505784,0.946034,1.09632,1.21826,-0.0966908,-0.0933253,0.0187989,0.00404898,0.00904026,0.00525541,-0.0123503,-0.019798,-0.0118466,0.00700665,0.0104838,0.00890556,-0.000728177,-0.00154295,0.000193639,-0.00411785,-0.00257872,0.00666978,-0.00455724,-0.00404436,-0.00392403,-0.0144021,-0.0187758,-0.00984178,0.970906,1.06874,1.19049,-0.124219,-0.0703655,0.0423742,0.00922668,0.00917581,0.00642154,-0.0200635,-0.0376255,-0.0296181,0.00943139,0.0177158,0.0157807,-0.00270431,-0.00206586,-0.00101472,-0.00867986,-0.000503755,0.00856262,-0.00228879,-0.00338732,-0.00243563,-0.0258118,-0.0157526,-0.00661461,1.05132,1.10196,1.22331,-0.17033,-0.0868393,0.027337,-0.00285238,-0.00348024,-0.00511375,-0.0081288,-0.00661426,0.0058372,0.00198481,0.00180876,-0.000176443,0.000732731,0.000885463,0.00121702,-0.0134153,-0.00809323,0.000636895,0.00180818,0.00183,0.00225055,-0.0181122,-0.00807126,0.00162662,0.862765,1.00893,1.22895,-0.0242206,-0.0156354,0.0218994,0.00378284,0.0029556,0.000686814,-0.0294971,-0.0133077,0.0302787,0.0104711,0.00501705,-0.0122814,-0.000781399,-0.000619644,-0.000048617,-0.00132993,0.00134735,0.00477194,-0.00182755,-0.00124823,-0.000186988,0.0023431,-0.00140681,-0.00429892,0.8025,0.958401,1.2119,0.0205361,0.0273275,0.0472568,-0.00175726,-0.00164068,0.00202201,0.00593817,0.00275467,-0.0185924,0.000135467,0.00210584,0.0114038,-0.000553091,-0.000795602,-0.00254595,-0.00151481,-0.0010251,0.00390013,-0.00258757,-0.00279596,-0.00115407,0.0128126,0.0145347,0.0134544,0.906162,1.0626,1.26429,-0.0711684,-0.0659266,0.00201022,-0.00299046,-0.00261101,-0.00085317,0.0145963,0.0140778,-0.0177752,-0.00591383,-0.00640361,0.00884124,-0.000871867,-0.00124896,-0.00154415,-0.00796498,-0.00680586,0.00204514,-0.00152717,-0.00173123,-0.000397931,-0.0112244,-0.0111193,0.00202704,0.884785,1.0424,1.22463,-0.0628441,-0.0594244,0.027528,-0.00198313,-0.00176122,-0.000170301,0.011553,0.012985,0.00166758,-0.00582853,-0.00656757,-0.00131605,0.00150001,0.00147149,0.000841689,-0.00498495,-0.00370644,0.00743365,0.00149064,0.00175928,0.00249329,-0.0198671,-0.0212128,-0.00310372,0.912446,1.05955,1.2375,-0.0805337,-0.0691317,0.0204652,-0.00501046,-0.00585375,-0.0043375,0.0160786,0.00901536,0.000711817,-0.00719223,-0.00277814,0.000883738,0.00358158,0.00399542,0.00355566,-0.010091,-0.00600548,0.00666478,0.00372576,0.00369279,0.00446791,-0.0170296,-0.018545,-0.00152598,0.900355,1.04436,1.22512,-0.0700143,-0.0517854,0.0354647,0.00190774,0.00432443,0.00527878,-0.00692356,-0.0121413,-0.00276185,0.00587461,0.00994567,0.00606609,-0.00108781,-0.00231218,-0.00230096,-0.00866445,-0.00390496,0.00780521,-0.00104744,-0.00111219,-0.00133484,-0.0136715,-0.00974471,0.00711979,0.91031,1.04946,1.24772,-0.0873563,-0.0615468,0.0133688,0.00320391,0.00366839,-0.00101686,-0.0141033,-0.0111047,0.00915697,0.00924007,0.0074972,-0.00246094,-0.00176252,-0.00205009,0.000478479,-0.0123354,-0.00654464,0.00384813,0.00179593,0.00189733,0.00114704,-0.0249093,-0.0163201,0.000624823,0.864382,1.01499,1.24443,-0.0370951,-0.0260409,0.0165361,0.00263361,0.00230715,0.00331043,-0.0277121,-0.0188008,0.0125136,0.016261,0.0113839,-0.00444803,-0.00119281,-0.000812994,-0.00117549,-0.0062562,-0.00309086,0.00486133,-0.00185944,-0.0017686,-0.00147071,-0.00403444,-0.00279908,0.00198115,0.725073,0.876382,1.12152,-0.0470636,-0.0533895,-0.0717843,0.00832831,0.00942226,0.0130582,-0.0688838,-0.0780136,-0.105944,-0.0237157,-0.0268603,-0.0362788,-0.000101175,-0.000133745,-0.0000202434,0.00245647,0.00281911,0.00355431,0.00259516,0.00292514,0.00408412,-0.00957204,-0.0107951,-0.0150381,0.563616,0.693843,0.871043,-0.162846,-0.184249,-0.251671,0.0138529,0.0157006,0.0214091,-0.00780275,-0.00882908,-0.0120588,-0.000249881,-0.000255367,-0.000386179,0.00124164,0.00140566,0.0019189,0.00613283,0.00694291,0.00947802,0.00134433,0.00152077,0.0020776,0.00634808,0.00718118,0.00981068,0.559137,0.688776,0.864122,-0.163452,-0.184934,-0.252608,0.0105819,0.0119997,0.0163539,-0.00384389,-0.00434991,-0.00594055,0.000139135,0.000184776,0.000215026,0.000920217,0.00104199,0.00142215,0.00588196,0.00665907,0.00909031,0.0034442,0.00389662,0.00532286,0.00510713,0.00577713,0.00789285,0.554659,0.68371,0.857201,-0.163816,-0.185346,-0.25317,0.0117386,0.0133084,0.0181414,0.00118296,0.00133761,0.00182821,0.000435512,0.000520105,0.000673063,0.000988412,0.00111915,0.00152755,0.00694578,0.0078627,0.0107344,0.00250135,0.00282985,0.00386572,0.00306904,0.00347117,0.00474305,0.559137,0.688776,0.864122,-0.163533,-0.185026,-0.252733,0.0091934,0.0104287,0.014208,0.00567532,0.0064204,0.00877095,0.000641517,0.000753186,0.000991435,0.000871698,0.000987097,0.00134717,0.00660381,0.00747579,0.0102059,0.000647237,0.000732052,0.00100028,0.00469885,0.00531518,0.00726185,0.563616,0.693843,0.871043,-0.162846,-0.184249,-0.251671,0.00945511,0.0107248,0.0146124,0.0107938,0.0122116,0.0166814,0.00121155,0.00139813,0.00187239,0.000900844,0.00102007,0.00139221,0.00536173,0.00607046,0.00828631,0.000864462,0.000977826,0.00133599,0.00678481,0.00767531,0.0104856,0.751528,0.905878,1.15289,-0.0280379,-0.0321332,-0.049432,0.00375796,0.00445846,0.00847661,0.0564895,0.0642455,0.0922434,0.01685,0.0192797,0.0288311,0.00140249,0.00164738,0.00305523,0.00350978,0.00399097,0.00565992,-0.00117689,-0.00136764,-0.0023512,-0.0128261,-0.0144728,-0.0192246,0.695362,0.83747,1.08284,0.0308914,0.0368367,0.0551988,0.0331055,0.0374699,0.0358346,-0.103983,-0.121738,-0.146932,0.0146571,0.0173652,0.0244768,-0.0072607,-0.00790037,-0.00563462,0.0120483,0.013876,0.0153257,0.0123211,0.0139903,0.0136591,-0.0211287,-0.0245212,-0.0257266,0.876734,1.02113,1.16434,-0.0680398,-0.0644811,0.0256916,0.00972468,0.0139546,0.0263784,0.0491184,0.0616534,0.037675,-0.0158181,-0.0179843,-0.00691313,-0.00262405,-0.00340645,-0.00610511,-0.0045511,-0.00305596,0.00634529,-0.00279686,-0.00335794,-0.00344578,-0.0155081,-0.0190734,-0.0100821,0.914124,1.0692,1.19719,-0.0847327,-0.0841974,0.0215096,0.0123131,0.016651,0.0300358,0.0217559,0.0242162,0.0100686,-0.00668783,-0.00743557,-0.00494994,-0.00462404,-0.00569232,-0.00898289,-0.010676,-0.0100872,0.00148087,-0.00116345,-0.001274,-0.000923981,-0.0140818,-0.0170734,-0.00841692,0.953091,1.11034,1.23415,-0.100653,-0.100142,0.0110892,-0.00506419,0.00041115,0.0168886,-0.00236227,-0.00650738,-0.00741845,0.00181057,0.00342364,0.00394354,0.0015088,0.000285598,-0.00366177,-0.0106937,-0.0106355,0.000730525,0.0065697,0.00893259,0.00607758,-0.0109511,-0.0136708,-0.006047,0.987177,1.13627,1.25906,-0.104908,-0.0990458,0.0130016,-0.032475,-0.019411,0.00171641,-0.02974,-0.0354052,-0.0335416,0.00350846,0.00551241,0.00566233,0.00499208,0.000384368,-0.00450118,-0.00807104,-0.0101528,-0.000789515,0.0151817,0.0182033,0.0163441,-0.00279554,-0.00433551,0.0046212,0.944133,1.09225,1.23313,-0.0923315,-0.0850243,0.0200746,-0.00905077,0.00699389,0.0238948,-0.0218331,-0.0208726,-0.000125882,0.00647704,0.00614387,0.000608614,0.000439933,-0.00517187,-0.00953246,-0.00840291,-0.0128859,-0.00485262,0.00369806,0.0032292,0.00080943,-0.0113567,-0.0111382,0.00238522,0.863848,1.01868,1.24336,-0.0286146,-0.0254965,0.00998359,-0.0000837946,0.00759159,0.0158306,-0.0341322,-0.0281105,0.0146517,0.0148027,0.0134063,-0.00399787,-0.000620732,-0.00267439,-0.00477074,-0.00596277,-0.00733628,-0.00198029,0.000309567,-0.00309572,-0.00626255,0.00222624,0.000987103,-0.00229394,0.801134,0.957097,1.2138,0.0131809,0.0188556,0.0376221,0.0150157,0.0176717,0.0223755,-0.00685284,-0.0114195,-0.029378,0.00277849,0.00489767,0.0129551,-0.00718254,-0.00835249,-0.0102276,0.000720731,0.00148681,0.0061854,0.00493222,0.00584295,0.00766881,0.00330576,0.00387784,0.00395242,0.919658,1.07682,1.29288,-0.0810905,-0.0767203,-0.0204918,-0.0436704,-0.0403552,-0.0238425,0.0101218,0.0100522,-0.0162894,-0.00555079,-0.00626485,0.00657709,0.0216875,0.0204009,0.0126414,-0.000913171,-0.000750472,0.00792892,-0.000359035,0.000401645,0.00421207,-0.0165157,-0.0163011,-0.0055596,0.882966,1.03673,1.22651,-0.0515062,-0.046694,0.0287433,-0.0176653,-0.0129664,0.011768,0.0238818,0.0219362,0.00754963,-0.0111769,-0.0110348,-0.00538562,0.00727405,0.00574298,-0.00556698,-0.00638038,-0.00550691,0.00465685,-0.00571577,-0.00474266,-0.00319163,-0.00841992,-0.0101934,0.00221332,0.905809,1.06318,1.25319,-0.0745471,-0.0711669,0.00776399,-0.0211127,-0.0175229,0.00604653,0.00596046,0.00449697,0.00364609,-0.00204212,-0.000825783,-0.000184712,0.0111366,0.00954672,-0.00210238,-0.0102933,-0.00968326,0.00153627,-0.00274738,-0.00161639,-0.00157557,-0.0147242,-0.0158497,-0.000799816,0.907232,1.0587,1.25441,-0.0764341,-0.0668213,0.00826284,-0.0277307,-0.0184916,0.00577201,-0.00726748,-0.0100502,0.0018732,0.00337456,0.00534338,0.000548733,0.0143351,0.00914322,-0.00261971,-0.00813924,-0.00884529,0.000992785,0.0006411,0.00195379,-0.000445811,-0.0170945,-0.0149673,0.000917431,0.899308,1.05082,1.25904,-0.0674368,-0.0571996,0.00687019,-0.0240288,-0.0153295,0.000372359,-0.0251378,-0.0230062,-0.000218911,0.0126347,0.0117577,0.00143303,0.0119654,0.0067683,-0.000740406,-0.00672643,-0.00695614,0.0029953,0.00565656,0.00456741,0.00128579,-0.0140083,-0.0113838,0.00174709,0.870229,1.02562,1.25628,-0.0366869,-0.0310534,0.00877033,-0.0160365,-0.011033,0.00191904,-0.0337646,-0.0284734,0.00326251,0.0163929,0.0140896,-0.0011298,0.00751638,0.00505944,-0.00101563,-0.0055679,-0.00526774,0.00189617,0.00663359,0.00456205,-0.0000332479,-0.00105405,-0.000929164,0.00254514,0.789868,0.949537,1.21631,-0.00911252,-0.0104758,-0.0165453,0.0241234,0.0274545,0.0392661,-0.0181919,-0.0208268,-0.0317287,-0.00366167,-0.00420053,-0.00692165,0.00528928,0.00604637,0.00908243,-0.00492692,-0.00552825,-0.00698758,0.0095642,0.0108941,0.0158683,-0.00355553,-0.00406198,-0.00605875,0.758728,0.913711,1.15937,-0.022514,-0.0260741,-0.0437304,0.0507225,0.0579777,0.0867384,-0.00370833,-0.00425517,-0.00660255,0.0000729396,0.000111922,0.000143064,0.013602,0.0156822,0.025356,-0.0112788,-0.0127476,-0.0172895,0.00181162,0.00204164,0.00268343,-0.00490572,-0.00552338,-0.00716079,0.758728,0.913711,1.15937,-0.022514,-0.0260741,-0.0437304,0.0507225,0.0579777,0.0867384,-0.00370833,-0.00425517,-0.00660255,0.0000729396,0.000111922,0.000143064,0.013602,0.0156822,0.025356,-0.0112788,-0.0127476,-0.0172895,0.00181162,0.00204164,0.00268343,-0.00490572,-0.00552338,-0.00716079,0.75425,0.908644,1.15245,-0.0228776,-0.0264855,-0.0442923,0.0518791,0.0592863,0.0885259,0.00131852,0.00143235,0.00116621,0.000369316,0.000447251,0.000601101,0.0136702,0.0157593,0.0254614,-0.010215,-0.011544,-0.0156455,0.000868765,0.000974867,0.0012263,-0.00694381,-0.00782933,-0.0103106,0.758728,0.913711,1.15937,-0.0225948,-0.0261656,-0.0438552,0.0493339,0.0564066,0.0845925,0.00581088,0.00651513,0.00810895,0.000575321,0.000680332,0.000919473,0.0135535,0.0156273,0.025281,-0.010557,-0.0119309,-0.016174,-0.000985346,-0.00112293,-0.00163915,-0.00531401,-0.00598533,-0.00779178,0.755849,0.91041,1.15562,-0.0226727,-0.0262549,-0.0439569,0.0523576,0.0598737,0.0885384,0.00719001,0.00809654,0.00990879,0.000602426,0.000711411,0.000954845,0.0136129,0.0156954,0.0253585,-0.0117495,-0.0132983,-0.0177302,-0.00203722,-0.00232907,-0.00301189,-0.00555313,-0.00625952,-0.00810385,0.796241,0.956665,1.22493,-0.0068611,-0.00796482,-0.0136065,0.0152788,0.0176076,0.027977,0.0179561,0.0205238,0.0308504,0.00392171,0.00455279,0.00737316,0.00355315,0.00412452,0.00703021,-0.000793993,-0.000942731,-0.00194683,-0.007531,-0.00862594,-0.0131979,-0.00471064,-0.00533534,-0.00734516,0.810653,0.970482,1.23088,0.00232738,0.00358347,0.0153896,0.0113681,0.0148658,0.0281917,0.0000217245,-0.00206222,-0.0186124,0.000179594,0.000713134,0.00685552,-0.00210942,-0.00275379,-0.00724228,-0.00570298,-0.00660271,-0.00598412,0.00188615,0.00312093,0.00969887,0.00161114,0.00147993,-0.000479557,0.851575,1.01085,1.23812,-0.0198662,-0.0187774,0.0170956,-0.0242858,-0.0204582,0.0169449,0.00344454,0.00341598,-0.00932853,-0.000551541,-0.000401527,0.00407874,0.00991722,0.00950608,-0.00632998,0.00349009,0.00259721,0.000213478,-0.00247538,-0.00277842,0.00253788,-0.00372395,-0.00398512,-0.00035362,0.864369,1.02378,1.24059,-0.0276791,-0.0269008,0.0134506,-0.0339689,-0.0307272,0.0152819,0.00922538,0.00822828,0.000622183,-0.0000629948,0.000393623,0.00326382,0.0149117,0.0147113,-0.00389835,0.00454624,0.00419759,0.000157783,-0.00557914,-0.00523043,-0.00290654,-0.00152979,-0.00243377,0.0000308178,0.869876,1.03031,1.24115,-0.0291848,-0.028602,0.0132662,-0.0380088,-0.0354107,0.0146244,-0.00287332,-0.00410443,-0.00673572,0.00184214,0.00232335,0.00420093,0.015635,0.0155145,-0.00377014,0.00518569,0.00473198,0.000273048,0.000866898,0.00143857,0.00182675,-0.000451868,-0.00103143,0.00000150164,0.867748,1.02917,1.24811,-0.0272299,-0.0266749,0.0132334,-0.0383035,-0.0362284,0.00817639,-0.00970733,-0.0100104,-0.00645388,0.00313614,0.00354674,0.00428825,0.0146057,0.0144388,-0.00393252,0.00692422,0.00629626,0.00239353,0.00453814,0.00465949,0.00239662,-0.00164444,-0.00178522,0.00116593,0.860957,1.01797,1.24043,-0.0243278,-0.022633,0.0146355,-0.0331035,-0.0262539,0.0168128,-0.0115546,-0.0113481,-0.00306673,0.00422099,0.00452422,0.00359303,0.0131524,0.0121272,-0.00503164,0.00613709,0.00347145,-0.00158543,0.00476984,0.00446926,-0.000181688,-0.00231855,-0.0024301,0.00131063,0.846359,1.00639,1.26455,-0.00970213,-0.00885695,0.00226114,-0.016787,-0.0130791,0.00427572,-0.0226461,-0.0206322,-0.00327316,0.00536837,0.00519188,0.00000763454,0.00441352,0.00375668,-0.0016659,-0.000497745,-0.00166438,-0.00300799,0.00989641,0.00853754,0.000470021,0.00513044,0.00473147,0.00210771,0.821445,0.980077,1.24187,0.00299963,0.00604819,0.0197138,0.00227387,0.00521303,0.0162067,0.0102459,0.00687963,-0.00748998,-0.00266289,-0.00150641,0.00470744,-0.00297444,-0.00429832,-0.00913092,-0.00230214,-0.00194415,-0.000228636,-0.00271072,-0.00152603,0.00343251,0.00575436,0.00549984,0.00502817,0.86295,1.02415,1.2615,-0.0336859,-0.0325929,0.00204932,-0.0270068,-0.0254805,0.00130104,0.00983096,0.00885874,-0.00648609,-0.00411193,-0.00405551,0.00238873,0.0140076,0.0134867,-0.000249815,0.00032854,0.000502612,0.00157894,-0.00349315,-0.00336428,0.00261146,-0.00617644,-0.00672611,-0.000998223,0.877001,1.03968,1.26805,-0.0397941,-0.0395642,0.00279954,-0.0374129,-0.036501,-0.0040554,0.0000642612,0.00158504,-0.00360583,-0.0012681,-0.00172984,0.000220395,0.016293,0.0161486,-0.000620506,0.00197241,0.00190372,0.00277537,0.00168113,0.000959892,0.003197,-0.00577403,-0.00615475,0.00137119,0.879935,1.03783,1.25922,-0.0446091,-0.0421615,0.00400893,-0.0362317,-0.0310864,0.00360764,0.0016326,0.000472146,0.0015494,-0.0000984803,0.000589005,0.0000719449,0.0176889,0.0160193,-0.0016188,-0.000221472,-0.00130279,0.00090586,-0.00173596,-0.000740003,0.000143987,-0.00618771,-0.00675187,-0.000662998,0.863922,1.02178,1.25178,-0.0358785,-0.0326762,0.00857331,-0.0245041,-0.0187865,0.0110654,-0.00900443,-0.00910569,0.00179191,0.00452768,0.0047942,0.000359974,0.013334,0.0109941,-0.00485888,-0.00179469,-0.00350963,-0.00150844,0.00261104,0.00285515,-0.000166841,-0.00652185,-0.00616871,0.000656201,0.859544,1.01654,1.25597,-0.031565,-0.0278903,0.00588811,-0.0231339,-0.0167514,0.00748436,-0.0140105,-0.012298,0.00377861,0.0073638,0.00684099,-0.000602976,0.0122054,0.00962116,-0.00319783,-0.000703322,-0.00251141,-0.000717633,0.00460303,0.00367121,-0.0014151,-0.00564231,-0.00531549,0.000299243,0.846834,1.00918,1.25931,-0.0200134,-0.0192522,0.00376727,-0.0128676,-0.0113528,0.00538542,-0.0175175,-0.0169028,0.00323909,0.00842179,0.00826624,-0.000734139,0.00680081,0.0062085,-0.0020742,-0.00283825,-0.00324714,-0.000635519,0.00524152,0.00475977,-0.00169684,-0.000855674,-0.000811585,0.000127693]}diff --git a/pipeline/src/modeling/displace.ts b/pipeline/src/modeling/displace.tsindex efeeaba87..d48e5682b 100644--- a/pipeline/src/modeling/displace.ts+++ b/pipeline/src/modeling/displace.ts@@ -209,7 +209,7 @@ function finestShare(p: DisplaceParams): number {* like any other, and the new vertex joins that face's outline: it keeps its shape and no gap opens. Left whole, such an edge* could never get short, and the triangles against it would go on splitting for as long as there was budget.*/-function refine(mesh: PolyMesh, chosen: ReadonlySet<number>, longest: number): { mesh: PolyMesh; short: boolean } {+function refine(mesh: PolyMesh, chosen: ReadonlySet<number>, longest: number, budget: number): { mesh: PolyMesh; short: boolean } {const positions: Vec3[] = [...mesh.positions];// Room for every vertex the budget could make, in a number that stays exact.const keyOf = (a: number, b: number): number => (a < b ? a * 67108864 + b : b * 67108864 + a);@@ -246,7 +246,7 @@ function refine(mesh: PolyMesh, chosen: ReadonlySet<number>, longest: number): {after += 1 + (mask & 1) + ((mask >> 1) & 1) + ((mask >> 2) & 1);}if (made.size === 0) break;- if (after + outside > MAX_DISPLACE_TRIANGLES) { short = true; break; }+ if (after + outside > budget) { short = true; break; }moved = true;const middle = (a: number, b: number): number => {const key = keyOf(a, b);@@ -303,7 +303,7 @@ function refine(mesh: PolyMesh, chosen: ReadonlySet<number>, longest: number): {return { mesh: { positions, faces }, short };}-export function displace(mesh: PolyMesh, p: DisplaceParams): PolyMesh {+export function displace(mesh: PolyMesh, p: DisplaceParams, budget = MAX_DISPLACE_TRIANGLES): PolyMesh {if (!DISPLACE_PATTERNS.includes(p.pattern)) throw new Error(`pattern ${JSON.stringify(p.pattern)} must be one of ${DISPLACE_PATTERNS.join(', ')}`);if (!(p.scale > 0)) throw new Error(`scale ${p.scale} must be positive`);if (p.octaves !== undefined && !(p.octaves >= 1 && p.octaves <= 6)) throw new Error(`octaves ${p.octaves} must be 1..6`);@@ -328,7 +328,7 @@ export function displace(mesh: PolyMesh, p: DisplaceParams): PolyMesh {const smallest = Math.min(...(p.stretch ?? [1, 1, 1])) * p.scale;const longest = p.detail ?? smallest * finestShare(p);- const { mesh: fine, short } = refine(mesh, new Set(hit), longest);+ const { mesh: fine, short } = refine(mesh, new Set(hit), longest, budget);// Splitting puts the step's faces last, in place of the ones it was given; with nothing to split they are where they were.const chosen = new Set(hit);@@ -383,5 +383,5 @@ export function displace(mesh: PolyMesh, p: DisplaceParams): PolyMesh {});const out = compact({ positions, faces: fine.faces });- return short ? { ...out, notes: [`this pattern wants edges of ${longest.toPrecision(3)} and stopped at ${MAX_DISPLACE_TRIANGLES} triangles, so its finest detail is lost: raise \`scale\`, narrow it with \`faces\` or \`near\`, or give a larger \`detail\``] } : out;+ return short ? { ...out, notes: [`this pattern wants edges of ${longest.toPrecision(3)} and stopped at ${budget} triangles, so its finest detail is lost: raise \`scale\`, narrow it with \`faces\` or \`near\`, or give a larger \`detail\``] } : out;}diff --git a/pipeline/src/modeling/modelSource.ts b/pipeline/src/modeling/modelSource.tsindex ccef4b268..040423efd 100644--- a/pipeline/src/modeling/modelSource.ts+++ b/pipeline/src/modeling/modelSource.ts@@ -96,7 +96,7 @@ export const MODEL_OPS: Record<string, OpSpec> = {slice: { params: { faces: 'faces', axis: 'axis', at: 'number|numbers' }, required: ['axis', 'at'], run: ops.slice as OpSpec['run'], says: 'cuts faces across planes, making the seams a window sits between' },boolean: { params: { operation: 'operation', with: 'faces', from: 'faces', keep: 'boolean', tag: 'string', color: 'color' }, required: ['operation', 'with'], run: booleanOp as unknown as OpSpec['run'], says: 'cuts or joins closed solids: subtract `with` from `from` makes a real hole' },subdivide: { params: { faces: 'faces', levels: 'integer', crease: 'number' }, required: [], run: subdivide as unknown as OpSpec['run'], says: 'rounds whole shells into smooth surfaces, keeping edges sharper than `crease` degrees' },- displace: { params: { faces: 'faces', near: 'near', pattern: 'pattern', amplitude: 'number', scale: 'number', octaves: 'integer', seed: 'integer', stretch: 'vec3', warp: 'number', width: 'number', axis: 'axis', mirror: 'axis', detail: 'number' }, required: ['pattern', 'amplitude', 'scale'], run: displace as unknown as OpSpec['run'], says: 'pushes fine detail out of the surface along its normal, splitting faces as far as the pattern needs: bumps, wrinkles, cracks, scales, pores, ribs, weave or scratches' },+ displace: { params: { faces: 'faces', near: 'near', pattern: 'pattern', amplitude: 'number', scale: 'number', octaves: 'integer', seed: 'integer', stretch: 'vec3', warp: 'number', width: 'number', axis: 'axis', mirror: 'axis', detail: 'number' }, required: ['pattern', 'amplitude', 'scale'], run: ((mesh: PolyMesh, params: never) => displace(mesh, params)) as OpSpec['run'], says: 'pushes fine detail out of the surface along its normal, splitting faces as far as the pattern needs: bumps, wrinkles, cracks, scales, pores, ribs, weave or scratches' },decimate: { params: { faces: 'faces', ratio: 'number', triangles: 'integer', error: 'number' }, required: [], run: decimate as unknown as OpSpec['run'], says: 'leaves fewer triangles over the same surface: `ratio` to keep or `triangles` to end with, stopping sooner if the surface would move more than `error` (default 0.02) of its size' },uv: { params: { faces: 'faces', mode: 'uvmode', axis: 'string', at: 'vec3', scale: 'number|vec2only', repeat: 'number|vec2only', offset: 'vec2', rotate: 'number' }, required: ['mode'], run: uvStep as unknown as OpSpec['run'], says: 'sets how faces take a texture: box, planar, cylinder or sphere' },delete: { params: { faces: 'faces' }, required: ['faces'], run: ops.deleteFaces as OpSpec['run'], says: 'removes faces, leaving a hole' },diff --git a/pipeline/tests/modeling-displace.test.ts b/pipeline/tests/modeling-displace.test.tsindex 58442d48a..2622f337b 100644--- a/pipeline/tests/modeling-displace.test.ts+++ b/pipeline/tests/modeling-displace.test.ts@@ -3,7 +3,7 @@/** Fine detail pushed out of a surface: that it moves what was asked, by what was asked, and stays one surface. */import { beforeAll, describe, expect, it } from 'vitest';import { bakeModel, bakeNormalMap, prepareModeling, validateModelSource, type BakedModel, type ModelStep } from '../src/modeling';-import { DISPLACE_PATTERNS, MAX_DISPLACE_TRIANGLES } from '../src/modeling/displace';+import { displace, DISPLACE_PATTERNS, MAX_DISPLACE_TRIANGLES } from '../src/modeling/displace';beforeAll(() => prepareModeling());@@ -24,7 +24,7 @@ function heights(m: BakedModel): { min: number; max: number; mean: number } {describe('displace', () => {it.each(DISPLACE_PATTERNS)('%s moves a closed ball within its amplitude, and leaves it closed', (pattern) => {- const m = model(ball, { op: 'displace', pattern, amplitude: 0.05, scale: 0.3 });+ const m = model(ball, { op: 'displace', pattern, amplitude: 0.05, scale: 0.8 });expect(m.report.openEdges).toBe(0);expect(m.report.nonManifoldEdges).toBe(0);expect(m.report.insideOutShells).toBe(0);@@ -103,11 +103,6 @@ describe('displace', () => {expect(m.poly.positions.some((p) => Math.abs(p[1]) > 0.005)).toBe(true);});- it('a model too dense to lay out for light still builds, and says what it went without', () => {- const m = model(sheet, { op: 'displace', pattern: 'bumps', amplitude: 0.01, scale: 0.1, detail: 0.004 });- expect(m.report.warnings.join()).toMatch(/no lightmap UV/);- }, 60000);-it('keeps paint and tags on what it splits', () => {const m = model({ ...sheet, color: [0.2, 0.4, 0.6] }, { op: 'displace', pattern: 'bumps', amplitude: 0.05, scale: 0.3 });for (const f of m.poly.faces) { expect(f.color).toEqual([0.2, 0.4, 0.6, 1]); expect(f.tag).toBe('sheet'); }@@ -141,15 +136,21 @@ describe('displace', () => {});it('stops at its budget and says so, rather than asking for more memory than there is', () => {- const m = model({ op: 'plane', size: 100 }, { op: 'displace', pattern: 'bumps', amplitude: 0.01, scale: 0.05 });- expect(m.report.triangles).toBeLessThanOrEqual(MAX_DISPLACE_TRIANGLES);- expect(m.report.warnings.join()).toMatch(/stopped at 1500000 triangles/);- }, 60000);+ const out = displace({ positions: [[-50, 0, 50], [50, 0, 50], [50, 0, -50], [-50, 0, -50]], faces: [{ v: [0, 1, 2, 3], tag: '' }] }, { pattern: 'bumps', amplitude: 0.01, scale: 0.05 }, 5000);+ expect(out.faces.length).toBeLessThanOrEqual(5000);+ expect(out.faces.length).toBeGreaterThan(1000);+ expect(out.notes!.join()).toMatch(/stopped at 5000 triangles/);+ });++ it('its budget is what a whole model has room for', () => {+ expect(MAX_DISPLACE_TRIANGLES).toBe(1500000);+ });- it('a heavy result says what to do about it', () => {- const m = model(sheet, { op: 'displace', pattern: 'bumps', amplitude: 0.01, scale: 0.1, detail: 0.004 });+ it('a heavy result says what to do about it, and goes without what would cost minutes', () => {+ const m = model(sheet, { op: 'displace', pattern: 'bumps', amplitude: 0.01, scale: 0.1, detail: 0.006 });expect(m.report.triangles).toBeGreaterThan(300000);expect(m.report.warnings.join()).toMatch(/end with a `decimate`/);+ expect(m.report.warnings.join()).toMatch(/no lightmap UV/);}, 60000);it('says when a pattern is too steep for a map to draw', () => {diff --git a/sdk/src/lightmap/pack.ts b/sdk/src/lightmap/pack.tsindex 15cd20b55..e3a80d5d3 100644--- a/sdk/src/lightmap/pack.ts+++ b/sdk/src/lightmap/pack.ts@@ -2,7 +2,7 @@// SPDX-FileCopyrightText: Copyright (c) 2024-present ESEngine Team/*** @file pack.ts- * @brief Rectangles into a square, bottom-left along a skyline.+ * @brief Charts into a square: by their outlines, or as rectangles along a skyline when there are too many to rasterise.** The charts arrive already scaled, because a lightmap wants ONE world-to-texel* ratio across the whole atlas: a chart shrunk to make it fit would be lit at a@@ -89,3 +89,143 @@ export function packSkyline(sizes: ReadonlyArray<readonly [number, number]>,}return out;}++/** One chart for {@link packOutlines}: its triangles, in its own units with its lowest corner at the origin. */+export interface ChartOutline {+ /** Six numbers a triangle: x, y three times. */+ triangles: Float64Array | number[];+ width: number;+ height: number;+}++/** Where a chart's origin goes, in the unit square. */+export type PlacedOutline = PackedRect;++/** Marks every cell of a mask a triangle touches, by the span each of its edges covers in each row. */+function markTriangle(mask: Uint8Array, w: number, h: number, t: ArrayLike<number>, at: number, scale: number, offset: number): void {+ const xs = [t[at]! * scale + offset, t[at + 2]! * scale + offset, t[at + 4]! * scale + offset];+ const ys = [t[at + 1]! * scale + offset, t[at + 3]! * scale + offset, t[at + 5]! * scale + offset];+ const top = Math.max(0, Math.floor(Math.min(ys[0]!, ys[1]!, ys[2]!)));+ const bottom = Math.min(h - 1, Math.floor(Math.max(ys[0]!, ys[1]!, ys[2]!)));+ for (let row = top; row <= bottom; row++) {+ let lo = Infinity, hi = -Infinity;+ for (let e = 0; e < 3; e++) {+ const [ax, ay, bx, by] = [xs[e]!, ys[e]!, xs[(e + 1) % 3]!, ys[(e + 1) % 3]!];+ // The piece of this edge inside the row.+ const [y0, y1] = [Math.max(Math.min(ay, by), row), Math.min(Math.max(ay, by), row + 1)];+ if (y0 > y1) continue;+ const dy = by - ay;+ const x0 = dy === 0 ? ax : ax + ((y0 - ay) / dy) * (bx - ax);+ const x1 = dy === 0 ? bx : ax + ((y1 - ay) / dy) * (bx - ax);+ lo = Math.min(lo, x0, x1);+ hi = Math.max(hi, x0, x1);+ }+ if (lo > hi) continue;+ const [from, to] = [Math.max(0, Math.floor(lo)), Math.min(w - 1, Math.floor(hi))];+ mask.fill(1, row * w + from, row * w + to + 1);+ }+}++/** The filled cells of one chart at one scale, grown by @p pad cells, as offsets from its corner. */+function chartMask(chart: ChartOutline, scale: number, pad: number, rotated: boolean): { w: number; h: number; cells: Int32Array } {+ const [sw, sh] = rotated ? [chart.height, chart.width] : [chart.width, chart.height];+ const w = Math.ceil(sw * scale) + 1 + pad * 2, h = Math.ceil(sh * scale) + 1 + pad * 2;+ let mask = new Uint8Array(w * h);+ const t = chart.triangles;+ if (rotated) {+ const flipped = new Float64Array(6);+ for (let i = 0; i < t.length; i += 6) {+ for (let k = 0; k < 3; k++) { flipped[k * 2] = t[i + k * 2 + 1]!; flipped[k * 2 + 1] = t[i + k * 2]!; }+ markTriangle(mask, w, h, flipped, 0, scale, pad);+ }+ } else {+ for (let i = 0; i < t.length; i += 6) markTriangle(mask, w, h, t, i, scale, pad);+ }+ // Grown along rows, then along columns: a square around every cell.+ if (pad > 0) {+ const across = new Uint8Array(w * h);+ for (let y = 0; y < h; y++) {+ for (let x = 0; x < w; x++) {+ if (!mask[y * w + x]) continue;+ across.fill(1, y * w + Math.max(0, x - pad), y * w + Math.min(w, x + pad + 1));+ }+ }+ const down = new Uint8Array(w * h);+ for (let y = 0; y < h; y++) {+ for (let x = 0; x < w; x++) {+ if (!across[y * w + x]) continue;+ for (let q = Math.max(0, y - pad); q <= Math.min(h - 1, y + pad); q++) down[q * w + x] = 1;+ }+ }+ mask = down;+ }+ let count = 0;+ for (let i = 0; i < w * h; i++) if (mask[i]) count++;+ const cells = new Int32Array(count * 2);+ let n = 0;+ for (let y = 0; y < h; y++) {+ for (let x = 0; x < w; x++) {+ if (mask[y * w + x]) { cells[n++] = x; cells[n++] = y; }+ }+ }+ return { w, h, cells };+}++/**+ * Places charts by the cells they really cover, so a small one can sit in the bite of a large one, as a rectangle+ * around that large one could never let it. Null if they do not all fit at this scale.+ *+ * @param scale Chart units to one unit of the square. As in {@link packSkyline} it is one number for all of them.+ * @param grid Cells along a side.+ * @param pad Cells to keep clear around every chart.+ */+export function packOutlines(charts: readonly ChartOutline[], scale: number, grid: number, pad: number): PlacedOutline[] | null {+ const cellScale = scale * grid;+ const used = new Uint8Array(grid * grid);+ /** First cell of each row that may be free: rows only ever fill. */+ const rowStart = new Int32Array(grid);+ const areas = charts.map((c) => c.width * c.height);+ const order = charts.map((_, i) => i).sort((a, b) => areas[b]! - areas[a]!);+ const out: PlacedOutline[] = new Array(charts.length);++ const fits = (m: { cells: Int32Array }, x: number, y: number): boolean => {+ const { cells } = m;+ // A coarse pass first: a wrong place is nearly always found out by the first few cells it samples.+ const stride = cells.length > 512 ? 32 : 2;+ for (let i = 0; i < cells.length; i += stride) if (used[(y + cells[i + 1]!) * grid + x + cells[i]!]) return false;+ if (stride > 2) for (let i = 0; i < cells.length; i += 2) if (used[(y + cells[i + 1]!) * grid + x + cells[i]!]) return false;+ return true;+ };+ const firstPlace = (m: { w: number; h: number; cells: Int32Array }): { x: number; y: number } | null => {+ if (m.w > grid || m.h > grid || m.cells.length === 0) return m.cells.length === 0 ? { x: 0, y: 0 } : null;+ const [anchorX, anchorY] = [m.cells[0]!, m.cells[1]!];+ for (let y = 0; y + m.h <= grid; y++) {+ const row = y + anchorY;+ // No place in this row can start left of where its anchor could land.+ for (let x = Math.max(0, rowStart[row]! - anchorX); x + m.w <= grid; x++) {+ if (used[row * grid + x + anchorX]) continue;+ if (fits(m, x, y)) return { x, y };+ }+ }+ return null;+ };++ for (const i of order) {+ const chart = charts[i]!;+ const upright = chartMask(chart, cellScale, pad, false);+ const lying = chartMask(chart, cellScale, pad, true);+ const a = firstPlace(upright), b = firstPlace(lying);+ if (!a && !b) return null;+ const useLying = !a || (b !== null && (b.y + lying.h < a.y + upright.h || (b.y + lying.h === a.y + upright.h && b.x < a.x)));+ const [m, at] = useLying ? [lying, b!] : [upright, a!];+ for (let c = 0; c < m.cells.length; c += 2) used[(at.y + m.cells[c + 1]!) * grid + at.x + m.cells[c]!] = 1;+ for (let y = at.y; y < at.y + m.h; y++) {+ let start = rowStart[y]!;+ while (start < grid && used[y * grid + start]) start++;+ rowStart[y] = start;+ }+ // The mask starts `pad` cells out from the chart's own corner.+ out[i] = { x: (at.x + pad) / grid, y: (at.y + pad) / grid, rotated: useLying };+ }+ return out;+}diff --git a/sdk/src/lightmap/unwrap.ts b/sdk/src/lightmap/unwrap.tsindex 251799995..756fb4c32 100644--- a/sdk/src/lightmap/unwrap.ts+++ b/sdk/src/lightmap/unwrap.ts@@ -12,7 +12,7 @@import { MeshChannel, MeshChannelType, type MeshData, type MeshChannelDesc } from '../asset/meshFormat';import { buildCharts, weldByPosition, type Tri } from './charts';-import { packSkyline } from './pack';+import { packOutlines, packSkyline, type ChartOutline, type PackedRect } from './pack';export interface UnwrapOptions {/** Widest angle two neighbouring faces may differ by and stay one chart. */@@ -31,13 +31,22 @@ export interface UnwrapResult {* different lightmap UV for each side of it. */mesh: MeshData;charts: number;- /** Fraction of the unit square the charts occupy. What is left is the price- * of packing rectangles, and of the padding that keeps them apart. */+ /** Fraction of the unit square the triangles cover. What is left is the price+ * of packing charts, and of the padding that keeps them apart. */coverage: number;}const DEFAULTS = { maxChartAngleDegrees: 60, paddingTexels: 2, atlasSize: 1024 };+/** Cells along a side when laying out by outline. Past this a chart's outline is finer than anything packing gains from. */+const MAX_LAYOUT_GRID = 512;+/** Beyond these, charts are packed as rectangles: outlines cost a pass over every triangle per size tried. */+const MAX_OUTLINE_CHARTS = 1500;+const MAX_OUTLINE_TRIANGLES = 200000;+const SHRINK = 0.8;+/** Halvings of the gap between a size that fits and one that does not: from a gap of 20%, to about a third of a percent. */+const REFINE_STEPS = 6;+function channelAt(channels: readonly MeshChannelDesc[], semantic: number): MeshChannelDesc | undefined {return channels.find((c) => c.semantic === semantic);}@@ -117,22 +126,48 @@ export function unwrapLightmapUV(mesh: MeshData, options: UnwrapOptions = {}): U}const pad = opts.paddingTexels / opts.atlasSize;- // ONE ratio for every chart, found by shrinking until they fit. A chart- // scaled on its own would be lit at a different resolution from the surface- // it joins, and the seam is where that shows.+ // Every chart's triangles in its own units, for what is laid out and how much of the square they really fill.+ const pieces: number[][] = Array.from({ length: charts.count }, () => []);let area = 0;- for (const [w, h] of extent) area += w * h;- let scale = area > 0 ? Math.sqrt(0.5 / area) : 1;- let placed = null as ReturnType<typeof packSkyline>;- for (let attempt = 0; attempt < 24 && !placed; attempt++) {- const boxes = extent.map(([w, h]) => [w * scale + pad * 2, h * scale + pad * 2] as const);- placed = packSkyline(boxes, 1);- if (!placed) scale *= 0.8;+ for (let t = 0; t < tris.length; t++) {+ const chart = charts.chartOf[t];+ const piece = pieces[chart];+ for (let k = 0; k < 3; k++) piece.push(cornerU[t * 3 + k] - lo[chart * 2], cornerV[t * 3 + k] - lo[chart * 2 + 1]);+ area += Math.abs((cornerU[t * 3 + 1] - cornerU[t * 3]) * (cornerV[t * 3 + 2] - cornerV[t * 3])+ - (cornerU[t * 3 + 2] - cornerU[t * 3]) * (cornerV[t * 3 + 1] - cornerV[t * 3])) / 2;}- if (!placed) throw new Error('unwrapLightmapUV: charts do not fit even at 0.5% of their size');+ const grid = Math.min(opts.atlasSize, MAX_LAYOUT_GRID);+ const padCells = Math.max(1, Math.ceil(pad * grid));+ const byOutline = charts.count <= MAX_OUTLINE_CHARTS && tris.length <= MAX_OUTLINE_TRIANGLES;+ const outlines: ChartOutline[] = byOutline ? pieces.map((triangles, c) => ({ triangles, width: extent[c][0], height: extent[c][1] })) : [];+ const layout = (at: number): PackedRect[] | null => {+ if (byOutline) return packOutlines(outlines, at, grid, padCells);+ const boxes = extent.map(([w, h]) => [w * at + pad * 2, h * at + pad * 2] as const);+ const laid = packSkyline(boxes, 1);+ // A box holds its chart inside its padding; the outline's places are the chart's own already.+ return laid && laid.map((box) => ({ ...box, x: box.x + pad, y: box.y + pad }));+ };- let covered = 0;- for (let c = 0; c < charts.count; c++) covered += extent[c][0] * extent[c][1] * scale * scale;+ // ONE ratio for every chart, the largest that fits. A chart scaled on its own would be lit at a different+ // resolution from the surface it joins, and the seam is where that shows. No layout can fill more than the+ // whole square, so that is where the search starts, and it shrinks until something fits.+ let scale = area > 0 ? Math.sqrt(1 / area) : 1;+ let placed: PackedRect[] | null = null;+ let tooBig = scale;+ for (let attempt = 0; attempt < 32 && !placed; attempt++) {+ placed = layout(scale);+ if (!placed) { tooBig = scale; scale *= SHRINK; }+ }+ if (!placed) throw new Error('unwrapLightmapUV: charts do not fit even at 0.1% of their size');+ // Then toward the last size that did not: the room a first fit leaves is what this is all for.+ let fits = scale;+ for (let step = 0; step < REFINE_STEPS && tooBig > fits; step++) {+ const middle = Math.sqrt(fits * tooBig);+ const tried = layout(middle);+ if (tried) { placed = tried; fits = middle; } else { tooBig = middle; }+ }+ scale = fits;+ const covered = area * scale * scale;// Split: a vertex is one new vertex per chart that uses it.const remap = new Map<number, number>();@@ -152,8 +187,8 @@ export function unwrapLightmapUV(mesh: MeshData, options: UnwrapOptions = {}): Usource.push(corners[k]);const du = (cornerU[t * 3 + k] - lo[chart * 2]) * scale;const dv = (cornerV[t * 3 + k] - lo[chart * 2 + 1]) * scale;- uv.push(box.rotated ? box.x + pad + dv : box.x + pad + du,- box.rotated ? box.y + pad + du : box.y + pad + dv);+ uv.push(box.rotated ? box.x + dv : box.x + du,+ box.rotated ? box.y + du : box.y + dv);}indices[t * 3 + k] = out;}diff --git a/sdk/tests/lightmap-unwrap.test.ts b/sdk/tests/lightmap-unwrap.test.tsindex fd7809905..420c1dedf 100644--- a/sdk/tests/lightmap-unwrap.test.ts+++ b/sdk/tests/lightmap-unwrap.test.ts@@ -11,6 +11,7 @@ import { describe, it, expect } from 'vitest';import { readFileSync } from 'node:fs';import path from 'node:path';import { unwrapLightmapUV } from '../src/lightmap';+import { packOutlines, type ChartOutline } from '../src/lightmap/pack';import { decodeMesh, MeshChannel, MeshChannelType, type MeshData, type MeshChannelDesc } from '../src/asset/meshFormat';const chan = (m: MeshData, s: number): MeshChannelDesc =>@@ -58,7 +59,7 @@ function cube(): MeshData {** A texel centre inside two triangles is the failure a lightmap cannot survive:* one surface's light is written over the other's, and which one wins depends on- * the order the bake happened to visit them in.+ * the order the bake visits them in. A centre exactly on a shared edge is one point of one surface, and not that.*/function coverage(mesh: MeshData, n: number): { max: number; touched: number } {const count = new Uint16Array(n * n);@@ -77,7 +78,7 @@ function coverage(mesh: MeshData, n: number): { max: number; touched: number } {const w0 = ((p[1][0] - cx) * (p[2][1] - cy) - (p[2][0] - cx) * (p[1][1] - cy)) / area;const w1 = ((p[2][0] - cx) * (p[0][1] - cy) - (p[0][0] - cx) * (p[2][1] - cy)) / area;const w2 = 1 - w0 - w1;- if (w0 >= 0 && w1 >= 0 && w2 >= 0) count[y * n + x]++;+ if (w0 > 1e-9 && w1 > 1e-9 && w2 > 1e-9) count[y * n + x]++;}}}@@ -211,4 +212,80 @@ describe('a lightmap UV set', () => {expect(filled).toBeGreaterThan(0.05);expect(coverage(mesh, 256).max).toBe(1);});++ it('uses the room there is: a cube fills all it can, not a fixed half of its square', () => {+ const { coverage: filled } = unwrapLightmapUV(cube());+ // Six squares at one size in a square: two rows of three is 2/3 of it, less the padding.+ expect(filled).toBeGreaterThan(0.6);+ expect(filled).toBeLessThanOrEqual(2 / 3);+ });++ it('keeps its padding between charts', () => {+ const atlasSize = 256, paddingTexels = 4;+ const { mesh } = unwrapLightmapUV(cube(), { atlasSize, paddingTexels });+ const boxes: number[][] = [];+ for (let i = 0; i < mesh.indices.length; i += 6) {+ const uv = [0, 1, 2, 5].map((k) => readVec(mesh, MeshChannel.TexCoord1, mesh.indices[i + k], 2));+ boxes.push([Math.min(...uv.map((p) => p[0])), Math.min(...uv.map((p) => p[1])), Math.max(...uv.map((p) => p[0])), Math.max(...uv.map((p) => p[1]))]);+ }+ expect(boxes.length).toBe(6);+ for (let a = 0; a < 6; a++) {+ for (let b = a + 1; b < 6; b++) {+ const apart = Math.max(boxes[b][0] - boxes[a][2], boxes[a][0] - boxes[b][2], boxes[b][1] - boxes[a][3], boxes[a][1] - boxes[b][3]);+ expect(apart * atlasSize).toBeGreaterThanOrEqual(paddingTexels - 0.01);+ }+ }+ });++ it('still holds with more charts than it lays out by outline', () => {+ // Scattered triangles facing every way: each its own chart, past where rasterising them all is worth it.+ const count = 2000;+ const vertices = new Uint8Array(count * 3 * 12);+ const view = new DataView(vertices.buffer);+ const indices: number[] = [];+ for (let t = 0; t < count; t++) {+ const [x, y, z] = [t % 13, (t * 7) % 17, (t * 3) % 19];+ const tri = [[x, y, z], [x + 0.4, y, z], [x, y + 0.4, z]];+ tri.forEach((p, k) => p.forEach((c, n) => view.setFloat32((t * 3 + k) * 12 + n * 4, c + (n === 2 ? t * 40 : 0), true)));+ indices.push(t * 3, t * 3 + 1, t * 3 + 2);+ }+ const { mesh, charts } = unwrapLightmapUV({+ channels: [{ semantic: MeshChannel.Position, components: 3, type: MeshChannelType.Float32, offset: 0 }],+ vertexStride: 12, vertexCount: count * 3, vertices, indices: Uint32Array.from(indices),+ aabbMin: [0, 0, 0], aabbMax: [13, 17, count * 40],+ });+ expect(charts).toBe(count);+ expect(coverage(mesh, 2048).max).toBe(1);+ for (let v = 0; v < mesh.vertexCount; v++) {+ for (const c of readVec(mesh, MeshChannel.TexCoord1, v, 2)) { expect(c).toBeGreaterThanOrEqual(0); expect(c).toBeLessThanOrEqual(1); }+ }+ });+});++describe('packing by outline', () => {+ /** An L: most of its bounding box is the bite out of its corner. */+ const ell: ChartOutline = {+ width: 1, height: 1,+ triangles: [0, 0, 1, 0, 1, 0.2, 0, 0, 1, 0.2, 0, 0.2, 0, 0.2, 0.2, 0.2, 0.2, 1, 0, 0.2, 0.2, 1, 0, 1],+ };+ const square = (side: number): ChartOutline => ({ width: side, height: side, triangles: [0, 0, side, 0, side, side, 0, 0, side, side, 0, side] });++ it('sets a small chart in the bite of a large one, where their rectangles would need twice the room', () => {+ const placed = packOutlines([ell, square(0.5)], 0.95, 128, 1)!;+ expect(placed).not.toBeNull();+ const [a, b] = placed;+ expect(Math.max(b!.x - a!.x, b!.y - a!.y)).toBeGreaterThan(0);+ // The square is inside the L's rectangle: it did not need room of its own.+ expect(b!.x + 0.5 * 0.95).toBeLessThanOrEqual(a!.x + 0.95 + 1e-6);+ expect(b!.y + 0.5 * 0.95).toBeLessThanOrEqual(a!.y + 0.95 + 1e-6);+ });++ it('says when they do not fit', () => {+ expect(packOutlines([square(1), square(1)], 0.9, 64, 1)).toBeNull();+ });++ it('reads the same every time', () => {+ const charts = [ell, square(0.3), square(0.2), square(0.1)];+ expect(packOutlines(charts, 0.7, 128, 1)).toEqual(packOutlines(charts, 0.7, 128, 1));+ });});diff --git a/tools/releaseNotes.mjs b/tools/releaseNotes.mjsindex aba132556..f3bfc15ad 100644--- a/tools/releaseNotes.mjs+++ b/tools/releaseNotes.mjs@@ -3872,6 +3872,8 @@ export const NOTED = {{"note":"A linear game looks the same on every Play."},"test(editor): a scene draws the same on every Play, with effects or without":{"internal":"a check, for a fix the engine commit carries"},+ "perf(lightmap): charts are laid out by their outlines at the largest size that fits, about half of an atlas where it was a third":+ {"note":"A lightmap or a baked normal map gets nearly twice as many texels on its model."},"feat(modeling): a displace step carves wrinkles, cracks, scales and weave into a surface":{"note":"An AI building a model can carve fine detail into it."},"feat(mcp): model_write carves fine detail, and a check takes every pattern through the bake":