From 15114bd9151fdbf9e65dfa782d9cb4c13fb3825d Mon Sep 17 00:00:00 2001 From: Jimmy Cassis Date: Thu, 22 Feb 2024 14:54:11 -0800 Subject: [PATCH] Update licensing information --- LICENSE.txt | 375 ++++++++++++++++++++ LICENSE.md => LICENSES.md | 8 +- README.md | 2 +- foo_vis_milk2/config.h | 8 +- foo_vis_milk2/foo_vis_milk2.vcxproj | 3 +- foo_vis_milk2/foo_vis_milk2.vcxproj.filters | 5 +- foo_vis_milk2/main.cpp | 27 +- foo_vis_milk2/pch.cpp | 6 +- foo_vis_milk2/pch.h | 6 +- foo_vis_milk2/preferences.cpp | 10 +- foo_vis_milk2/settings.h | 6 +- foo_vis_milk2/steptimer.h | 8 +- foo_vis_milk2/ui_element.cpp | 6 +- vis_milk2/colorps.hlsl | 6 +- vis_milk2/constanttable.cpp | 6 +- vis_milk2/constanttable.h | 6 +- vis_milk2/d3d11shim.cpp | 12 +- vis_milk2/d3d11shim.h | 6 +- vis_milk2/defaultvs.hlsl | 6 +- vis_milk2/defines.h | 2 +- vis_milk2/deviceresources.cpp | 8 +- vis_milk2/deviceresources.h | 6 +- vis_milk2/diffuseps.hlsl | 6 +- vis_milk2/framework.h | 14 +- vis_milk2/pch.cpp | 6 +- vis_milk2/pch.h | 6 +- vis_milk2/texture0ps.hlsl | 6 +- vis_milk2/texture1ps.hlsl | 6 +- 28 files changed, 472 insertions(+), 100 deletions(-) create mode 100644 LICENSE.txt rename LICENSE.md => LICENSES.md (97%) diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..b132587 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,375 @@ +Copyright (c) 2023-2024 Jimmy Cassis + +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. \ No newline at end of file diff --git a/LICENSE.md b/LICENSES.md similarity index 97% rename from LICENSE.md rename to LICENSES.md index 4dda279..ebb23f3 100644 --- a/LICENSE.md +++ b/LICENSES.md @@ -25,18 +25,12 @@ The following licenses are specific to code used by the foobar2000 MilkDrop 2 Vi This license applies to the following files or to files in the following directories: - - `foo_vis_milk2/` (MilkDrop 2 Visualization Component) - - - - +- `vis_milk2/framework.h` (MilkDrop 2 Library Project Header) - `.github/workflows/build.yml` (GitHub Actions CI Workflow) - `tools/build-fb2k_component.ps1` (foobar2000 Component Packaging Script) - `external/fb2ksdk.patch` (foobar2000 2.0 SDK Patch) - `external/pmeel.patch` (projectM-eval Patch) - - ```text Copyright (c) 2023-2024 Jimmy Cassis diff --git a/README.md b/README.md index 796a24a..3e29bdf 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Refer to the [build pipeline](.github/workflows/build.yml) jobs for a step-by-st See [CHANGELOG](CHANGELOG.md) for additional details. -See [LICENSE](LICENSE.md) to become thoroughly confused. +See [LICENSES](LICENSES.md) to become thoroughly confused. ## Features diff --git a/foo_vis_milk2/config.h b/foo_vis_milk2/config.h index 27346ef..9aeb6ea 100644 --- a/foo_vis_milk2/config.h +++ b/foo_vis_milk2/config.h @@ -1,9 +1,9 @@ /* - * config.h - MilkDrop 2 visualization component's configuration header - * file. + * config.h - MilkDrop 2 visualization component's configuration header + * file. * - * Copyright (c) 2023-2024 Jimmy Cassis - * SPDX-License-Identifier: MPL-2.0 + * Copyright (c) 2023-2024 Jimmy Cassis + * SPDX-License-Identifier: MPL-2.0 */ #pragma once diff --git a/foo_vis_milk2/foo_vis_milk2.vcxproj b/foo_vis_milk2/foo_vis_milk2.vcxproj index 902586b..46b18dc 100644 --- a/foo_vis_milk2/foo_vis_milk2.vcxproj +++ b/foo_vis_milk2/foo_vis_milk2.vcxproj @@ -477,7 +477,8 @@ - + + diff --git a/foo_vis_milk2/foo_vis_milk2.vcxproj.filters b/foo_vis_milk2/foo_vis_milk2.vcxproj.filters index 74b22a9..e68d72e 100644 --- a/foo_vis_milk2/foo_vis_milk2.vcxproj.filters +++ b/foo_vis_milk2/foo_vis_milk2.vcxproj.filters @@ -106,7 +106,10 @@ Documentation Files - + + Documentation Files + + Documentation Files diff --git a/foo_vis_milk2/main.cpp b/foo_vis_milk2/main.cpp index 348dbc4..a130921 100644 --- a/foo_vis_milk2/main.cpp +++ b/foo_vis_milk2/main.cpp @@ -1,9 +1,9 @@ /* - * main.cpp - Sets the MilkDrop 2 visualization component's file name - * and version. + * main.cpp - Sets the MilkDrop 2 visualization component's file name + * and version. * - * Copyright (c) 2023-2024 Jimmy Cassis - * SPDX-License-Identifier: MPL-2.0 + * Copyright (c) 2023-2024 Jimmy Cassis + * SPDX-License-Identifier: MPL-2.0 */ #include "pch.h" @@ -11,10 +11,17 @@ #ifdef _DEBUG #define APPLICATION_SOURCE_URLS \ - " * " PLUGIN_WEB_URL "\n" \ - " * " APPLICATION_SOURCE_URL + APPLICATION_FILE_NAME " is released under the Mozilla Public License (MPL) version 2.0. Component source code can be obtained from:\n" \ + " * " APPLICATION_SOURCE_URL " (Mozilla Public License 2.0, BSD 3-Clause License, MIT License)\n" \ + " * " PLUGIN_WEB_URL " (Nullsoft BSD License)\n" \ + " * https://www.foobar2000.org/SDK (foobar2000 SDK License, zlib License)\n" \ + " * https://wtl.sourceforge.io/ (Microsoft Public License)\n" \ + " * https://www.cockos.com/EEL2/ (zlib License)\n" \ + " * https://github.com/projectM-visualizer/projectm-eval (MIT License)\n" \ + " * https://github.com/microsoft/DirectXTK (MIT License)\n" \ + " * https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ (Proprietary License)" #else -#define APPLICATION_SOURCE_URLS " * " PLUGIN_WEB_URL +#define APPLICATION_SOURCE_URLS "Documentation and source code can be obtained from:\n * " PLUGIN_WEB_URL #endif // clang-format off @@ -23,10 +30,10 @@ DECLARE_COMPONENT_VERSION("MilkDrop 2 Visualisation", APPLICATION_VERSION, APPLICATION_FILE_NAME " " APPLICATION_VERSION "\n" "Copyright (c) " APPLICATION_COPYRIGHT ". All rights reserved.\n\n" "MilkDrop 2.25k\n" - "Copyright (c) 2005-2013 Nullsoft, Inc. All rights reserved.\n\n" - "foobar2000 plugin and DirectX 11 port by " APPLICATION_COMPANY_NAME ".\n" + "Copyright (c) 2005-2013 Nullsoft, Inc.\n" + "Copyright (c) 2021-" APPLICATION_COPYRIGHT ".\nAll rights reserved.\n\n" + "foobar2000 component and DirectX 11 port by " APPLICATION_COMPANY_NAME ".\n" "Built with foobar2000 SDK " STR(FOOBAR2000_SDK_VERSION) " on " __DATE__ " " __TIME__ " " STR(BUILD_TIMEZONE) ".\n\n" - "Documentation and source code can be obtained from:\n" APPLICATION_SOURCE_URLS) // clang-format on diff --git a/foo_vis_milk2/pch.cpp b/foo_vis_milk2/pch.cpp index d67d4a3..78d8adb 100644 --- a/foo_vis_milk2/pch.cpp +++ b/foo_vis_milk2/pch.cpp @@ -1,8 +1,8 @@ /* - * pch.cpp - Pre-compiled header's source file. + * pch.cpp - Pre-compiled header's source file. * - * Copyright (c) 2023-2024 Jimmy Cassis - * SPDX-License-Identifier: MPL-2.0 + * Copyright (c) 2023-2024 Jimmy Cassis + * SPDX-License-Identifier: MPL-2.0 */ #include "pch.h" \ No newline at end of file diff --git a/foo_vis_milk2/pch.h b/foo_vis_milk2/pch.h index e004391..43cca21 100644 --- a/foo_vis_milk2/pch.h +++ b/foo_vis_milk2/pch.h @@ -1,8 +1,8 @@ /* - * pch.h - Pre-compiled header file. + * pch.h - Pre-compiled header file. * - * Copyright (c) 2023-2024 Jimmy Cassis - * SPDX-License-Identifier: MPL-2.0 + * Copyright (c) 2023-2024 Jimmy Cassis + * SPDX-License-Identifier: MPL-2.0 */ #pragma once diff --git a/foo_vis_milk2/preferences.cpp b/foo_vis_milk2/preferences.cpp index 69f9a89..5ae7d86 100644 --- a/foo_vis_milk2/preferences.cpp +++ b/foo_vis_milk2/preferences.cpp @@ -1,10 +1,10 @@ /* - * preferences.cpp - Configuration settings for the MilkDrop 2 - * visualization component accessible through a - * preferences page and advanced preferences. + * preferences.cpp - Configuration settings for the MilkDrop 2 + * visualization component accessible through a + * preferences page and advanced preferences. * - * Copyright (c) 2023-2024 Jimmy Cassis - * SPDX-License-Identifier: MPL-2.0 + * Copyright (c) 2023-2024 Jimmy Cassis + * SPDX-License-Identifier: MPL-2.0 */ #include "pch.h" diff --git a/foo_vis_milk2/settings.h b/foo_vis_milk2/settings.h index 721766c..95ba526 100644 --- a/foo_vis_milk2/settings.h +++ b/foo_vis_milk2/settings.h @@ -1,8 +1,8 @@ /* - * settings.h - Defines common settings structure. + * settings.h - Defines common settings structure. * - * Copyright (c) 2023-2024 Jimmy Cassis - * SPDX-License-Identifier: MPL-2.0 + * Copyright (c) 2023-2024 Jimmy Cassis + * SPDX-License-Identifier: MPL-2.0 */ #pragma once diff --git a/foo_vis_milk2/steptimer.h b/foo_vis_milk2/steptimer.h index cb6bc8c..7d585a2 100644 --- a/foo_vis_milk2/steptimer.h +++ b/foo_vis_milk2/steptimer.h @@ -1,9 +1,9 @@ /* - * steptimer.h - A high-resolution timer that provides elapsed time - * information. + * steptimer.h - A high-resolution timer that provides elapsed time + * information. * - * Copyright (c) Microsoft Corporation - * SPDX-License-Identifier: MIT + * Copyright (c) Microsoft Corporation + * SPDX-License-Identifier: MIT */ #pragma once diff --git a/foo_vis_milk2/ui_element.cpp b/foo_vis_milk2/ui_element.cpp index c6e678b..4010202 100644 --- a/foo_vis_milk2/ui_element.cpp +++ b/foo_vis_milk2/ui_element.cpp @@ -1,8 +1,8 @@ /* - * ui_element.cpp - Implements the MilkDrop 2 visualization component. + * ui_element.cpp - Implements the MilkDrop 2 visualization component. * - * Copyright (c) 2023-2024 Jimmy Cassis - * SPDX-License-Identifier: MPL-2.0 + * Copyright (c) 2023-2024 Jimmy Cassis + * SPDX-License-Identifier: MPL-2.0 */ #include "pch.h" diff --git a/vis_milk2/colorps.hlsl b/vis_milk2/colorps.hlsl index 15d8101..0cb1a91 100644 --- a/vis_milk2/colorps.hlsl +++ b/vis_milk2/colorps.hlsl @@ -1,8 +1,8 @@ /* - * colorps.hlsl - Color pixel shader. + * colorps.hlsl - Color pixel shader. * - * Copyright (c) 2021-2024 Jimmy Cassis - * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021-2024 Jimmy Cassis + * SPDX-License-Identifier: BSD-3-Clause */ struct PS_INPUT diff --git a/vis_milk2/constanttable.cpp b/vis_milk2/constanttable.cpp index bba1f53..db70984 100644 --- a/vis_milk2/constanttable.cpp +++ b/vis_milk2/constanttable.cpp @@ -1,8 +1,8 @@ /* - * constanttable.cpp - Direct3D 11 constant table. + * constanttable.cpp - Direct3D 11 constant table. * - * Copyright (c) 2021-2024 Jimmy Cassis - * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021-2024 Jimmy Cassis + * SPDX-License-Identifier: BSD-3-Clause */ #include "pch.h" diff --git a/vis_milk2/constanttable.h b/vis_milk2/constanttable.h index 4443df7..3825071 100644 --- a/vis_milk2/constanttable.h +++ b/vis_milk2/constanttable.h @@ -1,8 +1,8 @@ /* - * constanttable.h - Direct3D 11 constant table header. + * constanttable.h - Direct3D 11 constant table header. * - * Copyright (c) 2021-2024 Jimmy Cassis - * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021-2024 Jimmy Cassis + * SPDX-License-Identifier: BSD-3-Clause */ #pragma once diff --git a/vis_milk2/d3d11shim.cpp b/vis_milk2/d3d11shim.cpp index a02f494..0f2db5b 100644 --- a/vis_milk2/d3d11shim.cpp +++ b/vis_milk2/d3d11shim.cpp @@ -1,11 +1,11 @@ /* - * d3d11shim.cpp - Direct3D 9 to Direct3D 11 conversion functions. - * References: - * - https://learn.microsoft.com/en-us/windows/win32/direct3d10/d3d10-graphics-programming-guide-d3d9-to-d3d10-considerations - * - https://learn.microsoft.com/en-us/windows/win32/direct3d11/d3d11-programming-guide-migrating + * d3d11shim.cpp - Direct3D 9 to Direct3D 11 conversion functions. + * References: + * - https://learn.microsoft.com/en-us/windows/win32/direct3d10/d3d10-graphics-programming-guide-d3d9-to-d3d10-considerations + * - https://learn.microsoft.com/en-us/windows/win32/direct3d11/d3d11-programming-guide-migrating * - * Copyright (c) 2021-2024 Jimmy Cassis - * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021-2024 Jimmy Cassis + * SPDX-License-Identifier: BSD-3-Clause */ #include "pch.h" diff --git a/vis_milk2/d3d11shim.h b/vis_milk2/d3d11shim.h index b189221..aee3282 100644 --- a/vis_milk2/d3d11shim.h +++ b/vis_milk2/d3d11shim.h @@ -1,8 +1,8 @@ /* - * d3d11shim.h - Direct3D 9 to Direct3D 11 conversion functions header. + * d3d11shim.h - Direct3D 9 to Direct3D 11 conversion functions header. * - * Copyright (c) 2021-2024 Jimmy Cassis - * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021-2024 Jimmy Cassis + * SPDX-License-Identifier: BSD-3-Clause */ #pragma once diff --git a/vis_milk2/defaultvs.hlsl b/vis_milk2/defaultvs.hlsl index d6c6df8..81e1a23 100644 --- a/vis_milk2/defaultvs.hlsl +++ b/vis_milk2/defaultvs.hlsl @@ -1,8 +1,8 @@ /* - * defaultvs.hlsl - Default vertex shader. + * defaultvs.hlsl - Default vertex shader. * - * Copyright (c) 2021-2024 Jimmy Cassis - * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021-2024 Jimmy Cassis + * SPDX-License-Identifier: BSD-3-Clause */ cbuffer cbTransforms : register(b0) diff --git a/vis_milk2/defines.h b/vis_milk2/defines.h index a96ae26..3a455bb 100644 --- a/vis_milk2/defines.h +++ b/vis_milk2/defines.h @@ -85,7 +85,7 @@ // launch their default browser to display this page. // ***Note that the button will be invisible (on the config panel) // at runtime if this string is empty.*** -#define PLUGIN_WEB_URL "http://www.geisswerks.com/milkdrop/" +#define PLUGIN_WEB_URL "https://www.geisswerks.com/milkdrop/" // The following two strings - AUTHOR_NAME and COPYRIGHT - will be used // in a little box in the config panel, to identify the author and copyright diff --git a/vis_milk2/deviceresources.cpp b/vis_milk2/deviceresources.cpp index 75c24d3..dbc89b1 100644 --- a/vis_milk2/deviceresources.cpp +++ b/vis_milk2/deviceresources.cpp @@ -1,9 +1,9 @@ /* - * deviceresources.cpp - Wrapper for the Direct3D 11 device and swap chain - * (requires DirectX 11.1 Runtime). + * deviceresources.cpp - Wrapper for the Direct3D 11 device and swap chain + * (requires DirectX 11.1 Runtime). * - * Copyright (c) Microsoft Corporation - * SPDX-License-Identifier: MIT + * Copyright (c) Microsoft Corporation + * SPDX-License-Identifier: MIT */ #include "pch.h" diff --git a/vis_milk2/deviceresources.h b/vis_milk2/deviceresources.h index 661a6d8..dfe863a 100644 --- a/vis_milk2/deviceresources.h +++ b/vis_milk2/deviceresources.h @@ -1,8 +1,8 @@ /* - * deviceresources.h - Wrapper for the Direct3D 11 device and swap chain. + * deviceresources.h - Wrapper for the Direct3D 11 device and swap chain. * - * Copyright (c) Microsoft Corporation - * SPDX-License-Identifier: MIT + * Copyright (c) Microsoft Corporation + * SPDX-License-Identifier: MIT */ #pragma once diff --git a/vis_milk2/diffuseps.hlsl b/vis_milk2/diffuseps.hlsl index f8843e6..7cb7a63 100644 --- a/vis_milk2/diffuseps.hlsl +++ b/vis_milk2/diffuseps.hlsl @@ -1,8 +1,8 @@ /* - * diffuseps.hlsl - Diffuse pixel shader. + * diffuseps.hlsl - Diffuse pixel shader. * - * Copyright (c) 2021-2024 Jimmy Cassis - * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021-2024 Jimmy Cassis + * SPDX-License-Identifier: BSD-3-Clause */ Texture2D g_Texture0 : register(t0); diff --git a/vis_milk2/framework.h b/vis_milk2/framework.h index 25acbe1..7ba0a80 100644 --- a/vis_milk2/framework.h +++ b/vis_milk2/framework.h @@ -1,8 +1,8 @@ /* - * framework.h - Common headers for MilkDrop 2 library. + * framework.h - Common headers for MilkDrop 2 library. * - * Copyright (c) 2023-2024 Jimmy Cassis - * SPDX-License-Identifier: MPL-2.0 + * Copyright (c) 2023-2024 Jimmy Cassis + * SPDX-License-Identifier: MPL-2.0 */ #pragma once @@ -52,24 +52,16 @@ #include #include -//#include #include #include #include -//#include -//#include -//#include -//#include -//#include #include -//#include #include #include #include #include #include #include -//#include #include #ifdef NS_EEL2 diff --git a/vis_milk2/pch.cpp b/vis_milk2/pch.cpp index 69c63c3..5452066 100644 --- a/vis_milk2/pch.cpp +++ b/vis_milk2/pch.cpp @@ -1,8 +1,8 @@ /* - * pch.cpp - Pre-compiled header's source file. + * pch.cpp - Pre-compiled header's source file. * - * Copyright (c) 2021-2024 Jimmy Cassis - * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021-2024 Jimmy Cassis + * SPDX-License-Identifier: BSD-3-Clause */ #include "pch.h" \ No newline at end of file diff --git a/vis_milk2/pch.h b/vis_milk2/pch.h index 37be921..1351788 100644 --- a/vis_milk2/pch.h +++ b/vis_milk2/pch.h @@ -1,8 +1,8 @@ /* - * pch.h - Pre-compiled header file. + * pch.h - Pre-compiled header file. * - * Copyright (c) 2021-2024 Jimmy Cassis - * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021-2024 Jimmy Cassis + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef PCH_H diff --git a/vis_milk2/texture0ps.hlsl b/vis_milk2/texture0ps.hlsl index a21d412..90e0043 100644 --- a/vis_milk2/texture0ps.hlsl +++ b/vis_milk2/texture0ps.hlsl @@ -1,8 +1,8 @@ /* - * texture0ps.hlsl - Texture pixel shader. + * texture0ps.hlsl - Texture pixel shader. * - * Copyright (c) 2021-2024 Jimmy Cassis - * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021-2024 Jimmy Cassis + * SPDX-License-Identifier: BSD-3-Clause */ Texture2D g_Texture0 : register(t0); diff --git a/vis_milk2/texture1ps.hlsl b/vis_milk2/texture1ps.hlsl index 48d16aa..bf1a00e 100644 --- a/vis_milk2/texture1ps.hlsl +++ b/vis_milk2/texture1ps.hlsl @@ -1,8 +1,8 @@ /* - * texture1ps.hlsl - Texture pixel shader. + * texture1ps.hlsl - Texture pixel shader. * - * Copyright (c) 2021-2024 Jimmy Cassis - * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021-2024 Jimmy Cassis + * SPDX-License-Identifier: BSD-3-Clause */ Texture2D g_Texture0 : register(t0);