Skip to content

Commit

Permalink
Compatibly switch to BSD-2-Clause-Patent.
Browse files Browse the repository at this point in the history
  • Loading branch information
n3vu0r committed Apr 8, 2021
1 parent 67c1661 commit 1491c55
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 22 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "kiss3d-trackball"
version = "0.1.0"
version = "0.1.1"
authors = ["Rouven Spreckels <rs@qu1x.dev>"]
edition = "2018"
description = "Virtual Trackball Camera Mode for Kiss3D"
documentation = "https://doc.qu1x.dev/kiss3d-trackball"
repository = "https://github.com/qu1x/kiss3d-trackball"
readme = "README.md"
license = "BSD-3-Clause"
license = "BSD-2-Clause-Patent"
keywords = [
"virtual-trackball",
"exponential-map",
Expand All @@ -23,7 +23,7 @@ include = [
"Cargo.toml",
"README.md",
"RELEASES.md",
"LICENSE.md",
"LICENSES/*.md",
]

[badges]
Expand Down
11 changes: 0 additions & 11 deletions LICENSE.md

This file was deleted.

45 changes: 45 additions & 0 deletions LICENSES/BSD-2-Clause-Patent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
Copyright © 2021 Rouven Spreckels <rs@qu1x.dev>

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

Subject to the terms and conditions of this license, each copyright holder and
contributor hereby grants to those receiving rights under this license a
perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except for failure to satisfy the conditions of this license) patent license
to make, have made, use, offer to sell, sell, import, and otherwise transfer
this software, where such license applies only to those patent claims, already
acquired or hereafter acquired, licensable by such copyright holder or
contributor that are necessarily infringed by:

* **(a)** their Contribution(s) (the licensed copyrights of copyright holders
and non-copyrightable additions of contributors, in source or binary form)
alone; or
* **(b)** combination of their Contribution(s) with the work of authorship to
which such Contribution(s) was added by such copyright holder or
contributor, if, at the time the Contribution is added, such addition
causes such combination to be necessarily infringed. The patent license
shall not apply to any other combinations which include the Contribution.

Except as expressly stated above, no rights or licenses from any copyright
holder or contributor is granted under this license, whether expressly, by
implication, estoppel or otherwise.

DISCLAIMER

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 changes: 20 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,43 @@ Virtual Trackball Camera Mode for Kiss3D

[![Build Status][]](https://travis-ci.org/qu1x/kiss3d-trackball)
[![Downloads][]](https://crates.io/crates/kiss3d-trackball)
[![Recent Downloads][]](https://crates.io/crates/kiss3d-trackball)
[![Rust][]](https://www.rust-lang.org)
[![Version][]](https://crates.io/crates/kiss3d-trackball)
[![Documentation][]](https://doc.qu1x.dev/kiss3d-trackball)
[![License][]](https://opensource.org/licenses/BSD-3-Clause)
[![License][]](https://spdx.org/licenses/BSD-2-Clause-Patent.html)

[Build Status]: https://travis-ci.org/qu1x/kiss3d-trackball.svg
[Downloads]: https://img.shields.io/crates/d/kiss3d-trackball.svg
[Recent Downloads]: https://img.shields.io/crates/dr/kiss3d-trackball.svg
[Rust]: https://img.shields.io/badge/rust-stable-brightgreen.svg
[Version]: https://img.shields.io/crates/v/kiss3d-trackball.svg
[Documentation]: https://docs.rs/kiss3d-trackball/badge.svg
[License]: https://img.shields.io/crates/l/kiss3d-trackball.svg

Complements common [trackball operation handlers] with [`kiss3d`] specific [`Input`] resulting
in a compound [`Trackball`] [`Camera`] mode implementation for the [`kiss3d`] graphics library.
Complements the [trackball library] with Kiss3D-specific [`Input`] resulting in a compound
[`Trackball`] camera mode implementation for the [Kiss3D graphics library].

See the [release history](RELEASES.md) to keep track of the development.

[trackball library]: https://github.com/qu1x/trackball
[Kiss3D graphics library]: https://github.com/sebcrozet/kiss3d

[trackball operation handlers]: https://doc.qu1x.dev/kiss3d-trackball/trackball/index.html#structs
[`kiss3d`]: https://doc.qu1x.dev/kiss3d-trackball/kiss3d/index.html
[`Input`]: https://doc.qu1x.dev/kiss3d-trackball/kiss3d_trackball/struct.Input.html
[`Trackball`]: https://doc.qu1x.dev/kiss3d-trackball/kiss3d_trackball/struct.Trackball.html
[`Camera`]: https://doc.qu1x.dev/kiss3d-trackball/kiss3d/camera/trait.Camera.html

## License

[BSD-3-Clause](LICENSE.md)
The works are [licensed](LICENSES/BSD-2-Clause-Patent.md) under the [`BSD-2-Clause-Patent`].

This license is designed to provide:

* a simple permissive license,
* that is compatible with the [`GPL-2.0-or-later`], and
* which also has an express patent grant included.

[`BSD-2-Clause-Patent`]: https://spdx.org/licenses/BSD-2-Clause-Patent.html
[`GPL-2.0-or-later`]: https://spdx.org/licenses/GPL-2.0-or-later.html

## Contribution

Expand Down
4 changes: 4 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Version 0.1.1 (2021-04-08)

* Switch to [BSD-2-Clause-Patent](LICENSES/BSD-2-Clause-Patent.md).

# Version 0.1.0 (2021-04-03)

* Add trackball implementation.
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Virtual Trackball Camera Mode for Kiss3D
//!
//! Complements common [`trackball`] operation handlers with [`kiss3d`] specific [`Input`] resulting
//! Complements common [`trackball`] operation handlers with [`kiss3d`]-specific [`Input`] resulting
//! in a compound [`Trackball`] [`Camera`] mode implementation for the [`kiss3d`] graphics library.

use kiss3d::{
Expand Down

0 comments on commit 1491c55

Please sign in to comment.