提交 fa1d62e1 编写于 作者: T Tony Parisi

Merge pull request #521 from KhronosGroup/trademark

Add Khronos Trademark Statement
......@@ -6,12 +6,11 @@ The GL Transmission Format (glTF) is a runtime asset delivery format for GL APIs
## Specification
> _This is a draft specification; there may be minor changes before ratification is finalized. Please provide feedback by submitting [issues](https://github.com/KhronosGroup/glTF/issues)._
* [glTF Specification, Draft 1.0](specification/README.md)
* ([Guide](https://github.com/KhronosGroup/glTF/wiki/glTF-0.8-to-1.0-Guide) for upgrading glTF 0.8 to 1.0.)
* [glTF Specification, 1.0](specification/README.md)
* [glTF Extension Registry](extensions/README.md)
Please provide feedback by submitting [issues](https://github.com/KhronosGroup/glTF/issues).
## Sample Models
[Sample models](sampleModels/README.md) for learning glTF, and testing runtime engines and content pipeline tools.
......
......@@ -2,13 +2,11 @@
<img src="figures/gltf.png" />
</p>
*Draft, Version 1.0*
*Version 1.0*
The GL Transmission Format (glTF) is a runtime asset delivery format for GL APIs: WebGL, OpenGL ES, and OpenGL. glTF bridges the gap between 3D content creation tools and modern GL applications by providing an efficient, extensible, interoperable format for the transmission and loading of 3D content.
>
_This is a draft specification; there may be minor changes before ratification is finalized. Please provide feedback by submitting [issues](https://github.com/KhronosGroup/glTF/issues)._
Last Updated: January 13, 2016
Editors
......@@ -22,6 +20,8 @@ Contributors
* Uli Klumpp, Individual Contributor
* Neil Trevett, NVIDIA
Copyright (C) 2013-2016 The Khronos Group Inc. All Rights Reserved. glTF is a trademark of The Khronos Group Inc.
# Contents
* [Introduction](#introduction)
......@@ -43,6 +43,7 @@ Contributors
* [Properties Reference](#properties)
* [Acknowledgements](#acknowledgements)
* [Appendix A: Default Material](#appendix-a)
* [Appendix B: Full Khronos Trademark Statement](#appendix-b)
<a name="introduction"></a>
# Introduction
......@@ -3484,4 +3485,9 @@ void main(void)
{
gl_FragColor = u_emission;
}
```
\ No newline at end of file
```
<a name="appendix-b"></a>
# Appendix B: Full Khronos Trademark Statement
Copyright (C) 2013-2016 The Khronos Group Inc. All Rights Reserved. This specification is protected by copyright laws and contains material proprietary to the Khronos Group, Inc. It or any components may not be reproduced, republished, distributed, transmitted, displayed, broadcast, or otherwise exploited in any manner without the express prior written permission of Khronos Group. You may use this specification for implementing the functionality therein, without altering or removing any trademark, copyright or other notice from the specification, but the receipt or possession of this specification does not convey any rights to reproduce, disclose, or distribute its contents, or to manufacture, use, or sell anything that it may describe, in whole or in part. Khronos Group grants express permission to any current Promoter, Contributor or Adopter member of Khronos to copy and redistribute UNMODIFIED versions of this specification in any fashion, provided that NO CHARGE is made for the specification and the latest available update of the specification for any version of the API is used whenever possible. Such distributed specification may be reformatted AS LONG AS the contents of the specification are not changed in any way. The specification may be incorporated into a product that is sold as long as such product includes significant independent work developed by the seller. A link to the current version of this specification on the Khronos Group website should be included whenever possible with specification distributions. Khronos Group makes no, and expressly disclaims any, representations or warranties, express or implied, regarding this specification, including, without limitation, any implied warranties of merchantability or fitness for a particular purpose or non-infringement of any intellectual property. Khronos Group makes no, and expressly disclaims any, warranties, express or implied, regarding the correctness, accuracy, completeness, timeliness, and reliability of the specification. Under no circumstances will the Khronos Group, or any of its Promoters, Contributors or Members or their respective partners, officers, directors, employees, agents, or representatives be liable for any damages, whether direct, indirect, special or consequential damages for lost revenues, lost profits, or otherwise, arising from or in connection with these materials. Khronos, Vulkan, SYCL, SPIR, WebGL, EGL, COLLADA, StreamInput, OpenVX, OpenKCam, glTF, OpenKODE, OpenVG, OpenWF, OpenSL ES, OpenMAX, OpenMAX AL, OpenMAX IL and OpenMAX DL are trademarks and WebCL is a certification mark of The Khronos Group Inc. OpenCL is a trademark of Apple Inc. and OpenGL and OpenML are registered trademarks and the OpenGL ES and OpenGL SC logos are trademarks of Silicon Graphics International used under license by Khronos. All other product names, trademarks, and/or company names are used solely for identification and belong to their respective owners.
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册