From 5787c27d73b678c73c53d616f9e40cd2e0e02ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 14 Nov 2022 12:33:03 +0100 Subject: [PATCH] doc: updated credits and changelog. --- doc/changelog.dox | 15 +++++++++++++++ doc/credits.dox | 7 ++++--- src/Magnum/MeshTools/Compile.cpp | 1 + src/Magnum/MeshTools/Test/CompileGLTest.cpp | 1 + src/Magnum/Shaders/GenericGL.h | 1 + src/Magnum/Shaders/PhongGL.cpp | 1 + src/Magnum/Shaders/PhongGL.h | 1 + src/Magnum/Shaders/generic.glsl | 1 + src/Magnum/Trade/MeshData.cpp | 1 + src/Magnum/Trade/MeshData.h | 1 + src/Magnum/Trade/Test/MeshDataTest.cpp | 1 + 11 files changed, 28 insertions(+), 3 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index f050ad18f..1fb3a5ad1 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -262,6 +262,14 @@ See also: - Support for instanced drawing in @ref Shaders::MeshVisualizerGL2D and @ref Shaders::MeshVisualizerGL3D for better feature parity with the other shaders +- New @ref Shaders::Generic::JointIds, + @ref Shaders::Generic::SecondaryJointIds, @ref Shaders::Generic::Weights + and @ref Shaders::Generic::SecondaryWeights attributes for GPU skinning + support (see also [mosra/magnum#441](https://github.com/mosra/magnum/pull/441)) +- GPU skinning support in @ref Shaders::FlatGL, @ref Shaders::PhongGL and + @ref Shaders::MeshVisualizerGL2D / @ref Shaders::MeshVisualizerGL3D (see + also [mosra/magnum#444](https://github.com/mosra/magnum/pull/444) and + [mosra/magnum#506](https://github.com/mosra/magnum/issues/506)) - Added @ref Shaders::PhongGL::setNormalTextureScale(), consuming the recently added @ref Trade::MaterialAttribute::NormalTextureScale material attribute @@ -307,6 +315,9 @@ See also: - New @ref Trade::SkinData class and @ref Trade::AbstractImporter::skin2D() / @ref Trade::AbstractImporter::skin3D() family of APIs for skin import, as well as support in @ref Trade::AnySceneImporter "AnySceneImporter" +- New builtin @ref Trade::MeshAttribute::JointIds and + @ref Trade::MeshAttribute::Weights attributes for skinning (see + [mosra/magnum#441](https://github.com/mosra/magnum/pull/441)) - The @ref Trade::AbstractSceneConverter plugin interface gained support for batch conversion of whole scenes --- meshes, hierarchies, materials, textures, animations and other data; @relativeref{Trade,AnySceneConverter} @@ -481,6 +492,10 @@ See also: @ref MeshTools::concatenate(const Containers::Iterable&, InterleaveFlags) optionally take a @ref MeshTools::InterleaveFlags parameter affecting the output, in particular whether to preserve the original interleaved layout. +- Support for new @ref Trade::MeshAttribute::JointIds and + @ref Trade::MeshAttribute::Weights in @ref MeshTools::compile() as well as + a new @ref MeshTools::compiledPerVertexJointCount() helper utility (see + also [mosra/magnum#444](https://github.com/mosra/magnum/pull/444)) @subsubsection changelog-latest-changes-platform Platform libraries diff --git a/doc/credits.dox b/doc/credits.dox index 7a7e57fc8..1fcd74ba1 100644 --- a/doc/credits.dox +++ b/doc/credits.dox @@ -168,9 +168,10 @@ Are the below lists missing your name or something's wrong? - **Jonathan Hale** ([\@Squareys](https://github.com/Squareys)) --- @ref Audio and @ref Trade library enhancements, @ref Platform::GlfwApplication and @ref Platform::EmscriptenApplication - implementation, frustum and cone culling and other @ref Math additions, bug - reports, Windows build improvements, documentation improvements and tons of - other stuff + implementation, frustum and cone culling and other @ref Math additions, + prototyping skinning support in @ref Trade::MeshData, @ref Shaders::PhongGL + and @ref MeshTools::compile(), bug reports, Windows build improvements, + documentation improvements and tons of other stuff - **Kleis Auke Wolthuizen** ([@\kleisauke](https://github.com/kleisauke)) --- Emscripten build fixes - **Konstantinos Chatzilygeroudis** ([\@costashatz](https://github.com/costashatz)) diff --git a/src/Magnum/MeshTools/Compile.cpp b/src/Magnum/MeshTools/Compile.cpp index b59b99af9..38daa0b6a 100644 --- a/src/Magnum/MeshTools/Compile.cpp +++ b/src/Magnum/MeshTools/Compile.cpp @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2020 Jonathan Hale Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/MeshTools/Test/CompileGLTest.cpp b/src/Magnum/MeshTools/Test/CompileGLTest.cpp index 3cdb21709..868be50b6 100644 --- a/src/Magnum/MeshTools/Test/CompileGLTest.cpp +++ b/src/Magnum/MeshTools/Test/CompileGLTest.cpp @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2020 Jonathan Hale Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/GenericGL.h b/src/Magnum/Shaders/GenericGL.h index 259526b56..c13a1663b 100644 --- a/src/Magnum/Shaders/GenericGL.h +++ b/src/Magnum/Shaders/GenericGL.h @@ -5,6 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2020 Jonathan Hale Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/PhongGL.cpp b/src/Magnum/Shaders/PhongGL.cpp index 882dc792a..aad1646a8 100644 --- a/src/Magnum/Shaders/PhongGL.cpp +++ b/src/Magnum/Shaders/PhongGL.cpp @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2020 Jonathan Hale Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a diff --git a/src/Magnum/Shaders/PhongGL.h b/src/Magnum/Shaders/PhongGL.h index d96ea5110..d6bfc5956 100644 --- a/src/Magnum/Shaders/PhongGL.h +++ b/src/Magnum/Shaders/PhongGL.h @@ -5,6 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2020 Jonathan Hale Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a diff --git a/src/Magnum/Shaders/generic.glsl b/src/Magnum/Shaders/generic.glsl index 8e6aeec8d..485474cce 100644 --- a/src/Magnum/Shaders/generic.glsl +++ b/src/Magnum/Shaders/generic.glsl @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2020 Jonathan Hale Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Trade/MeshData.cpp b/src/Magnum/Trade/MeshData.cpp index 15d762a57..96b995944 100644 --- a/src/Magnum/Trade/MeshData.cpp +++ b/src/Magnum/Trade/MeshData.cpp @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2020 Jonathan Hale Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Trade/MeshData.h b/src/Magnum/Trade/MeshData.h index 9ce4a7dbe..cb1e4eb93 100644 --- a/src/Magnum/Trade/MeshData.h +++ b/src/Magnum/Trade/MeshData.h @@ -5,6 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2020 Jonathan Hale Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Trade/Test/MeshDataTest.cpp b/src/Magnum/Trade/Test/MeshDataTest.cpp index 953547064..998ec7efb 100644 --- a/src/Magnum/Trade/Test/MeshDataTest.cpp +++ b/src/Magnum/Trade/Test/MeshDataTest.cpp @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2020 Jonathan Hale Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),