Skip to content

Commit

Permalink
Merge branch 'master' of github.com:matt77hias/MAGE
Browse files Browse the repository at this point in the history
  • Loading branch information
matt77hias committed May 10, 2017
2 parents 03d17e7 + 94de651 commit c30e053
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

MAGE - Matthias Advanced Game Engine

<p align="center"><img src="https://github.com/matt77hias/MAGE/blob/master/res/Material/Lambertian.png" width="215"><img src="https://github.com/matt77hias/MAGE/blob/master/res/Material/Phong.png" width="215"><img src="https://github.com/matt77hias/MAGE/blob/master/res/Material/Blinn-Phong.png" width="215"><img src="https://github.com/matt77hias/MAGE/blob/master/res/Material/Modified-Blinn-Phong.png" width="215"></p>
<p align="center"><img src="https://github.com/matt77hias/MAGE/blob/master/res/Material/TSNM_Lambertian.png" width="215"><img src="https://github.com/matt77hias/MAGE/blob/master/res/Material/TSNM_Phong.png" width="215"><img src="https://github.com/matt77hias/MAGE/blob/master/res/Material/TSNM_Blinn-Phong.png" width="215"><img src="https://github.com/matt77hias/MAGE/blob/master/res/Material/TSNM_Modified-Blinn-Phong.png" width="215"></p>

## Development
* **Platform**: (minimum) Windows 8.1 32 Bit and 64 Bit (Windows API + Direct3D 11)
* **Engine Programming Language**: C++14 (will and must change to C++17 since I need `if-constexpr`)
Expand All @@ -20,6 +23,21 @@ MAGE - Matthias Advanced Game Engine
* **IDE**: Visual Studio 2015 (will change to Visual Studio 2017 when "Visual Studio 2017 Color Theme Editor" is released)

## Codebase
*Assets*:
* Crytek Sponza:
* Marko Dabrovic (original version),
* Frank Meinl (modified version, [data](http://www.crytek.com/cryengine/cryengine3/downloads)),
* Morgan McGuire (updated version, [data](http://graphics.cs.williams.edu/data/meshes.xml)),
* Matthias Moulin (updated version).

* Utah Teapot:
* Martin Newell (original version),
* Kenzie Lamar (updated version),
* Morgan McGuire ([data](http://graphics.cs.williams.edu/data/meshes.xml)),
* Matthias Moulin (updated version).

* [Logo](http://www.deviantart.com/art/Black-Mage-356147620) [[License](https://creativecommons.org/licenses/by-nc-nd/3.0/)]

*Non-substantially* based on:
* [directx-sdk-samples](https://github.com/walbourn/directx-sdk-samples) [[License](https://github.com/walbourn/directx-sdk-samples/blob/master/LICENSE)]
* [directxtk-samples](https://github.com/walbourn/directxtk-samples) [[License](https://github.com/walbourn/directxtk-samples/blob/master/LICENSE)]
Expand All @@ -31,7 +49,6 @@ MAGE - Matthias Advanced Game Engine

*Substantially* based on:
* [DirectXTK](https://github.com/Microsoft/DirectXTK) [[License](https://github.com/Microsoft/DirectXTK/blob/master/LICENSE)]
* [Logo](http://www.deviantart.com/art/Black-Mage-356147620) [[License](https://creativecommons.org/licenses/by-nc-nd/3.0/)]

## Current iteration' TODOs
* Frustum culling
Expand Down

0 comments on commit c30e053

Please sign in to comment.