diff --git a/add/shaders/room.hlsl b/add/shaders/room.hlsl index f45c453..ff94f68 100644 --- a/add/shaders/room.hlsl +++ b/add/shaders/room.hlsl @@ -76,8 +76,27 @@ float raymarch(float3 ro, float3 rd) { return dist; } +// float4 read(float2 head, float x, float y) { +// head += float2(x, y); +// return diffuse.Sample(tex, head); +// } + float4 ps(psIn input) : SV_TARGET { float4 col = diffuse.Sample(diffuse_s, input.uv); + + // float2 head = float2(0, 0); + + // if (read(head, 0, 0).r > 0) { + // float4x4 m = float4x4( + // diffuse.Sample(tex, head + float2(1, 0)), + // diffuse.Sample(tex, head + float2(2, 0)), + // diffuse.Sample(tex, head + float2(3, 0)), + // diffuse.Sample(tex, head + float2(4, 0)) + // ); + // } + // float3 dim = float3( + // diffuse.Sample(tex, head + float2(1, 0)), + // ); float3 ro = input.campos; diff --git a/add/skatepark/license.txt b/add/skatepark/license.txt deleted file mode 100644 index d10a4ef..0000000 --- a/add/skatepark/license.txt +++ /dev/null @@ -1,11 +0,0 @@ -Model Information: -* title: Southbank Undercroft Skatepark -* source: https://sketchfab.com/3d-models/southbank-undercroft-skatepark-add37d5dc6a2456eb0d7607c6fbd884d -* author: artfletch (https://sketchfab.com/artfletch) - -Model License: -* license type: CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/) -* requirements: Author must be credited. Commercial use is allowed. - -If you use this 3D model in your project be sure to copy paste this credit wherever you share it: -This work is based on "Southbank Undercroft Skatepark" (https://sketchfab.com/3d-models/southbank-undercroft-skatepark-add37d5dc6a2456eb0d7607c6fbd884d) by artfletch (https://sketchfab.com/artfletch) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/) \ No newline at end of file diff --git a/add/skatepark/scene.bin b/add/skatepark/scene.bin deleted file mode 100644 index 3ea716f..0000000 Binary files a/add/skatepark/scene.bin and /dev/null differ diff --git a/add/skatepark/scene.gltf b/add/skatepark/scene.gltf deleted file mode 100644 index dd361ea..0000000 --- a/add/skatepark/scene.gltf +++ /dev/null @@ -1,1868 +0,0 @@ -{ - "accessors": [ - { - "bufferView": 2, - "componentType": 5126, - "count": 65532, - "max": [ - 19.225797653198242, - 0.3162359893321991, - 13.359759330749512 - ], - "min": [ - -22.852506637573242, - -3.087222099304199, - -6.659463882446289 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 786384, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9999969005584717, - 1.0, - 0.9999735951423645 - ], - "min": [ - -0.9999116659164429, - -1.0, - -0.9999993443489075 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9996799826622009, - 0.9895830154418945 - ], - "min": [ - 0.00024399999529123306, - 0.0003389999910723418 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "componentType": 5125, - "count": 264705, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 1572768, - "componentType": 5126, - "count": 65532, - "max": [ - 18.710233688354492, - -0.5564519762992859, - 11.924713134765625 - ], - "min": [ - -22.523984909057617, - -3.0874669551849365, - -6.585454940795898 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 2359152, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9999749064445496, - 0.9999998807907104, - 0.9999919533729553 - ], - "min": [ - -0.9998988509178162, - -1.0, - -0.9999966025352478 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 524256, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997289776802063, - 0.9987789988517761 - ], - "min": [ - 0.00024399999529123306, - 0.00035099999513477087 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 1058820, - "componentType": 5125, - "count": 270474, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 3145536, - "componentType": 5126, - "count": 65532, - "max": [ - 18.78908920288086, - -0.4404059946537018, - 12.384321212768555 - ], - "min": [ - -21.71657371520996, - -3.087222099304199, - -6.553060054779053 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 3931920, - "componentType": 5126, - "count": 65532, - "max": [ - 0.999998927116394, - 0.9999999403953552, - 0.999861478805542 - ], - "min": [ - -0.9999861717224121, - -1.0, - -0.9999740719795227 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 1048512, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9996830224990845, - 0.98444002866745 - ], - "min": [ - 0.00024399999529123306, - 0.0002460000105202198 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 2140716, - "componentType": 5125, - "count": 264126, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 4718304, - "componentType": 5126, - "count": 65534, - "max": [ - 16.847923278808594, - -0.44863998889923096, - 13.216815948486328 - ], - "min": [ - -22.344877243041992, - -3.087048053741455, - -5.156192779541016 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 5504712, - "componentType": 5126, - "count": 65534, - "max": [ - 0.9999920129776001, - 1.0, - 0.9999991059303284 - ], - "min": [ - -0.9999939203262329, - -1.0, - -0.999993622303009 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 1572768, - "componentType": 5126, - "count": 65534, - "max": [ - 0.9997329711914063, - 0.9919430017471313 - ], - "min": [ - 0.00024399999529123306, - 0.00030399998649954796 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 3197220, - "componentType": 5125, - "count": 266067, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 6291120, - "componentType": 5126, - "count": 65533, - "max": [ - 18.890966415405273, - -0.4511060118675232, - 6.321135997772217 - ], - "min": [ - -22.66050910949707, - -3.0874669551849365, - -6.2672929763793945 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 7077516, - "componentType": 5126, - "count": 65533, - "max": [ - 0.9999006986618042, - 1.0, - 0.9997445940971375 - ], - "min": [ - -0.9998120665550232, - -1.0, - -0.9999971389770508 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 2097040, - "componentType": 5126, - "count": 65533, - "max": [ - 0.999754011631012, - 0.9831539988517761 - ], - "min": [ - 0.00024399999529123306, - 0.00025499999173916876 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 4261488, - "componentType": 5125, - "count": 273102, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 7863912, - "componentType": 5126, - "count": 65532, - "max": [ - 17.000852584838867, - -0.508309006690979, - 12.32784366607666 - ], - "min": [ - -22.77120590209961, - -3.087033987045288, - -6.59957218170166 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 8650296, - "componentType": 5126, - "count": 65532, - "max": [ - 0.999957799911499, - 0.9999999403953552, - 0.9999876022338867 - ], - "min": [ - -0.9999860525131226, - -1.0, - -0.9999932050704956 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 2621304, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997519850730896, - 0.986083984375 - ], - "min": [ - 0.00024399999529123306, - 0.000295000005280599 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 5353896, - "componentType": 5125, - "count": 285369, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 9436680, - "componentType": 5126, - "count": 65532, - "max": [ - 18.105253219604492, - -0.43577998876571655, - 12.181136131286621 - ], - "min": [ - -21.849258422851563, - -3.08724308013916, - -6.358071804046631 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 10223064, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9999933242797852, - 0.9999997615814209, - 0.9999279379844666 - ], - "min": [ - -0.9999979138374329, - -1.0, - -0.99996417760849 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 3145560, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997349977493286, - 0.9802240133285522 - ], - "min": [ - 0.00024399999529123306, - 0.0003800000122282654 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 6495372, - "componentType": 5125, - "count": 273021, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 11009448, - "componentType": 5126, - "count": 65532, - "max": [ - 18.21735191345215, - -0.4460330009460449, - 10.845451354980469 - ], - "min": [ - -21.547197341918945, - -3.08724308013916, - -5.122726917266846 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 11795832, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9999533295631409, - 1.0, - 0.9999792575836182 - ], - "min": [ - -0.9999946355819702, - -1.0, - -0.9999768137931824 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 3669816, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997069835662842, - 0.9987789988517761 - ], - "min": [ - 0.00024399999529123306, - 0.003375000087544322 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 7587456, - "componentType": 5125, - "count": 261519, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 12582216, - "componentType": 5126, - "count": 65532, - "max": [ - 19.195388793945313, - -0.47123199701309204, - 13.216815948486328 - ], - "min": [ - -22.18254852294922, - -3.08724308013916, - -6.441792964935303 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 13368600, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9998834729194641, - 1.0, - 0.9999880194664001 - ], - "min": [ - -0.9999586939811707, - -1.0, - -0.9999420046806335 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 4194072, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997429847717285, - 0.9978029727935791 - ], - "min": [ - 0.00024399999529123306, - 0.00027600000612437725 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 8633532, - "componentType": 5125, - "count": 239160, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 14154984, - "componentType": 5126, - "count": 65534, - "max": [ - 18.723264694213867, - -0.4867039918899536, - 11.401774406433105 - ], - "min": [ - -20.53905487060547, - -2.915343999862671, - -6.638686180114746 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 14941392, - "componentType": 5126, - "count": 65534, - "max": [ - 0.999987781047821, - 1.0, - 0.9999986886978149 - ], - "min": [ - -0.9999990463256836, - -0.9999998807907104, - -0.9999998807907104 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 4718328, - "componentType": 5126, - "count": 65534, - "max": [ - 0.9996820092201233, - 0.9987789988517761 - ], - "min": [ - 0.00024399999529123306, - 0.0002629999944474548 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 9590172, - "componentType": 5125, - "count": 268926, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 15727800, - "componentType": 5126, - "count": 65532, - "max": [ - 18.050491333007813, - -0.44317200779914856, - 11.292436599731445 - ], - "min": [ - -22.78143882751465, - -3.026542901992798, - -6.608508110046387 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 16514184, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9999818205833435, - 1.0, - 0.9999778866767883 - ], - "min": [ - -0.9999827146530151, - -1.0, - -0.9999973773956299 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 5242600, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997550249099731, - 0.9987789988517761 - ], - "min": [ - 0.00024399999529123306, - 0.0003499999875202775 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 10665876, - "componentType": 5125, - "count": 262851, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 17300568, - "componentType": 5126, - "count": 65532, - "max": [ - 19.224271774291992, - -0.5095829963684082, - 13.210977554321289 - ], - "min": [ - -18.71951675415039, - -3.0875320434570313, - -6.626039981842041 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 18086952, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9999842047691345, - 1.0, - 0.9999989867210388 - ], - "min": [ - -0.999984860420227, - -1.0, - -0.9999982118606567 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 5766856, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9996629953384399, - 0.987060010433197 - ], - "min": [ - 0.00024399999529123306, - 0.0003009999927598983 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 11717280, - "componentType": 5125, - "count": 270942, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 18873336, - "componentType": 5126, - "count": 65532, - "max": [ - 19.200885772705078, - -0.4359090030193329, - 8.920626640319824 - ], - "min": [ - -18.71366310119629, - -3.0870349407196045, - -6.181725025177002 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 19659720, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9999967813491821, - 0.9999997019767761, - 0.9999905824661255 - ], - "min": [ - -0.9999904632568359, - -0.9999998807907104, - -0.9999942183494568 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 6291112, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997109770774841, - 0.9873020052909851 - ], - "min": [ - 0.00024399999529123306, - 0.00026000000070780516 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 12801048, - "componentType": 5125, - "count": 235599, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 20446104, - "componentType": 5126, - "count": 65532, - "max": [ - 19.19904136657715, - -0.4539389908313751, - 11.302927017211914 - ], - "min": [ - -18.508981704711914, - -3.087033987045288, - -6.585453033447266 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 21232488, - "componentType": 5126, - "count": 65532, - "max": [ - 0.999995231628418, - 0.9999998807907104, - 0.9998710751533508 - ], - "min": [ - -0.9999927878379822, - -1.0, - -0.999998927116394 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 6815368, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997389912605286, - 0.9834259748458862 - ], - "min": [ - 0.00024399999529123306, - 0.0002500000118743628 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 13743444, - "componentType": 5125, - "count": 261273, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 22018872, - "componentType": 5126, - "count": 65532, - "max": [ - 17.04912757873535, - -0.4647279977798462, - 11.018205642700195 - ], - "min": [ - -12.355181694030762, - -3.087033987045288, - -4.727578163146973 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 22805256, - "componentType": 5126, - "count": 65532, - "max": [ - 0.999998927116394, - 1.0, - 0.9999943971633911 - ], - "min": [ - -0.9999982714653015, - -1.0, - -0.9999949336051941 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 7339624, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9996709823608398, - 0.9938960075378418 - ], - "min": [ - 0.00024399999529123306, - 0.0004870000120718032 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 14788536, - "componentType": 5125, - "count": 251610, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 23591640, - "componentType": 5126, - "count": 65532, - "max": [ - 16.813148498535156, - -0.4541809856891632, - 11.04028606414795 - ], - "min": [ - -22.632234573364258, - -2.8696959018707275, - -4.9248762130737305 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 24378024, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9999938607215881, - 0.9999999403953552, - 0.999930739402771 - ], - "min": [ - -0.9999971985816956, - -1.0, - -0.9999642968177795 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 7863880, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997339844703674, - 0.9938960075378418 - ], - "min": [ - 0.00024399999529123306, - 0.0002749999985098839 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 15794976, - "componentType": 5125, - "count": 250092, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 25164408, - "componentType": 5126, - "count": 65532, - "max": [ - 16.97119140625, - -0.46441298723220825, - 11.79157543182373 - ], - "min": [ - -22.51828384399414, - -3.0870349407196045, - -5.063961982727051 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 25950792, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9999964833259583, - 1.0, - 0.9999550580978394 - ], - "min": [ - -0.9999378323554993, - -1.0, - -0.9999992251396179 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 8388136, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997230172157288, - 0.9841309785842896 - ], - "min": [ - 0.00024399999529123306, - 0.0002690000110305846 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 16795344, - "componentType": 5125, - "count": 223875, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 26737176, - "componentType": 5126, - "count": 65534, - "max": [ - 17.868146896362305, - -0.5099120140075684, - 11.783931732177734 - ], - "min": [ - -20.65737533569336, - -3.086962938308716, - -5.111946105957031 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 27523584, - "componentType": 5126, - "count": 65534, - "max": [ - 0.9999750852584839, - 0.9999999403953552, - 0.9999907612800598 - ], - "min": [ - -0.9999602437019348, - -1.0, - -0.9999690055847168 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 8912392, - "componentType": 5126, - "count": 65534, - "max": [ - 0.9997519850730896, - 0.9987789988517761 - ], - "min": [ - 0.00024399999529123306, - 0.0002899999963119626 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 17690844, - "componentType": 5125, - "count": 221310, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 28309992, - "componentType": 5126, - "count": 65532, - "max": [ - 17.723527908325195, - -0.45473000407218933, - 10.496639251708984 - ], - "min": [ - -19.506698608398438, - -2.8600358963012695, - -5.837006092071533 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 29096376, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9999608397483826, - 1.0, - 0.9999866485595703 - ], - "min": [ - -0.9999422430992126, - -0.9999998807907104, - -0.9999908804893494 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 9436664, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997519850730896, - 0.9846389889717102 - ], - "min": [ - 0.00024399999529123306, - 0.0002610000083222985 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 18576084, - "componentType": 5125, - "count": 208467, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 29882760, - "componentType": 5126, - "count": 65533, - "max": [ - 16.582965850830078, - -0.4500730037689209, - 13.216858863830566 - ], - "min": [ - -21.098276138305664, - -3.087033987045288, - -6.6030402183532715 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 30669156, - "componentType": 5126, - "count": 65533, - "max": [ - 0.999998927116394, - 0.9999997615814209, - 0.9999905824661255 - ], - "min": [ - -0.9999937415122986, - -1.0, - -0.9999794363975525 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 9960920, - "componentType": 5126, - "count": 65533, - "max": [ - 0.9997180104255676, - 0.986083984375 - ], - "min": [ - 0.00024399999529123306, - 0.00027200000477023423 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 19409952, - "componentType": 5125, - "count": 221136, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 31455552, - "componentType": 5126, - "count": 65532, - "max": [ - 18.1888370513916, - -0.4404059946537018, - 13.213715553283691 - ], - "min": [ - -21.776981353759766, - -2.923517942428589, - -6.628506183624268 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 32241936, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9999707341194153, - 0.9999999403953552, - 0.9999905824661255 - ], - "min": [ - -0.99996018409729, - -1.0, - -0.9999998807907104 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 10485184, - "componentType": 5126, - "count": 65532, - "max": [ - 0.9997559785842896, - 0.987060010433197 - ], - "min": [ - 0.00024399999529123306, - 0.00026199998683296144 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 20294496, - "componentType": 5125, - "count": 187344, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 33028320, - "componentType": 5126, - "count": 65534, - "max": [ - 18.088621139526367, - -0.4623950123786926, - 12.12348461151123 - ], - "min": [ - -22.785720825195313, - -3.087222099304199, - -6.656342029571533 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 33814728, - "componentType": 5126, - "count": 65534, - "max": [ - 0.9999979138374329, - 0.9999998807907104, - 0.9999815225601196 - ], - "min": [ - -0.9999855756759644, - -1.0, - -0.9999974966049194 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 11009440, - "componentType": 5126, - "count": 65534, - "max": [ - 0.9997259974479675, - 0.9987789988517761 - ], - "min": [ - 0.00024399999529123306, - 0.0002479999966453761 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 21043872, - "componentType": 5125, - "count": 186483, - "type": "SCALAR" - }, - { - "bufferView": 2, - "byteOffset": 34601136, - "componentType": 5126, - "count": 7468, - "max": [ - 8.307432174682617, - -0.9673910140991211, - 6.641213893890381 - ], - "min": [ - -6.858979225158691, - -3.087033987045288, - -4.828146934509277 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 34690752, - "componentType": 5126, - "count": 7468, - "max": [ - 0.9998947978019714, - 1.0, - 0.9999907612800598 - ], - "min": [ - -0.9991940855979919, - -1.0, - -0.9999783635139465 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 11533712, - "componentType": 5126, - "count": 7468, - "max": [ - 0.999504029750824, - 0.9885309934616089 - ], - "min": [ - 0.00024399999529123306, - 0.0002749999985098839 - ], - "type": "VEC2" - }, - { - "bufferView": 0, - "byteOffset": 21789804, - "componentType": 5125, - "count": 20439, - "type": "SCALAR" - } - ], - "asset": { - "extras": { - "author": "artfletch (https://sketchfab.com/artfletch)", - "license": "CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)", - "source": "https://sketchfab.com/3d-models/southbank-undercroft-skatepark-add37d5dc6a2456eb0d7607c6fbd884d", - "title": "Southbank Undercroft Skatepark" - }, - "generator": "Sketchfab-12.67.0", - "version": "2.0" - }, - "bufferViews": [ - { - "buffer": 0, - "byteLength": 21871560, - "name": "floatBufferViews", - "target": 34963 - }, - { - "buffer": 0, - "byteLength": 11593456, - "byteOffset": 21871560, - "byteStride": 8, - "name": "floatBufferViews", - "target": 34962 - }, - { - "buffer": 0, - "byteLength": 34780368, - "byteOffset": 33465016, - "byteStride": 12, - "name": "floatBufferViews", - "target": 34962 - } - ], - "buffers": [ - { - "byteLength": 68245384, - "uri": "scene.bin" - } - ], - "extensionsUsed": [ - "KHR_materials_unlit" - ], - "images": [ - { - "uri": "textures/SouthbankSkatePark02_SouthbankSkatePark02_u1_v1_baseColor.jpeg" - } - ], - "materials": [ - { - "doubleSided": true, - "extensions": { - "KHR_materials_unlit": {} - }, - "name": "SouthbankSkatePark02_SouthbankSkatePark02_u1_v1", - "pbrMetallicRoughness": { - "baseColorTexture": { - "index": 0 - }, - "metallicFactor": 0.0 - } - } - ], - "meshes": [ - { - "name": "Object_0", - "primitives": [ - { - "attributes": { - "NORMAL": 1, - "POSITION": 0, - "TEXCOORD_0": 2 - }, - "indices": 3, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_1", - "primitives": [ - { - "attributes": { - "NORMAL": 5, - "POSITION": 4, - "TEXCOORD_0": 6 - }, - "indices": 7, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_2", - "primitives": [ - { - "attributes": { - "NORMAL": 9, - "POSITION": 8, - "TEXCOORD_0": 10 - }, - "indices": 11, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_3", - "primitives": [ - { - "attributes": { - "NORMAL": 13, - "POSITION": 12, - "TEXCOORD_0": 14 - }, - "indices": 15, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_4", - "primitives": [ - { - "attributes": { - "NORMAL": 17, - "POSITION": 16, - "TEXCOORD_0": 18 - }, - "indices": 19, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_5", - "primitives": [ - { - "attributes": { - "NORMAL": 21, - "POSITION": 20, - "TEXCOORD_0": 22 - }, - "indices": 23, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_6", - "primitives": [ - { - "attributes": { - "NORMAL": 25, - "POSITION": 24, - "TEXCOORD_0": 26 - }, - "indices": 27, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_7", - "primitives": [ - { - "attributes": { - "NORMAL": 29, - "POSITION": 28, - "TEXCOORD_0": 30 - }, - "indices": 31, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_8", - "primitives": [ - { - "attributes": { - "NORMAL": 33, - "POSITION": 32, - "TEXCOORD_0": 34 - }, - "indices": 35, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_9", - "primitives": [ - { - "attributes": { - "NORMAL": 37, - "POSITION": 36, - "TEXCOORD_0": 38 - }, - "indices": 39, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_10", - "primitives": [ - { - "attributes": { - "NORMAL": 41, - "POSITION": 40, - "TEXCOORD_0": 42 - }, - "indices": 43, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_11", - "primitives": [ - { - "attributes": { - "NORMAL": 45, - "POSITION": 44, - "TEXCOORD_0": 46 - }, - "indices": 47, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_12", - "primitives": [ - { - "attributes": { - "NORMAL": 49, - "POSITION": 48, - "TEXCOORD_0": 50 - }, - "indices": 51, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_13", - "primitives": [ - { - "attributes": { - "NORMAL": 53, - "POSITION": 52, - "TEXCOORD_0": 54 - }, - "indices": 55, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_14", - "primitives": [ - { - "attributes": { - "NORMAL": 57, - "POSITION": 56, - "TEXCOORD_0": 58 - }, - "indices": 59, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_15", - "primitives": [ - { - "attributes": { - "NORMAL": 61, - "POSITION": 60, - "TEXCOORD_0": 62 - }, - "indices": 63, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_16", - "primitives": [ - { - "attributes": { - "NORMAL": 65, - "POSITION": 64, - "TEXCOORD_0": 66 - }, - "indices": 67, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_17", - "primitives": [ - { - "attributes": { - "NORMAL": 69, - "POSITION": 68, - "TEXCOORD_0": 70 - }, - "indices": 71, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_18", - "primitives": [ - { - "attributes": { - "NORMAL": 73, - "POSITION": 72, - "TEXCOORD_0": 74 - }, - "indices": 75, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_19", - "primitives": [ - { - "attributes": { - "NORMAL": 77, - "POSITION": 76, - "TEXCOORD_0": 78 - }, - "indices": 79, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_20", - "primitives": [ - { - "attributes": { - "NORMAL": 81, - "POSITION": 80, - "TEXCOORD_0": 82 - }, - "indices": 83, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_21", - "primitives": [ - { - "attributes": { - "NORMAL": 85, - "POSITION": 84, - "TEXCOORD_0": 86 - }, - "indices": 87, - "material": 0, - "mode": 4 - } - ] - }, - { - "name": "Object_22", - "primitives": [ - { - "attributes": { - "NORMAL": 89, - "POSITION": 88, - "TEXCOORD_0": 90 - }, - "indices": 91, - "material": 0, - "mode": 4 - } - ] - } - ], - "nodes": [ - { - "children": [ - 1 - ], - "matrix": [ - 2.0, - 0.0, - 0.0, - 0.0, - 0.0, - -2.0, - -8.881784197001252e-16, - 0.0, - 0.0, - 8.881784197001252e-16, - -2.0, - 0.0, - 0.0, - 1.9645015001296986, - 4.735795974731445, - 1.0 - ], - "name": "Sketchfab_model" - }, - { - "children": [ - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24 - ], - "name": "SouthbankSkatePark02.obj.cleaner.materialmerger.gles" - }, - { - "mesh": 0, - "name": "Object_2" - }, - { - "mesh": 1, - "name": "Object_3" - }, - { - "mesh": 2, - "name": "Object_4" - }, - { - "mesh": 3, - "name": "Object_5" - }, - { - "mesh": 4, - "name": "Object_6" - }, - { - "mesh": 5, - "name": "Object_7" - }, - { - "mesh": 6, - "name": "Object_8" - }, - { - "mesh": 7, - "name": "Object_9" - }, - { - "mesh": 8, - "name": "Object_10" - }, - { - "mesh": 9, - "name": "Object_11" - }, - { - "mesh": 10, - "name": "Object_12" - }, - { - "mesh": 11, - "name": "Object_13" - }, - { - "mesh": 12, - "name": "Object_14" - }, - { - "mesh": 13, - "name": "Object_15" - }, - { - "mesh": 14, - "name": "Object_16" - }, - { - "mesh": 15, - "name": "Object_17" - }, - { - "mesh": 16, - "name": "Object_18" - }, - { - "mesh": 17, - "name": "Object_19" - }, - { - "mesh": 18, - "name": "Object_20" - }, - { - "mesh": 19, - "name": "Object_21" - }, - { - "mesh": 20, - "name": "Object_22" - }, - { - "mesh": 21, - "name": "Object_23" - }, - { - "mesh": 22, - "name": "Object_24" - } - ], - "samplers": [ - { - "magFilter": 9729, - "minFilter": 9987, - "wrapS": 10497, - "wrapT": 10497 - } - ], - "scene": 0, - "scenes": [ - { - "name": "Sketchfab_Scene", - "nodes": [ - 0 - ] - } - ], - "textures": [ - { - "sampler": 0, - "source": 0 - } - ] -} diff --git a/add/skatepark/textures/SouthbankSkatePark02_SouthbankSkatePark02_u1_v1_baseColor.jpeg b/add/skatepark/textures/SouthbankSkatePark02_SouthbankSkatePark02_u1_v1_baseColor.jpeg deleted file mode 100644 index 2389f0d..0000000 Binary files a/add/skatepark/textures/SouthbankSkatePark02_SouthbankSkatePark02_u1_v1_baseColor.jpeg and /dev/null differ diff --git a/app/Greenyard/Mono.cs b/app/Greenyard/Mono.cs index ab01736..a03105d 100644 --- a/app/Greenyard/Mono.cs +++ b/app/Greenyard/Mono.cs @@ -66,7 +66,7 @@ public class Mono { rig.lCon.device.stick.y ); if (input.MagnitudeSq > 0.01f) { - offset += Quat.FromAngles(0, angle.y, 0).Inverse * input * Time.Elapsedf; + offset += (Quat.FromAngles(0, angle.y, 0).Inverse * rig.lCon.ori).Normalized * input * Time.Elapsedf; } @@ -74,12 +74,12 @@ public class Mono { // Oriel float scale = oriel.scale * oriel.multiplier; - if (oriel.scaleHeight) { + if (oriel.scaleWithHeight) { scale *= oriel.bounds.dimensions.y; } Matrix simMatrix = Matrix.TRS( - new Vec3(0, -oriel.bounds.dimensions.y / 2.01f, 0), + Vec3.Zero, // -oriel.bounds.dimensions.y / 2.01f Quat.FromAngles(0, angle.y, 0), Vec3.One * scale ); diff --git a/app/Mono.cs b/app/Mono.cs index a258d3c..f67c8e4 100644 --- a/app/Mono.cs +++ b/app/Mono.cs @@ -93,7 +93,7 @@ public class Mono { if (UI.Button("Reset Oriel Quat")) { oriel.ori = Quat.Identity; } // if (UI.Button("Draw Oriel Axis")) { oriel.drawAxis = !oriel.drawAxis; } - if (UI.Button("Scale w/Height")) { oriel.scaleHeight = !oriel.scaleHeight; } + if (UI.Button("Scale w/Height")) { oriel.scaleWithHeight = !oriel.scaleWithHeight; } UI.HSlider("Scale", ref oriel.scale, 0.1f, 1f, 0.1f); UI.HSlider("Multiplier", ref oriel.multiplier, 0.1f, 1f, 0.1f); diff --git a/app/Oriel.cs b/app/Oriel.cs index e5429e5..62829a3 100644 --- a/app/Oriel.cs +++ b/app/Oriel.cs @@ -15,7 +15,7 @@ public class Oriel { public Quat ori = Quat.Identity; // inner matrix - public bool scaleHeight = true; + public bool scaleWithHeight = false; public float scale = 0.5f; public float multiplier = 1f;