Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Latest updates by Alexey #13

Merged
merged 63 commits into from
Sep 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
10e7b3a
Initial rough cut
oddhack Nov 10, 2020
1a56109
Clean up tables
oddhack Nov 10, 2020
69cc009
Fix format of http links.
oddhack Nov 11, 2020
1ed0a8e
Fix internal xrefs and a couple of http: URLs to https: where possible
oddhack Nov 11, 2020
e7f69b8
minor formatting cleanup
oddhack Nov 11, 2020
ea1775e
Replace a couple of link references with the master glTF branch in
oddhack Nov 11, 2020
46943e9
Math test
oddhack Nov 11, 2020
b48ec6a
Minor cleanups for remote image: URLs, Greek characters, and a few
oddhack Nov 12, 2020
c35b9d8
Initial cut at a working asciidoctor version of the glTF spec. Includes
oddhack Nov 13, 2020
1052a8f
Should include the single spec source markup, not generated output
oddhack Nov 13, 2020
a8c7229
Remove test math markup per Ed
oddhack Nov 13, 2020
afc659d
Updated Makefile to work with new wetzel, per
oddhack Nov 15, 2020
1c3bb69
Merge remote-tracking branch 'origin/master' into jon-adoc
emackey Nov 17, 2020
0d27971
Merge changes from https://github.com/KhronosGroup/glTF/pull/1749
emackey Nov 17, 2020
da2c098
Update generated files from current wetzel repo
oddhack Nov 18, 2020
6f2dc0e
Add missing [appendix] tags so they get appendix letters, not chapter…
oddhack Nov 19, 2020
4580781
Remove the generated SingleSpec.adoc target, since we've decided not to
oddhack Nov 20, 2020
8dbd8e3
Remove checked-in generated target.
oddhack Nov 20, 2020
e05fc82
Run in right directory
oddhack Nov 20, 2020
4489751
Attempt to store generated HTML
oddhack Nov 20, 2020
5c1b8de
Build both HTML and PDF targets
oddhack Nov 20, 2020
90e5136
Rename spec source and refactor wetzel action in Makefile
oddhack Nov 20, 2020
a80a276
Merge remote-tracking branch 'origin/master' into jon-adoc
emackey Nov 23, 2020
23bfb8c
Merge remote-tracking branch 'origin/master' into jon-adoc
emackey Nov 23, 2020
87cb6b0
Add JSON schemas to AsciiDoctor output.
emackey Nov 24, 2020
7d0f07f
Add the words PREVIEW DRAFT since this is not final yet.
emackey Nov 24, 2020
90751fb
Merge pull request #1907 from KhronosGroup/ed-adoc-embed
oddhack Nov 24, 2020
a44dc1b
Minor Makefile cleanup for new generated target
oddhack Nov 24, 2020
0aeb27a
Lock version of wetzel
emackey Nov 24, 2020
fbdde31
This modifies the Asciidoctor HTML & PDF specs to compare asciidoctor
oddhack Nov 28, 2020
3702605
Remove old math formatting leaving just latexmath
oddhack Dec 2, 2020
b2c9f74
Merge pull request #1909 from KhronosGroup/stem-math
oddhack Dec 2, 2020
b3dc81f
Fix two citations. The Burley2012 reference was a dead link to a cloud
oddhack Dec 2, 2020
6c6ef27
Merge branch 'jon-adoc' of github.com:KhronosGroup/glTF into jon-adoc
oddhack Dec 2, 2020
4458c7a
Merge branch 'master' into jon-adoc
oddhack Dec 2, 2020
fdea3da
Sectioned all hanging text.
RealismCloud Dec 2, 2020
a8598f6
Minor labeling changes
RealismCloud Dec 2, 2020
a151b9e
Merge pull request #1917 from DrX3D/jon-adoc
emackey Dec 3, 2020
6944dd3
Merge remote-tracking branch 'origin/master' into jon-adoc
emackey Dec 3, 2020
e1ea8f6
Move copyright to top and credits to bottom.
emackey Dec 3, 2020
c772244
Put glTF logo on PDF title page
oddhack Dec 3, 2020
11fd09e
Merge branch 'jon-adoc' of github.com:KhronosGroup/glTF into jon-adoc
oddhack Dec 3, 2020
d78e65b
Merge pull request #1919 from KhronosGroup/reorg-adoc
emackey Dec 3, 2020
9d514db
Upgrade to wetzel@0.1.0-dev.1.4 for subtler checkmarks.
emackey Dec 3, 2020
d8b8b9a
Use a specific FontAwesome checkmark for "required."
emackey Dec 3, 2020
7420e21
Linkify member agreement in the spec license
oddhack Dec 18, 2020
94ed681
Update normative language (#1997)
lexaknyazev Jul 20, 2021
522d506
Emissive note: Markdown -> AsciiDoc tweak
emackey Jul 20, 2021
8e6aa7d
Minor language adjustments
lexaknyazev Jul 29, 2021
bb537b3
Add the **MUST** keyword to wetzel's output (#2014)
emackey Aug 16, 2021
7fbcc52
More language updates (#2012)
lexaknyazev Aug 16, 2021
061997b
Update Motivation and Design Goals
lexaknyazev Aug 20, 2021
45b308e
Merge remote-tracking branch 'origin/master' into jon-adoc
emackey Sep 13, 2021
839ca79
Merge to adoc the change from PR #2022 (#2024)
emackey Sep 13, 2021
7748663
Integrate latest AsciiDoc updates (#2028)
lexaknyazev Sep 22, 2021
4399139
Clarify morphed attribute formats & cleanup indexed semantics (#2030)
lexaknyazev Sep 22, 2021
ac0d679
Update PBR links
lexaknyazev Sep 23, 2021
9757259
Use generated version info (#2032)
lexaknyazev Sep 23, 2021
e2bd348
Use draft/2020-12 schemas (#2031)
lexaknyazev Sep 23, 2021
5d3dfa4
Add REUSE license checker and CI check to new glTF 2.0 branch (#2029)
oddhack Sep 23, 2021
2326f4b
Merge branch 'master' into jon-adoc
lexaknyazev Sep 23, 2021
3e249b3
Add GitHub-specific note
lexaknyazev Sep 23, 2021
ba6ce88
Merge pull request #1901 from KhronosGroup/jon-adoc
lexaknyazev Sep 23, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# 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

# REUSE license checker
- name: license-check
run: |
reuse lint

# 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
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/*
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/gltf.png
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.
38 changes: 38 additions & 0 deletions CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// 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.

== 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