diff --git a/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt b/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt index f193e79c8..67dbcdf6b 100644 --- a/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt +++ b/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt @@ -10,7 +10,7 @@ import net.torvald.UnsafeHelper * Created by Torvald on 2019-12-05. */ internal object LightmapHDRMap : Disposable { - private val THE_LUT = floatArrayOf( // polynomial of 6.0 please refer to work_files/HDRcurveBezierLinIntp.kts + /*private val THE_LUT = floatArrayOf( // polynomial of 6.0 please refer to work_files/HDRcurveBezierLinIntp.kts 0.0000f,0.0004f,0.0020f,0.0060f,0.0100f,0.0139f,0.0179f,0.0219f,0.0259f,0.0299f,0.0338f,0.0378f,0.0418f,0.0458f,0.0497f,0.0537f, 0.0577f,0.0617f,0.0656f,0.0696f,0.0736f,0.0776f,0.0816f,0.0855f,0.0895f,0.0935f,0.0975f,0.1014f,0.1054f,0.1094f,0.1134f,0.1173f, 0.1213f,0.1253f,0.1293f,0.1332f,0.1372f,0.1412f,0.1451f,0.1491f,0.1531f,0.1571f,0.1610f,0.1650f,0.1690f,0.1730f,0.1769f,0.1809f, @@ -75,7 +75,8 @@ internal object LightmapHDRMap : Disposable { 1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f, 1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f, 1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f, 1f // isn't it beautiful? - ) + )*/ + private val THE_LUT = floatArrayOf(0f,0.00392f,0.00784f,0.01176f,0.01569f,0.01961f,0.02353f,0.02745f,0.03137f,0.03529f,0.03922f,0.04314f,0.04706f,0.05098f,0.0549f,0.05882f,0.06275f,0.06667f,0.07059f,0.07451f,0.07843f,0.08235f,0.08627f,0.0902f,0.09412f,0.09804f,0.10196f,0.10588f,0.1098f,0.11373f,0.11765f,0.12157f,0.12549f,0.12941f,0.13333f,0.13725f,0.14118f,0.1451f,0.14902f,0.15294f,0.15686f,0.16078f,0.16471f,0.16863f,0.17255f,0.17647f,0.18039f,0.18431f,0.18824f,0.19216f,0.19608f,0.2f,0.20392f,0.20784f,0.21176f,0.21569f,0.21961f,0.22353f,0.22745f,0.23137f,0.23529f,0.23922f,0.24314f,0.24706f,0.25098f,0.2549f,0.25882f,0.26275f,0.26667f,0.27059f,0.27451f,0.27843f,0.28235f,0.28627f,0.2902f,0.29412f,0.29804f,0.30196f,0.30588f,0.3098f,0.31373f,0.31765f,0.32157f,0.32549f,0.32941f,0.33333f,0.33725f,0.34118f,0.3451f,0.34902f,0.35294f,0.35686f,0.36078f,0.36471f,0.36863f,0.37255f,0.37647f,0.38039f,0.38431f,0.38824f,0.39216f,0.39608f,0.4f,0.40392f,0.40784f,0.41176f,0.41569f,0.41961f,0.42353f,0.42745f,0.43137f,0.43529f,0.43922f,0.44314f,0.44706f,0.45098f,0.4549f,0.45882f,0.46275f,0.46667f,0.47059f,0.47451f,0.47843f,0.48235f,0.48627f,0.4902f,0.49412f,0.49804f,0.50196f,0.50588f,0.5098f,0.51373f,0.51765f,0.52157f,0.52549f,0.52941f,0.53333f,0.53725f,0.54118f,0.5451f,0.54902f,0.55294f,0.55686f,0.56078f,0.56471f,0.56863f,0.57255f,0.57647f,0.58039f,0.58431f,0.58824f,0.59216f,0.59608f,0.6f,0.60392f,0.60784f,0.61176f,0.61569f,0.61961f,0.62353f,0.62745f,0.63137f,0.63529f,0.63922f,0.64314f,0.64706f,0.65098f,0.6549f,0.65882f,0.66275f,0.66667f,0.67059f,0.67451f,0.67843f,0.68235f,0.68627f,0.6902f,0.69412f,0.69804f,0.70196f,0.70588f,0.7098f,0.71373f,0.71765f,0.72157f,0.72549f,0.72941f,0.73333f,0.73725f,0.74118f,0.7451f,0.74902f,0.75294f,0.75686f,0.76078f,0.76471f,0.76863f,0.77255f,0.77647f,0.78039f,0.78431f,0.78824f,0.79216f,0.79608f,0.8f,0.80392f,0.80784f,0.81176f,0.81569f,0.81961f,0.82353f,0.82745f,0.83137f,0.83529f,0.83922f,0.84314f,0.84706f,0.85098f,0.8549f,0.85882f,0.86275f,0.86667f,0.87059f,0.87451f,0.87843f,0.88235f,0.88627f,0.8902f,0.89412f,0.89804f,0.90196f,0.90588f,0.9098f,0.91373f,0.91765f,0.92157f,0.92549f,0.92941f,0.93333f,0.93725f,0.94118f,0.94314f,0.9451f,0.94706f,0.94902f,0.95033f,0.95163f,0.95294f,0.95373f,0.95451f,0.95529f,0.95608f,0.95686f,0.95752f,0.95817f,0.95882f,0.95948f,0.96013f,0.96078f,0.96118f,0.96157f,0.96196f,0.96235f,0.96275f,0.96314f,0.96353f,0.96392f,0.96431f,0.96471f,0.96501f,0.96531f,0.96561f,0.96591f,0.96621f,0.96652f,0.96682f,0.96712f,0.96742f,0.96772f,0.96802f,0.96833f,0.96863f,0.96882f,0.96902f,0.96922f,0.96941f,0.96961f,0.9698f,0.97f,0.9702f,0.97039f,0.97059f,0.97078f,0.97098f,0.97118f,0.97137f,0.97157f,0.97176f,0.97196f,0.97216f,0.97235f,0.97255f,0.97269f,0.97284f,0.97298f,0.97313f,0.97328f,0.97342f,0.97357f,0.97371f,0.97386f,0.974f,0.97415f,0.97429f,0.97444f,0.97458f,0.97473f,0.97487f,0.97502f,0.97516f,0.97531f,0.97545f,0.9756f,0.97574f,0.97589f,0.97603f,0.97618f,0.97633f,0.97647f,0.97657f,0.97667f,0.97677f,0.97687f,0.97697f,0.97707f,0.97717f,0.97728f,0.97738f,0.97748f,0.97758f,0.97768f,0.97778f,0.97788f,0.97798f,0.97808f,0.97818f,0.97828f,0.97838f,0.97848f,0.97858f,0.97868f,0.97878f,0.97888f,0.97898f,0.97908f,0.97919f,0.97929f,0.97939f,0.97949f,0.97959f,0.97969f,0.97979f,0.97989f,0.97999f,0.98009f,0.98019f,0.98029f,0.98039f,0.98046f,0.98053f,0.9806f,0.98067f,0.98074f,0.98081f,0.98088f,0.98095f,0.98102f,0.98109f,0.98116f,0.98123f,0.9813f,0.98137f,0.98144f,0.98151f,0.98158f,0.98165f,0.98172f,0.98179f,0.98186f,0.98193f,0.982f,0.98207f,0.98214f,0.98221f,0.98228f,0.98235f,0.98242f,0.98249f,0.98256f,0.98263f,0.9827f,0.98277f,0.98284f,0.98291f,0.98298f,0.98305f,0.98312f,0.98319f,0.98326f,0.98333f,0.9834f,0.98347f,0.98354f,0.98361f,0.98368f,0.98375f,0.98382f,0.98389f,0.98396f,0.98403f,0.9841f,0.98417f,0.98424f,0.98431f,0.98436f,0.98441f,0.98446f,0.98451f,0.98456f,0.98461f,0.98466f,0.98471f,0.98476f,0.98481f,0.98486f,0.98491f,0.98496f,0.98501f,0.98506f,0.98511f,0.98516f,0.98521f,0.98526f,0.98531f,0.98536f,0.98541f,0.98546f,0.98551f,0.98555f,0.9856f,0.98565f,0.9857f,0.98575f,0.9858f,0.98585f,0.9859f,0.98595f,0.986f,0.98605f,0.9861f,0.98615f,0.9862f,0.98625f,0.9863f,0.98635f,0.9864f,0.98645f,0.9865f,0.98655f,0.9866f,0.98665f,0.9867f,0.98675f,0.9868f,0.98685f,0.9869f,0.98694f,0.98699f,0.98704f,0.98709f,0.98714f,0.98719f,0.98724f,0.98729f,0.98734f,0.98739f,0.98744f,0.98749f,0.98754f,0.98759f,0.98764f,0.98769f,0.98774f,0.98779f,0.98784f,0.98789f,0.98794f,0.98799f,0.98804f,0.98809f,0.98814f,0.98819f,0.98824f,0.98827f,0.9883f,0.98834f,0.98837f,0.98841f,0.98844f,0.98848f,0.98851f,0.98854f,0.98858f,0.98861f,0.98865f,0.98868f,0.98872f,0.98875f,0.98879f,0.98882f,0.98885f,0.98889f,0.98892f,0.98896f,0.98899f,0.98903f,0.98906f,0.9891f,0.98913f,0.98916f,0.9892f,0.98923f,0.98927f,0.9893f,0.98934f,0.98937f,0.9894f,0.98944f,0.98947f,0.98951f,0.98954f,0.98958f,0.98961f,0.98965f,0.98968f,0.98971f,0.98975f,0.98978f,0.98982f,0.98985f,0.98989f,0.98992f,0.98996f,0.98999f,0.99002f,0.99006f,0.99009f,0.99013f,0.99016f,0.9902f,0.99023f,0.99026f,0.9903f,0.99033f,0.99037f,0.9904f,0.99044f,0.99047f,0.99051f,0.99054f,0.99057f,0.99061f,0.99064f,0.99068f,0.99071f,0.99075f,0.99078f,0.99082f,0.99085f,0.99088f,0.99092f,0.99095f,0.99099f,0.99102f,0.99106f,0.99109f,0.99112f,0.99116f,0.99119f,0.99123f,0.99126f,0.9913f,0.99133f,0.99137f,0.9914f,0.99143f,0.99147f,0.9915f,0.99154f,0.99157f,0.99161f,0.99164f,0.99168f,0.99171f,0.99174f,0.99178f,0.99181f,0.99185f,0.99188f,0.99192f,0.99195f,0.99198f,0.99202f,0.99205f,0.99209f,0.99212f,0.99216f,0.99218f,0.99221f,0.99223f,0.99225f,0.99228f,0.9923f,0.99233f,0.99235f,0.99237f,0.9924f,0.99242f,0.99245f,0.99247f,0.9925f,0.99252f,0.99254f,0.99257f,0.99259f,0.99262f,0.99264f,0.99267f,0.99269f,0.99271f,0.99274f,0.99276f,0.99279f,0.99281f,0.99283f,0.99286f,0.99288f,0.99291f,0.99293f,0.99296f,0.99298f,0.993f,0.99303f,0.99305f,0.99308f,0.9931f,0.99313f,0.99315f,0.99317f,0.9932f,0.99322f,0.99325f,0.99327f,0.99329f,0.99332f,0.99334f,0.99337f,0.99339f,0.99342f,0.99344f,0.99346f,0.99349f,0.99351f,0.99354f,0.99356f,0.99359f,0.99361f,0.99363f,0.99366f,0.99368f,0.99371f,0.99373f,0.99375f,0.99378f,0.9938f,0.99383f,0.99385f,0.99388f,0.9939f,0.99392f,0.99395f,0.99397f,0.994f,0.99402f,0.99405f,0.99407f,0.99409f,0.99412f,0.99414f,0.99417f,0.99419f,0.99421f,0.99424f,0.99426f,0.99429f,0.99431f,0.99434f,0.99436f,0.99438f,0.99441f,0.99443f,0.99446f,0.99448f,0.9945f,0.99453f,0.99455f,0.99458f,0.9946f,0.99463f,0.99465f,0.99467f,0.9947f,0.99472f,0.99475f,0.99477f,0.9948f,0.99482f,0.99484f,0.99487f,0.99489f,0.99492f,0.99494f,0.99496f,0.99499f,0.99501f,0.99504f,0.99506f,0.99509f,0.99511f,0.99513f,0.99516f,0.99518f,0.99521f,0.99523f,0.99526f,0.99528f,0.9953f,0.99533f,0.99535f,0.99538f,0.9954f,0.99542f,0.99545f,0.99547f,0.9955f,0.99552f,0.99555f,0.99557f,0.99559f,0.99562f,0.99564f,0.99567f,0.99569f,0.99572f,0.99574f,0.99576f,0.99579f,0.99581f,0.99584f,0.99586f,0.99588f,0.99591f,0.99593f,0.99596f,0.99598f,0.99601f,0.99603f,0.99605f,0.99608f,0.9961f,0.99611f,0.99613f,0.99615f,0.99616f,0.99618f,0.9962f,0.99621f,0.99623f,0.99625f,0.99627f,0.99628f,0.9963f,0.99632f,0.99633f,0.99635f,0.99637f,0.99639f,0.9964f,0.99642f,0.99644f,0.99645f,0.99647f,0.99649f,0.9965f,0.99652f,0.99654f,0.99656f,0.99657f,0.99659f,0.99661f,0.99662f,0.99664f,0.99666f,0.99668f,0.99669f,0.99671f,0.99673f,0.99674f,0.99676f,0.99678f,0.99679f,0.99681f,0.99683f,0.99685f,0.99686f,0.99688f,0.9969f,0.99691f,0.99693f,0.99695f,0.99697f,0.99698f,0.997f,0.99702f,0.99703f,0.99705f,0.99707f,0.99708f,0.9971f,0.99712f,0.99714f,0.99715f,0.99717f,0.99719f,0.9972f,0.99722f,0.99724f,0.99725f,0.99727f,0.99729f,0.99731f,0.99732f,0.99734f,0.99736f,0.99737f,0.99739f,0.99741f,0.99743f,0.99744f,0.99746f,0.99748f,0.99749f,0.99751f,0.99753f,0.99754f,0.99756f,0.99758f,0.9976f,0.99761f,0.99763f,0.99765f,0.99766f,0.99768f,0.9977f,0.99772f,0.99773f,0.99775f,0.99777f,0.99778f,0.9978f,0.99782f,0.99783f,0.99785f,0.99787f,0.99789f,0.9979f,0.99792f,0.99794f,0.99795f,0.99797f,0.99799f,0.99801f,0.99802f,0.99804f,0.99806f,0.99807f,0.99809f,0.99811f,0.99812f,0.99814f,0.99816f,0.99818f,0.99819f,0.99821f,0.99823f,0.99824f,0.99826f,0.99828f,0.99829f,0.99831f,0.99833f,0.99835f,0.99836f,0.99838f,0.9984f,0.99841f,0.99843f,0.99845f,0.99847f,0.99848f,0.9985f,0.99852f,0.99853f,0.99855f,0.99857f,0.99858f,0.9986f,0.99862f,0.99864f,0.99865f,0.99867f,0.99869f,0.9987f,0.99872f,0.99874f,0.99876f,0.99877f,0.99879f,0.99881f,0.99882f,0.99884f,0.99886f,0.99887f,0.99889f,0.99891f,0.99893f,0.99894f,0.99896f,0.99898f,0.99899f,0.99901f,0.99903f,0.99905f,0.99906f,0.99908f,0.9991f,0.99911f,0.99913f,0.99915f,0.99916f,0.99918f,0.9992f,0.99922f,0.99923f,0.99925f,0.99927f,0.99928f,0.9993f,0.99932f,0.99934f,0.99935f,0.99937f,0.99939f,0.9994f,0.99942f,0.99944f,0.99945f,0.99947f,0.99949f,0.99951f,0.99952f,0.99954f,0.99956f,0.99957f,0.99959f,0.99961f,0.99962f,0.99964f,0.99966f,0.99968f,0.99969f,0.99971f,0.99973f,0.99974f,0.99976f,0.99978f,0.9998f,0.99981f,0.99983f,0.99985f,0.99986f,0.99988f,0.9999f,0.99991f,0.99993f,0.99995f,0.99997f,0.99998f,1f,1f,1f,1f,1f,1f,1f,1f,1f,1f,1f,1f,1f,1f,1f,1f,1f) val ptr = UnsafeHelper.allocate(4L * THE_LUT.size) diff --git a/work_files/lightmap_tonemapping_new.xlsx b/work_files/lightmap_tonemapping_new.xlsx new file mode 100644 index 000000000..951b15292 Binary files /dev/null and b/work_files/lightmap_tonemapping_new.xlsx differ