diff --git a/data/models/gun/Cerberus.tbscene b/data/models/gun/Cerberus.tbscene new file mode 100644 index 0000000..6cdd757 Binary files /dev/null and b/data/models/gun/Cerberus.tbscene differ diff --git a/data/models/gun/Cerberus_LP.FBX b/data/models/gun/Cerberus_LP.FBX new file mode 100644 index 0000000..619d61e Binary files /dev/null and b/data/models/gun/Cerberus_LP.FBX differ diff --git a/data/models/gun/Disclaimer.txt b/data/models/gun/Disclaimer.txt new file mode 100644 index 0000000..facc2db --- /dev/null +++ b/data/models/gun/Disclaimer.txt @@ -0,0 +1,28 @@ +This asset is provided as is, for purely non-commercial, educational purposes. If this can help anyone make kickass(-er) art I couldn't be happier. +Please note that this is predominantly an example of PBR material work, thus such things as functionality, topology and mesh optimization might be + +somewhat overlooked. + +Now go make something pretty! :D->-< + +Cheers, +Andrew Maximov + +More PBR Tutorials: +http://www.ArtIsAVerb.info/PBR.html +http://www.ArtIsAVerb.info/PBT.html + +Cerberus Videos: +https://www.youtube.com/watch?v=xIHiXnMltDg +https://www.youtube.com/watch?v=cCYVLkG3hjI + +Other art, info and tutorials here: +https://www.facebook.com/ArtIsAVerb +http://www.youtube.com/user/d1v3rsion +http://d1ver.cghub.com/ +http://d1ver.cgsociety.org/ +http://www.ArtIsAVerb.info/ +Make sure to subscribe for all the upcoming stuff! :) + + +2014, All Rights Reserved. \ No newline at end of file diff --git "a/data/models/gun/Textures\\Cerberus_A.tga" "b/data/models/gun/Textures\\Cerberus_A.tga" new file mode 100644 index 0000000..aa9fffa Binary files /dev/null and "b/data/models/gun/Textures\\Cerberus_A.tga" differ diff --git "a/data/models/gun/Textures\\Cerberus_M.tga" "b/data/models/gun/Textures\\Cerberus_M.tga" new file mode 100644 index 0000000..dfe249a Binary files /dev/null and "b/data/models/gun/Textures\\Cerberus_M.tga" differ diff --git "a/data/models/gun/Textures\\Cerberus_N.tga" "b/data/models/gun/Textures\\Cerberus_N.tga" new file mode 100644 index 0000000..60d77b4 Binary files /dev/null and "b/data/models/gun/Textures\\Cerberus_N.tga" differ diff --git "a/data/models/gun/Textures\\Cerberus_R.tga" "b/data/models/gun/Textures\\Cerberus_R.tga" new file mode 100644 index 0000000..26c3859 Binary files /dev/null and "b/data/models/gun/Textures\\Cerberus_R.tga" differ diff --git "a/data/models/gun/Textures\\Raw/Cerberus_AO.tga" "b/data/models/gun/Textures\\Raw/Cerberus_AO.tga" new file mode 100644 index 0000000..7fb99db Binary files /dev/null and "b/data/models/gun/Textures\\Raw/Cerberus_AO.tga" differ diff --git "a/data/models/gun/Textures\\Raw/Cerberus_N.tga" "b/data/models/gun/Textures\\Raw/Cerberus_N.tga" new file mode 100644 index 0000000..f019de1 Binary files /dev/null and "b/data/models/gun/Textures\\Raw/Cerberus_N.tga" differ diff --git "a/data/models/gun/Textures\\Raw/Cerberus_UV.tga" "b/data/models/gun/Textures\\Raw/Cerberus_UV.tga" new file mode 100644 index 0000000..5d3720c Binary files /dev/null and "b/data/models/gun/Textures\\Raw/Cerberus_UV.tga" differ diff --git "a/data/models/gun/Textures\\Raw/Masks.psd" "b/data/models/gun/Textures\\Raw/Masks.psd" new file mode 100644 index 0000000..adfd6e2 Binary files /dev/null and "b/data/models/gun/Textures\\Raw/Masks.psd" differ diff --git a/src/main.cpp b/src/main.cpp index b2c5fda..cd541ef 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -72,7 +72,9 @@ int main(int argc, char **argv) { Model backpack(std::string(ROOT_DIR) + std::string("data/models/backpack/backpack.obj")); Model cube(ROOT_DIR "data/models/cube/cube.obj"); + Model gun(ROOT_DIR "data/models/gun/Cerberus_LP.FBX"); cube.translate(glm::vec3(3.0f, 0.0f, -1.0f)); + gun.translate(glm::vec3(-3.0f, 0.0f, 0.0f)); // Create player camera object PlayerCamera camera; @@ -116,6 +118,7 @@ int main(int argc, char **argv) { // Draw Meshes cube.draw(shader); backpack.draw(shader); + gun.draw(shader); // Finally render everything shader.use();