Skip to content

Commit

Permalink
tidy up for v0.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
duddel committed Mar 30, 2023
1 parent ea02a0a commit 3938d18
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 8 deletions.
74 changes: 74 additions & 0 deletions assets/yg_LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,28 @@ See the License for the specific language governing permissions and
limitations under the License.


===========================================================
License of Bullet
===========================================================
Bullet Continuous Collision Detection and Physics Library
http://bulletphysics.org

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.


===========================================================
License of Dear ImGui
===========================================================
Expand Down Expand Up @@ -146,6 +168,32 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


===========================================================
License of Dirent
===========================================================
The MIT License (MIT)

Copyright (c) 2015 Toni Rönkkö

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


===========================================================
License of Easylogging++
===========================================================
Expand Down Expand Up @@ -250,6 +298,32 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


===========================================================
License of JSON for Modern C++
===========================================================
MIT License

Copyright (c) 2013-2020 Niels Lohmann

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


===========================================================
License of khrplatform.h
===========================================================
Expand Down
2 changes: 1 addition & 1 deletion docs/md_sites/Changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## v0.0.1 (unreleased)
## v0.0.1

Download here: <https://github.com/duddel/yourgame/releases/tag/v0.0.1>

Expand Down
1 change: 1 addition & 0 deletions docs/md_sites/Development.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
### Before Tag

- Is `YOURGAME_GIT_COMMIT_REQUESTED` in `CMakeLists.txt` on `yourgamelib`'s `main` branch?
- Search for `ToDo`. Any quick fixes possible or already fixed?
- Is the version correct in `project()` in `CMakeLists.txt`?
- Is the version correct in [Changelog](Changelog.md)?
- Remove `(unreleased)` from version in [Changelog](Changelog.md)
Expand Down
4 changes: 1 addition & 3 deletions docs/md_sites/yg_math.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Resets the transform. Resulting matrix is identity.
### function yg.math.Trafo.getAxisLocal(ax)

Returns a **local axis** of the transform (array of 3 numbers), expressed in world system. TODO: this function is not wrapped to accept STRINGS. Does it even work?
Returns a **local axis** of the transform (array of 3 numbers), expressed in world system.

> `yg.math.Trafo.getAxisLocal(ax)` -> `{number}`
Expand All @@ -144,8 +144,6 @@ Returns a **global axis** of the transform (array of 3 numbers).
- `"Y"` -> {0, 1, 0}
- `"Z"` -> {0, 0, 1}

TODO: this function is not wrapped to accept STRINGS. Does it even work?

> `yg.math.Trafo.getAxisGlobal(ax)` -> `{number}`
| Argument | Type | Info |
Expand Down
4 changes: 2 additions & 2 deletions docs/md_sites/yg_util.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ end

Adds an idle segment to the Motion.

Todo: check if chaining works and if this function returns a Motion reference.
ToDo: check if chaining works and if this function returns a Motion reference.

> `yg.util.Motion.addIdle(dt, val)` -> `void`
Expand All @@ -56,7 +56,7 @@ Todo: check if chaining works and if this function returns a Motion reference.

Adds a ramp segment to the Motion.

Todo: check if chaining works and if this function returns a Motion reference.
ToDo: check if chaining works and if this function returns a Motion reference.

> `yg.util.Motion.addRamp(dt, val0, val1, ease)` -> `void`
Expand Down
4 changes: 2 additions & 2 deletions src/ygif_glue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ namespace mygame
void gl_draw(yg::gl::Geometry *geo,
yg::gl::Lightsource *light,
yg::gl::Shader *shader,
yg::gl::Texture *texture, // todo make a list
yg::gl::Texture *texture, // ToDo make a list
yg::math::Camera *camera,
yg::math::Trafo *trafo)
{
Expand All @@ -386,7 +386,7 @@ namespace mygame
}
cfg.shader = shader;

// todo...
// ToDo...
if (texture)
cfg.textures.push_back(texture);

Expand Down

0 comments on commit 3938d18

Please sign in to comment.