Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/KhronosGroup/glTF into ADOB…
Browse files Browse the repository at this point in the history
…E_materials_clearcoat_tint
  • Loading branch information
MiiBond committed Sep 11, 2023
2 parents 5632bc7 + 22bed54 commit b690d90
Show file tree
Hide file tree
Showing 259 changed files with 17,441 additions and 4,653 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Copyright 2020-2021 The Khronos Group Inc.
# SPDX-License-Identifier: Apache-2.0

# CI to build asciidoctor spec targets

name: CI

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the default branch
push:

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Use Khronos container with asciidoctor toolchain preinstalled
container: khronosgroup/docker-images:asciidoctor-spec

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

# Build spec targets
- name: spec-generate
run: |
cd specification/2.0
make Specification.html Specification.pdf
- name: Archive generated files
uses: actions/upload-artifact@v2
with:
name: spec-outputs
path: |
specification/2.0/Specification.html
specification/2.0/Specification.pdf
15 changes: 15 additions & 0 deletions .github/workflows/reuse.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright 2022 The Khronos Group Inc.
#
# SPDX-License-Identifier: Apache-2.0

name: REUSE Compliance

on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: REUSE Compliance Check
uses: fsfe/[email protected]
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Copyright 2012-2021 The Khronos Group Inc.
# SPDX-License-Identifier: Apache-2.0

*.dir
*.suo
*.vcxproj*
*.nupkg
specification/.project
.DS_Store
specification/2.0/PropertiesReference.adoc
specification/2.0/JsonSchemaReference.adoc
specification/2.0/Specification.html
specification/2.0/Specification.pdf
23 changes: 23 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: glTF
Source: https://github.com/KhronosGroup/glTF

Files: extensions/0.8/Vendor/CESIUM_binary_glTF/*
Copyright: 2012-2021 Cesium GS, Inc.
License: LicenseRef-TBD

Files: extensions/1.0/Vendor/* extensions/2.0/Vendor/*
Copyright: 2012-2021 Various Authors
License: LicenseRef-TBD

Files: extensions/1.0/Khronos/* extensions/2.0/Khronos/* extensions/2.0/Archived/*
Copyright: 2012-2021 The Khronos Group Inc.
License: LicenseRef-KhronosSpecCopyright

Files: specification/1.0/figures/* specification/1.0/schema/*
Copyright: 2012-2021 The Khronos Group Inc.
License: LicenseRef-KhronosSpecCopyright

Files: specification/2.0/schema/* specification/2.0/figures/* specification/figures/*
Copyright: 2012-2021 The Khronos Group Inc.
License: LicenseRef-KhronosSpecCopyright
11 changes: 10 additions & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
A reminder that this issue tracker is managed by the Khronos Group. Interactions here should follow the Khronos Code of Conduct (https://www.khronos.org/developers/code-of-conduct), which prohibits aggressive or derogatory language. Please keep the discussion friendly and civil.
<!--
Copyright 2014-2021 The Khronos Group Inc.
SPDX-License-Identifier: CC-BY-4.0
-->

A reminder that this issue tracker is managed by the Khronos Group.
Interactions here should follow the Khronos [Code of
Conduct](https://www.khronos.org/developers/code-of-conduct), which
prohibits aggressive or derogatory language. Please keep the discussion
friendly and civil.
41 changes: 41 additions & 0 deletions CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright 2020-2021 The Khronos Group Inc.
// SPDX-License-Identifier: CC-BY-4.0

= CONTRIBUTING file for the KhronosGroup/glTF project

Contributions to the KhronosGroup/glTF repository are welcome.

Contributions may be in the form of Issues proposing a change, or Pull
Requests containing fixes for, or additions to:

* Specification and Extension text, schemas, and related documentation
* Specification scripting / build toolchains and related infrastructure

Please keep contributions focused on solving a single issue or bug.

For contributions to the glTF 2.0 core specification, see:
link:specification/2.0/README.md#contributing[glTF 2.0 Contributions].

== Copyright Notice and License Template

If you are adding a new file, it must be under one of the following
licenses:

* Creative Commons Attribution 4.0 International, for specification text
and informative files (for example, this CONTRIBUTING.adoc file or
link:specification/2.0/Specification.adoc[`specification/2.0/Specification.adoc`])
* Apache 2.0, for all other changes (for example,
link:specification/2.0/Makefile[`specification/2.0/Makefile`])
* Apache 2.0 OR MIT, for source-like files that may need to used in GPL
projects

We use a short license in each file consisting of just the copyright
statement and the SPDX license identifier of the license applying to that
file, and link to the full license text from link:LICENSE.adoc.

== Contributor License Agreement

When you propose a pull request on KhronosGroup/glTF you must execute the
Khronos Mixed Repository Contributor License Agreement, to confirm you own
your work and are granting Khronos the necessary permissions to redistribute
it under our licenses.
73 changes: 73 additions & 0 deletions COPYING.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// Copyright 2020-2021 The Khronos Group Inc.
// SPDX-License-Identifier: CC-BY-4.0

= COPYING file for the KhronosGroup/glTF project

== Licenses

The glTF project uses several licenses.

* The source markup, schemas, and supporting documentation such as figures
and images for the glTF 2.0 Specification are licensed under the Creative
Commons Attribution 4.0 International License (SPDX license identifier
"`CC-BY-4.0`").
* The source markup, schemas, and and supporting documentation such as
figures and images for the glTF 1.0 Specification, as well as for Khronos
(`KHR`) extensions to glTF 1.0 and glTF 2.0, are licensed under the
proprietary Khronos Specification Copyright (SPDX license identifier
"`LicenseRef-KhronosSpecCopyright.txt`").
* The source markup, schemas, and and supporting documentation such as
figures and images for vendor-defined extensions are licensed by the
responsible vendors. At present we are unsure on the exact license details
for vendor extensions and have tagged them all with a "`TBD`" status until
this is resolved (SPDX license identifier "`LicenseRef-TBD.txt`").
* Makefiles, scripts, and other tooling used or generated as part of the
build process are licensed under the Apache License, Version 2.0 (SPDX
license identifier "`Apache-2.0`").
* Some generated, transient files produced during the course of building the
specification, headers, or other targets may not have copyrights. These
are typically very short AsciiDoc fragments describing parts of the glTF
2.0 schema, and are incorporated by reference into specification or
reference page builds.

Users outside Khronos who create and post glTF Specifications, whether
modified or not, should use the CC-BY-4.0 license on the *output* documents
(HTML, PDF, etc.) they generate.


== Frequently Asked Questions

Q: Why are the HTML and PDF Specifications posted on Khronos' website under
a license which is neither CC-BY nor Apache-2.0?

A: The Specifications posted by Khronos in the glTF Registry are licensed
under the proprietary Khronos Specification License. Only these
Specifications are Ratified by the Khronos Board of Promoters, and therefore
they are the only Specifications covered by the Khronos Intellectual
Property Rights Policy.


Q: Does Khronos allow the creation and distribution of modified versions of
the glTF Specification, such as translations to other languages?

A: Yes. Such modified Specifications, since they are not created by Khronos,
should be placed under the CC-BY license. If you believe your modifications
are of general interest, consider contributing them back by making a pull
request (PR) on the glTF project.


Q: Can I contribute changes to the glTF Specification?

A: Yes, by opening an Issue or Pull Request (PR) on the
link:https://github.com/KhronosGroup/glTF[glTF] Github project.
You must execute a click-through Contributor License Agreement, which brings
your changes under the umbrella of the Khronos IP policy.


Q: Can you change the license on your files so they're compatible with my
license?

A: If you *require* GPL compatibility for use of Apache-2.0 licensed files
in our repository, please raise an issue identifying the files and we will
consider changing those specific files to a dual Apache 2.0 / MIT license.

37 changes: 37 additions & 0 deletions LICENSE.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// Copyright 2020-2021 The Khronos Group Inc.
// SPDX-License-Identifier: CC-BY-4.0

= LICENSE file for the KhronosGroup/glTF project

Files in this repository fall under one of these licenses:

* SPDX license identifier: "`Apache-2.0`"
** Apache License 2.0.
** For scripts and build tooling.

* SPDX license identifier: "`CC-BY-4.0`"
** Creative Commons Attribution 4.0 International
** For specification source markup documents such as the glTF 2.0 AsciiDoc
sources. The glTF 2.0 specification HTML and PDF *outputs* built from
these sources are ratified and published in the
link:https://www.khronos.org/registry/glTF[Khronos glTF Registry].
** Also for miscellaneous metadocumentation such as this LICENSE file.

* SPDX license identifier: "`LicenseRef-KhronosSpecCopyright`"
** Khronos Specification Copyright.
** For Markdown format specification files such as glTF 1.0 and Khronos
extensions, which are ratified by the Khronos Board of Promoters in
this form.

* SPDX license identifier: "`LicenseRef-TBD"
** To Be Determined copyright - exact copyright holder and license terms
currently unknown.
** Only for vendor extensions to glTF. We are working on determining full
details of these licenses in each case.

Full license text of these licenses is available at:

* Apache-2.0: https://opensource.org/licenses/Apache-2.0
* CC-BY-4.0: https://creativecommons.org/licenses/by/4.0/legalcode
* LicenseRef-KhronosSpecCopyright: link:LICENSES/LicenseRef-KhronosSpecCopyright.txt
* LicenseRef-TBD: link:LICENSES/LicenseRef-TBD.txt
Loading

0 comments on commit b690d90

Please sign in to comment.