diff --git a/Examples/Core/InputGesturesTestBed.cs b/Examples/Core/InputGesturesTestBed.cs index 6595051..4039ebb 100644 --- a/Examples/Core/InputGesturesTestBed.cs +++ b/Examples/Core/InputGesturesTestBed.cs @@ -397,18 +397,18 @@ public class InputGesturesTestBed { switch (gesture) { - case 0: return "None"; break; - case 1: return "Tap"; break; - case 2: return "Double Tap"; break; - case 4: return "Hold"; break; - case 8: return "Drag"; break; - case 16: return "Swipe Right"; break; - case 32: return "Swipe Left"; break; - case 64: return "Swipe Up"; break; - case 128: return "Swipe Down"; break; - case 256: return "Pinch In"; break; - case 512: return "Pinch Out"; break; - default: return "Unknown"; break; + case 0: return "None"; + case 1: return "Tap"; + case 2: return "Double Tap"; + case 4: return "Hold"; + case 8: return "Drag"; + case 16: return "Swipe Right"; + case 32: return "Swipe Left"; + case 64: return "Swipe Up"; + case 128: return "Swipe Down"; + case 256: return "Pinch In"; + case 512: return "Pinch Out"; + default: return "Unknown"; } } @@ -417,18 +417,18 @@ public class InputGesturesTestBed { switch (gesture) { - case 0: return Color.Black; break; - case 1: return Color.Blue; break; - case 2: return Color.SkyBlue; break; - case 4: return Color.Black; break; - case 8: return Color.Lime; break; - case 16: return Color.Red; break; - case 32: return Color.Red; break; - case 64: return Color.Red; break; - case 128: return Color.Red; break; - case 256: return Color.Violet; break; - case 512: return Color.Orange; break; - default: return Color.Black; break; + case 0: return Color.Black; + case 1: return Color.Blue; + case 2: return Color.SkyBlue; + case 4: return Color.Black; + case 8: return Color.Lime; + case 16: return Color.Red; + case 32: return Color.Red; + case 64: return Color.Red; + case 128: return Color.Red; + case 256: return Color.Violet; + case 512: return Color.Orange; + default: return Color.Black; } } } diff --git a/Examples/Models/LoadingGltf.cs b/Examples/Models/LoadingGltf.cs index 586ff19..588c003 100644 --- a/Examples/Models/LoadingGltf.cs +++ b/Examples/Models/LoadingGltf.cs @@ -76,13 +76,8 @@ public class LoadingGltf // Update model animation - animCurrentFrame = (animCurrentFrame + 1)%anims[animIndex].KeyFrameCount; + animCurrentFrame = (animCurrentFrame + 1) % anims[animIndex].KeyFrameCount; UpdateModelAnimation(model, anims[animIndex], (float)animCurrentFrame); - - if (animCurrentFrame >= anims[0].KeyFrameCount) - { - animCurrentFrame = 0; - } //---------------------------------------------------------------------------------- // Draw diff --git a/Examples/licenses/resources.LICENSE b/Examples/licenses/resources.LICENSE index c7fef65..0eda567 100644 --- a/Examples/licenses/resources.LICENSE +++ b/Examples/licenses/resources.LICENSE @@ -35,14 +35,10 @@ fonts: | pixantiqua.fnt, pixantiqua.png | Gerhard Großmann | [Freeware](https://www.dafont.com/es/pixantiqua.font) | Atlas made with [BMFont](https://www.angelcode.com/products/bmfont/) by [@raysan5](https://github.com/raysan5) | | pixantiqua.ttf | Gerhard Großmann | [Freeware](https://www.dafont.com/es/pixantiqua.font) | - | | symbola.fnt, symbola.png | George Douros | [Freeware](https://fontlibrary.org/en/font/symbola) | Atlas made with [BMFont](https://www.angelcode.com/products/bmfont/) by [@raysan5](https://github.com/raysan5) | - +| DotGothic16-Regular.ttf | [The DotGothic16 Project Authors](https://github.com/fontworks-fonts/DotGothic16) | [Open Font License](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL) | - | +| NotoSansTC-Regular.ttf | [Adobe](http://www.adobe.com/) | [SIL Open Font License](https://openfontlicense.org/documents/OFL.txt) | - | models: -| resource | author | licence | notes | -| :------------------- | :---------: | :------ | :---- | -| models/obj/barracks.obj,
models/barracks_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | -| models/obj/church.obj,
models/church_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | -| models/obj/watermill.obj,
models/watermill_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | | models/obj/castle.obj,
models/obj/castle_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | | models/obj/bridge.obj,
models/obj/bridge_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | | models/obj/house.obj,
models/obj/house_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | @@ -56,7 +52,9 @@ models: | models/vox/chr_knight.vox | ❔ | ❔ | - | | models/vox/chr_sword.vox | ❔ | ❔ | - | | models/vox/monu9.vox | ❔ | ❔ | - | - +| models/barracks.obj,
models/barracks_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | +| models/church.obj,
models/church_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | +| models/watermill.obj,
models/watermill_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | images: | resource | author | licence | notes | @@ -92,4 +90,4 @@ images: | dresden_square_1k.hdr | [HDRIHaven](https://hdrihaven.com/hdri/?h=dresden_square) | [CC0](https://hdrihaven.com/p/license.php) | - | | dresden_square_2k.hdr | [HDRIHaven](https://hdrihaven.com/hdri/?h=dresden_square) | [CC0](https://hdrihaven.com/p/license.php) | - | | skybox.png | ❔ | ❔ | - | - +| mandrill.png | ❔ | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Mandrill (a.k.a. Baboon) | diff --git a/Examples/resources/audio/LICENSE.md b/Examples/resources/audio/LICENSE.md deleted file mode 100644 index 67e6584..0000000 --- a/Examples/resources/audio/LICENSE.md +++ /dev/null @@ -1,10 +0,0 @@ -| resource | author | licence | notes | -| :------------------- | :---------: | :------ | :---- | -| country.mp3 | [@emegeme](https://github.com/emegeme) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Originally created for "DART that TARGET" game | -| target.ogg | [@emegeme](https://github.com/emegeme) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Originally created for "DART that TARGET" game | -| target.flac | [@emegeme](https://github.com/emegeme) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Originally created for "DART that TARGET" game | -| coin.wav | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Made with [rFXGen](https://raylibtech.itch.io/rfxgen) | -| sound.wav | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Made with [rFXGen](https://raylibtech.itch.io/rfxgen) | -| spring.wav | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Made with [rFXGen](https://raylibtech.itch.io/rfxgen) | -| weird.wav | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Made with [rFXGen](https://raylibtech.itch.io/rfxgen) | -| mini1111.xm | [tPORt](https://modarchive.org/index.php?request=view_by_moduleid&query=51891) | [Mod Archive Distribution license](https://modarchive.org/index.php?terms-upload) | - | diff --git a/Examples/resources/models/gltf/LICENSE b/Examples/resources/models/gltf/LICENSE deleted file mode 100644 index e1d1d2e..0000000 --- a/Examples/resources/models/gltf/LICENSE +++ /dev/null @@ -1,5 +0,0 @@ -robot.glb model by @Quaternius (https://www.patreon.com/quaternius) -Licensed under CC0 1.0 Universal (CC0 1.0) - Public Domain Dedication (https://creativecommons.org/publicdomain/zero/1.0/) - -greenman.glb, greenman_hat.glb, greenman_sword.glb, greenman_shield.glb models by @iP (https://github.com/ipzaur) -Licensed under CC0 1.0 Universal (CC0 1.0) - Public Domain Dedication (https://creativecommons.org/publicdomain/zero/1.0/) \ No newline at end of file diff --git a/Examples/resources/models/vox/LICENSE b/Examples/resources/models/vox/LICENSE deleted file mode 100644 index afb6608..0000000 --- a/Examples/resources/models/vox/LICENSE +++ /dev/null @@ -1,9 +0,0 @@ -The following models are provided by the official github repo of voxel-model format by MagikaVoxel developer @ephtracy - -GitHub official repo: https://github.com/ephtracy/voxel-model - - - chr_knight.vox - https://github.com/ephtracy/voxel-model/blob/master/vox/character/chr_knight.vox - - chr_sword.vox - https://github.com/ephtracy/voxel-model/blob/master/vox/character/chr_sword.vox - - monu9.vox - https://github.com/ephtracy/voxel-model/blob/master/vox/monument/monu9.vox - -Worth mentioning there is no license specified for the models yet: https://github.com/ephtracy/voxel-model/issues/22 diff --git a/Raylib-cs.Native/Raylib-cs.Native.csproj b/Raylib-cs.Native/Raylib-cs.Native.csproj index 18e0544..92415c8 100644 --- a/Raylib-cs.Native/Raylib-cs.Native.csproj +++ b/Raylib-cs.Native/Raylib-cs.Native.csproj @@ -1,6 +1,6 @@ - net8.0;net10.0 + net8.0 false none false