diff options
| -rw-r--r-- | .mailmap | 2 | ||||
| -rw-r--r-- | AUTHORS.md | 1 | ||||
| -rw-r--r-- | DONORS.md | 135 | ||||
| -rw-r--r-- | scene/resources/mesh.cpp | 16 |
4 files changed, 92 insertions, 62 deletions
@@ -24,7 +24,9 @@ Chris Bradfield <chris@kidscancode.org> <cb@scribe.net> Clay John <claynjohn@gmail.com> Clay John <claynjohn@gmail.com> <clayjohn@shaw.ca> Dana Olson <dana@shineuponthee.com> <adolson@gmail.com> +dankan1890 <mewuidev2@gmail.com> Daniel J. Ramirez <djrmuv@gmail.com> +Emmanuel Barroga <emmanuelbarroga@gmail.com> Erik Selecký <35656626+rxlecky@users.noreply.github.com> Erik Selecký <35656626+rxlecky@users.noreply.github.com> <35656626+SeleckyErik@users.noreply.github.com> Fabian <supagu@gmail.com> diff --git a/AUTHORS.md b/AUTHORS.md index 8be2d05455..a3269a73f7 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -124,6 +124,7 @@ name is available. Michael Alexsander (YeldhamDev) MichiRecRoom (LikeLakers2) mrezai + muiroc Nathan Warden (NathanWarden) Nils André-Chang (NilsIrl) Nuno Donato (nunodonato) @@ -28,8 +28,11 @@ generous deed immortalized in the next stable release of Godot Engine. Andres Hernandez Andrew Dunai Brandon Lamb + Christian Baune Christopher Montesano Darkhan Baimyrza + Darrin Massena + Dov Zimring Edward Flick Gamechuck GameDev.net @@ -42,13 +45,12 @@ generous deed immortalized in the next stable release of Godot Engine. Justin Arnold Justo Delgado Baudí Kyle Szklenski - Leonard Meagher - Mariano Suligoy Matthieu Huvé Maxim Karsten Mike King Nathan Warden Neal Gompa (Conan Kudo) + Péter Magyar Slobodan Milnovic Stephan Lanfermann Steve @@ -77,32 +79,31 @@ generous deed immortalized in the next stable release of Godot Engine. Austen McRae Bernhard Werner beVR - Brian van der Stel Carlo Cabanilla Daniel James David Giardi Default Name + eggs + Felix Bohmann Florian Breisch Gamejunkey Javier Roman Jay Horton - Joel Höglund Jon Woodward - Jose Fernando Alexandre Karl Werf + Keinan Powers Klavdij Voncina Lex Steers Luke Maciej Pendolski Matthew Hillier Mohamed Ikbel Boulabiar - Mored1984 - Péter Magyar + Mored4u Rob Messick Ryan Badour + Sandro Jenny Scott Wadden Sergey - Shawn Yu thechris Tom Langwaldt tukon @@ -115,6 +116,7 @@ generous deed immortalized in the next stable release of Godot Engine. Conrad Curry Craig Smith Darrian Little + Horváth Péter Ivan Trombley Jakub Dering Joan Fons @@ -128,6 +130,7 @@ generous deed immortalized in the next stable release of Godot Engine. Rob Robert Willes Ronnie Ashlock + SKison Thomas Bjarnelöf Unseen Domains Valryia @@ -135,49 +138,59 @@ generous deed immortalized in the next stable release of Godot Engine. Wojciech Chojnacki Xavier PATRICELLI + Adam Nakonieczny Adam Neumann Alexander J Maynard Alexey Dyadchenko + Alex Z Andreas Funke André Frélicot - Andrew Bowen aoshiwik + Ben Powell Carlos de Sousa Marques + Charlie Whitfield Chase Taranto Chris Petrich Christian Leth Jeppesen Christoph Schröder Cody Parker + Coldragon Craig Ostrin D Daniel Eichler David White + Denis Janßen + Easypete Eric Monson + ethan ball Eugenio Hugo Salgüero Jáñez Fain flesk + Gary Hulst gavlig GGGames.org + Green Fox Guilherme Felipe de C. G. da Silva + Halom Vered Heath Hayes - Hysteria Idzard Kwadijk + Isaac Clausman Jared White Jeff Nyte Jeremy Sims Jerry Ling Joe Flood + John G Gentzel + Jon Hermansen Jose Malheiro Joshua Lesperance Juan Velandia Juraj Móza - Kasper Jeppesen kinfox Marcelo Dornbusch Lopes Markus Fehr Markus Wiesner Martin Eigel - Marvin Matt Eunson Max Bulai MuffinManKen @@ -190,19 +203,23 @@ generous deed immortalized in the next stable release of Godot Engine. pl Ranoller Robert Larnach - Robin Arys Rocknight Studios Romildo Franco - Ryan Samuel Judd Scott Pilet + Sean Morgan + SleepCircle spilldata + Steve Hyatt Stoned Xander TheLevelOfDetail . Thomas Krampl Thomas Kurz Tobias Bocanegra + Tricky Fat Cat Urho + William Foster + Zhou Tuizhi Zie Weaver 蕭惟允 @@ -214,7 +231,7 @@ generous deed immortalized in the next stable release of Godot Engine. Adam Brunnmeier Adam Carr Adam Long - Adam Nakonieczny + Adam McCurdy Adam N Webber Adam Smeltzer Adam Szymański @@ -223,21 +240,23 @@ generous deed immortalized in the next stable release of Godot Engine. Agustinus Arya Aidan O'Flannagain Aki Mimoto + Alan Mervitz + Alan Stice Albin Jonasson Svärdsby Alder Stefano Alessandro Senese + Alexander Erlemann alex clavelle - Alex Davies-Moore + Allan Davis Allen Schade Andreas Evers Andreas Krampitz André Simões Andrew Thomas - Andrzej Skalski - Angelos Arnaoutis Anthony Staunton AP Condomines Arda Erol + Armin Preiml Arseniy M Arthur S. Muszynski Asger @@ -253,28 +272,29 @@ generous deed immortalized in the next stable release of Godot Engine. Black Block Blair Allen Bobby CC Wong - Bryan Stevenson + brian + bugcaptor + Burney Waring + Cameron Meyer Carl van der Geest Carwyn Edwards - Casey M. + Cassidy James Chris Brown Chris Chapin - Christian Baune Christian Winter Christoffer Sundbom + Christoph Brodmann Christopher Schmitt Christoph Woinke Clay Heaton - Collin Shooltz + Curt King + Dancin Liao Daniel Johnson Daniel Kimblad - DanielMaximiano Daniel Pontillo - Daniel Reed David May - David Rapisarda David Woodard - Dennis Idzikowsky + DiCola Jamn Dominic Cooney Dominik Wetzel Donn Eddy @@ -286,51 +306,61 @@ generous deed immortalized in the next stable release of Godot Engine. Dylan Todd Eduardo Teixeira Edward Herbert + Edward Moulsdale + Edward Swartz Egon Elbre + Elias Nykrem Elmeri '- Duy Kevin Nguyen + Ephemeral Eric Ellingson + Eric Rogers Eric Williams Erkki Seppälä Evan Rose Fancy Ants Studios Fekinox Felix Kollmann - fengjiongmax Flaredown Forty Doubleu FuDiggity - G3Dev sàrl Gadzhi Kharkharov gamedev by Celio - Gary Hulst + Gary Thomas George Marques GiulianoB + Gordian Arragon Greg Olson GREGORY C FEIN Greg P Greyson Richey + Grid Guldoman Hal A Heribert Hirth + Hudson Thorpe-Doubble Hunter Jones Hylpher + Ichiro Dohi Iiari + iKlem IndustrialRobot - Isaac Morton Jaiden Gerig Jaime Ruiz-Borau Vizárraga Jako Danar James A F Manley + Janders Jannik Gröger - Jax + JARKKO PARVIAINEN + Jarrod Davis Jeff Hungerford Jennifer Graves Jeremy Kahn Jesse Dubay - Joe Alden Joel Fivat + Joel Höglund Joel Setterberg Johannes Wuensch + John Gabriel Jomei Jackson Jonas Rudlang Jonas Yamazaki @@ -338,6 +368,7 @@ generous deed immortalized in the next stable release of Godot Engine. Jonathon Jon Bonazza Jon Sully + Jorge Caballero Jose Aleman Jose C. Rubio Joseph Catrambone @@ -346,9 +377,8 @@ generous deed immortalized in the next stable release of Godot Engine. Julian Murgia JungleRobba Justin Spedding - Kaiser Bald0 + KaDokta Kauzig - KC Chan Keedong Park Keith Bradner Kevin McPhillips @@ -356,40 +386,44 @@ generous deed immortalized in the next stable release of Godot Engine. Kiyohiro Kawamura (kyorohiro) Kjetil Haugland Klagsam - Klassix KR McGinley KsyTek Games Kuan Cheang kycho + Kyle Appelgate + Laurent Tréguier Leonardo Dimano Levi Lindsey Linus Lind Lundgren Lionel Gaillard + Luigi Renna LunaticInAHat Lurkars Major Haul Malcolm Malik Ahmed Malik Nejer - Marcus Richter Markus Michael Egger Martin Holas Martin Liška + Marvin + Mathieu Rimelen + Matt Edwards Matthew Little Matti Pohjanvirta Maxime Blade Maxwell medecau + Megasploot Melissa Mears - M H + mewin mhilbrunner - Michael Dürwald - Michael Gringauz Michael Haney Michael Labbe Mikael Olsson Mikayla Mike Birkhead + Mike Cunningham Mitchell J. Wagner MoM Nathan Fish @@ -399,8 +433,8 @@ generous deed immortalized in the next stable release of Godot Engine. Neil Wang Nerdforge Nicholas + Nicholas Girga Nick Macholl - Niclas Eriksen Nicolás Montaña Nicolas SAN AGUSTIN Nima Farid @@ -418,10 +452,7 @@ generous deed immortalized in the next stable release of Godot Engine. Penguin Petrus Prinsloo Philip Cohoe - Pierre-Igor Berthet - Pitsanu Tongprasin Point08 - Poryg Rad Cat Rafa Laguna rainerLinux @@ -431,13 +462,13 @@ generous deed immortalized in the next stable release of Godot Engine. Ricardo Alcantara Richard Diss Richard Ivánek - Richard Patching Robert Farr (Larington) Robert Hernandez - Rodrigo Loli + Roberto Sánchez Roger Smith Roland Rząsa Roman Tinkov + Ronald Ho Hip (CrimsonZA) Ronan Ryan Groom Ryan Hentz @@ -446,27 +477,29 @@ generous deed immortalized in the next stable release of Godot Engine. Samuele Zolfanelli Sasori Olkof Scott D. Yelich + Scott Longley Sebastian Michailidis + Sergio Mello-Grand sgnsajgon Shane Shane Sicienski Shane Spoor + Siim Raidma Simon Wenner SK smbe19 - Stonepyre + smo1704 Svenne Krap + Terry tezuvholovdr thomas Thomas Bechtold + Thomas Detoy Thomas Kelly - tiansheng li Tim Drumheller Timothy B. MacDonald - tinyBigGames LLC Tobbun - Tom Fulp - Tom Glenn + Torgeir Lilleskog Torsten Crass Travis O'Brien Trent Skinner @@ -476,7 +509,6 @@ generous deed immortalized in the next stable release of Godot Engine. Tyler Compton Tyler Stafos UltyX - Vaiktorg Vaughan Ling Victor Vigilant Watch @@ -487,7 +519,6 @@ generous deed immortalized in the next stable release of Godot Engine. Wiley Thompson Will William Hogben - Wout Standaert Wyatt Goodin Yegor Yuri Sizov diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index a063b7f74f..5e032c41bf 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -252,10 +252,12 @@ Ref<Shape> Mesh::create_trimesh_shape() const { Vector<Vector3> face_points; face_points.resize(faces.size() * 3); - for (int i = 0; i < face_points.size(); i++) { + for (int i = 0; i < face_points.size(); i += 3) { Face3 f = faces.get(i / 3); - face_points.set(i, f.vertex[i % 3]); + face_points.set(i, f.vertex[0]); + face_points.set(i + 1, f.vertex[1]); + face_points.set(i + 2, f.vertex[2]); } Ref<ConcavePolygonShape> shape = memnew(ConcavePolygonShape); @@ -543,15 +545,9 @@ Vector<Ref<Shape> > Mesh::convex_decompose() const { ERR_FAIL_COND_V(!convex_composition_function, Vector<Ref<Shape> >()); - Vector<Face3> faces = get_faces(); - Vector<Face3> f3; - f3.resize(faces.size()); - const Face3 *f = faces.ptr(); - for (int i = 0; i < f3.size(); i++) { - f3.write[i] = f[i]; - } + const Vector<Face3> faces = get_faces(); - Vector<Vector<Face3> > decomposed = convex_composition_function(f3); + Vector<Vector<Face3> > decomposed = convex_composition_function(faces); Vector<Ref<Shape> > ret; |