Add Zeus Textures to git.

2018-12-07 13:43:37 -08:00 · 2018-12-07 13:43:37 -08:00 · 7ac460ee28
parent 0698bb3dd6
commit 7ac460ee28
89 changed files with 1 additions and 29 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -14,35 +14,7 @@ find_package(glfw3 REQUIRED)

 link_directories(Libraries/glew/lib)

-add_executable(GlProject
-        GlProject/Main.cpp
-        GlProject/engine/graphics/Mesh.cpp
-        GlProject/engine/graphics/Mesh.h
-        GlProject/engine/Entity.cpp
-        GlProject/engine/Entity.h
-        GlProject/engine/graphics/Shader.cpp
-        GlProject/engine/graphics/Shader.h
-        GlProject/engine/Window.cpp
-        GlProject/engine/Window.h
-        GlProject/engine/Camera.cpp
-        GlProject/engine/Camera.h
-        GlProject/engine/graphics/Texture.cpp
-        GlProject/engine/graphics/Texture.h
-        GlProject/mesh/MeshGenerator.cpp
-        GlProject/mesh/MeshGenerator.h
-        GlProject/engine/Timer.cpp
-        GlProject/engine/Timer.h
-        GlProject/blocks/BlockAtlas.cpp
-        GlProject/blocks/BlockAtlas.h
-        GlProject/blocks/BlockDef.cpp
-        GlProject/blocks/BlockDef.h
-        GlProject/mesh/MeshPart.cpp
-        GlProject/mesh/MeshPart.h
-        GlProject/mesh/MeshMod.h
-        GlProject/mesh/Vertex.cpp
-        GlProject/mesh/Vertex.h
-        GlProject/mesh/BlockModel.cpp
-        GlProject/mesh/BlockModel.h GlProject/engine/TextureAtlas.cpp GlProject/engine/TextureAtlas.h)
+add_executable(GlProject GlProject/Main.cpp GlProject/engine/graphics/Mesh.cpp GlProject/engine/graphics/Mesh.h GlProject/engine/Entity.cpp GlProject/engine/Entity.h GlProject/engine/graphics/Shader.cpp GlProject/engine/graphics/Shader.h GlProject/engine/Window.cpp GlProject/engine/Window.h GlProject/engine/Camera.cpp GlProject/engine/Camera.h GlProject/engine/graphics/Texture.cpp GlProject/engine/graphics/Texture.h GlProject/mesh/MeshGenerator.cpp GlProject/mesh/MeshGenerator.h GlProject/engine/Timer.cpp GlProject/engine/Timer.h GlProject/blocks/BlockAtlas.cpp GlProject/blocks/BlockAtlas.h GlProject/blocks/BlockDef.cpp GlProject/blocks/BlockDef.h GlProject/mesh/MeshPart.cpp GlProject/mesh/MeshPart.h GlProject/mesh/MeshMod.h GlProject/mesh/Vertex.cpp GlProject/mesh/Vertex.h GlProject/mesh/BlockModel.cpp GlProject/mesh/BlockModel.h GlProject/engine/TextureAtlas.cpp GlProject/engine/TextureAtlas.h)

 target_link_libraries(GlProject
        ${OPENGL_gl_LIBRARY}
--- a/Textures/_missing.png
+++ b/Textures/_missing.png
--- a/Textures/game/default_acacia_bush_stem.png
+++ b/Textures/game/default_acacia_bush_stem.png
--- a/Textures/game/default_acacia_leaves.png
+++ b/Textures/game/default_acacia_leaves.png
--- a/Textures/game/default_acacia_leaves_simple.png
+++ b/Textures/game/default_acacia_leaves_simple.png
--- a/Textures/game/default_acacia_tree.png
+++ b/Textures/game/default_acacia_tree.png
--- a/Textures/game/default_acacia_tree_top.png
+++ b/Textures/game/default_acacia_tree_top.png
--- a/Textures/game/default_acacia_wood.png
+++ b/Textures/game/default_acacia_wood.png
--- a/Textures/game/default_aspen_leaves.png
+++ b/Textures/game/default_aspen_leaves.png
--- a/Textures/game/default_aspen_tree.png
+++ b/Textures/game/default_aspen_tree.png
--- a/Textures/game/default_aspen_tree_top.png
+++ b/Textures/game/default_aspen_tree_top.png
--- a/Textures/game/default_aspen_wood.png
+++ b/Textures/game/default_aspen_wood.png
--- a/Textures/game/default_brick.png
+++ b/Textures/game/default_brick.png
--- a/Textures/game/default_bush_stem.png
+++ b/Textures/game/default_bush_stem.png
--- a/Textures/game/default_cobble.png
+++ b/Textures/game/default_cobble.png
--- a/Textures/game/default_cobblestone.png
+++ b/Textures/game/default_cobblestone.png
--- a/Textures/game/default_copper_block.png
+++ b/Textures/game/default_copper_block.png
--- a/Textures/game/default_desert_cobble.png
+++ b/Textures/game/default_desert_cobble.png
--- a/Textures/game/default_desert_sand.png
+++ b/Textures/game/default_desert_sand.png
--- a/Textures/game/default_desert_stone.png
+++ b/Textures/game/default_desert_stone.png
--- a/Textures/game/default_desert_stone_block.png
+++ b/Textures/game/default_desert_stone_block.png
--- a/Textures/game/default_desert_stone_brick.png
+++ b/Textures/game/default_desert_stone_brick.png
--- a/Textures/game/default_dirt.png
+++ b/Textures/game/default_dirt.png
--- a/Textures/game/default_dry_grass.png
+++ b/Textures/game/default_dry_grass.png
--- a/Textures/game/default_dry_grass_1.png
+++ b/Textures/game/default_dry_grass_1.png
--- a/Textures/game/default_dry_grass_2.png
+++ b/Textures/game/default_dry_grass_2.png
--- a/Textures/game/default_dry_grass_3.png
+++ b/Textures/game/default_dry_grass_3.png
--- a/Textures/game/default_dry_grass_4.png
+++ b/Textures/game/default_dry_grass_4.png
--- a/Textures/game/default_dry_grass_5.png
+++ b/Textures/game/default_dry_grass_5.png
--- a/Textures/game/default_dry_grass_side.png
+++ b/Textures/game/default_dry_grass_side.png
--- a/Textures/game/default_dry_shrub.png
+++ b/Textures/game/default_dry_shrub.png
--- a/Textures/game/default_glass.png
+++ b/Textures/game/default_glass.png
--- a/Textures/game/default_gold_block.png
+++ b/Textures/game/default_gold_block.png
--- a/Textures/game/default_grass_float.png
+++ b/Textures/game/default_grass_float.png
--- a/Textures/game/default_grass_side.png
+++ b/Textures/game/default_grass_side.png
--- a/Textures/game/default_grass_top.png
+++ b/Textures/game/default_grass_top.png
--- a/Textures/game/default_gravel.png
+++ b/Textures/game/default_gravel.png
--- a/Textures/game/default_junglegrass.png
+++ b/Textures/game/default_junglegrass.png
--- a/Textures/game/default_jungleleaves.png
+++ b/Textures/game/default_jungleleaves.png
--- a/Textures/game/default_jungleleaves_simple.png
+++ b/Textures/game/default_jungleleaves_simple.png
--- a/Textures/game/default_jungletree.png
+++ b/Textures/game/default_jungletree.png
--- a/Textures/game/default_jungletree_top.png
+++ b/Textures/game/default_jungletree_top.png
--- a/Textures/game/default_junglewood.png
+++ b/Textures/game/default_junglewood.png
--- a/Textures/game/default_leaves.png
+++ b/Textures/game/default_leaves.png
--- a/Textures/game/default_leaves_opaque.png
+++ b/Textures/game/default_leaves_opaque.png
--- a/Textures/game/default_leaves_puff.png
+++ b/Textures/game/default_leaves_puff.png
--- a/Textures/game/default_log_side.png
+++ b/Textures/game/default_log_side.png
--- a/Textures/game/default_log_top.png
+++ b/Textures/game/default_log_top.png
--- a/Textures/game/default_log_top_bark.png
+++ b/Textures/game/default_log_top_bark.png
--- a/Textures/game/default_log_top_octagon.png
+++ b/Textures/game/default_log_top_octagon.png
--- a/Textures/game/default_mineral_coal.png
+++ b/Textures/game/default_mineral_coal.png
--- a/Textures/game/default_mineral_copper.png
+++ b/Textures/game/default_mineral_copper.png
--- a/Textures/game/default_mineral_diamond.png
+++ b/Textures/game/default_mineral_diamond.png
--- a/Textures/game/default_mineral_gold.png
+++ b/Textures/game/default_mineral_gold.png
--- a/Textures/game/default_mineral_iron.png
+++ b/Textures/game/default_mineral_iron.png
--- a/Textures/game/default_mineral_tin.png
+++ b/Textures/game/default_mineral_tin.png
--- a/Textures/game/default_mossycobble.png
+++ b/Textures/game/default_mossycobble.png
--- a/Textures/game/default_pine_leaves.png
+++ b/Textures/game/default_pine_leaves.png
--- a/Textures/game/default_pine_leaves_opaque.png
+++ b/Textures/game/default_pine_leaves_opaque.png
--- a/Textures/game/default_pine_leaves_puff.png
+++ b/Textures/game/default_pine_leaves_puff.png
--- a/Textures/game/default_pine_tree.png
+++ b/Textures/game/default_pine_tree.png
--- a/Textures/game/default_pine_tree_top.png
+++ b/Textures/game/default_pine_tree_top.png
--- a/Textures/game/default_pine_wood.png
+++ b/Textures/game/default_pine_wood.png
--- a/Textures/game/default_planks.png
+++ b/Textures/game/default_planks.png
--- a/Textures/game/default_rainforest_litter.png
+++ b/Textures/game/default_rainforest_litter.png
--- a/Textures/game/default_rainforest_litter_side.png
+++ b/Textures/game/default_rainforest_litter_side.png
--- a/Textures/game/default_sand.png
+++ b/Textures/game/default_sand.png
--- a/Textures/game/default_silver_sand.png
+++ b/Textures/game/default_silver_sand.png
--- a/Textures/game/default_snow.png
+++ b/Textures/game/default_snow.png
--- a/Textures/game/default_snow_side.png
+++ b/Textures/game/default_snow_side.png
--- a/Textures/game/default_stone.png
+++ b/Textures/game/default_stone.png
--- a/Textures/game/default_stone_block.png
+++ b/Textures/game/default_stone_block.png
--- a/Textures/game/default_stone_bricks.png
+++ b/Textures/game/default_stone_bricks.png
--- a/Textures/game/default_tallgrass_1.png
+++ b/Textures/game/default_tallgrass_1.png
--- a/Textures/game/default_tallgrass_2.png
+++ b/Textures/game/default_tallgrass_2.png
--- a/Textures/game/default_tallgrass_3.png
+++ b/Textures/game/default_tallgrass_3.png
--- a/Textures/game/default_tallgrass_4.png
+++ b/Textures/game/default_tallgrass_4.png
--- a/Textures/game/default_tallgrass_5.png
+++ b/Textures/game/default_tallgrass_5.png
--- a/Textures/game/flowers_dandelion_white.png
+++ b/Textures/game/flowers_dandelion_white.png
--- a/Textures/game/flowers_dandelion_yellow.png
+++ b/Textures/game/flowers_dandelion_yellow.png
--- a/Textures/game/flowers_geranium.png
+++ b/Textures/game/flowers_geranium.png
--- a/Textures/game/flowers_mushroom_brown.png
+++ b/Textures/game/flowers_mushroom_brown.png
--- a/Textures/game/flowers_mushroom_red.png
+++ b/Textures/game/flowers_mushroom_red.png
--- a/Textures/game/flowers_rose.png
+++ b/Textures/game/flowers_rose.png
--- a/Textures/game/flowers_tulip.png
+++ b/Textures/game/flowers_tulip.png
--- a/Textures/game/flowers_viola.png
+++ b/Textures/game/flowers_viola.png
--- a/Textures/game/flowers_waterlily.png
+++ b/Textures/game/flowers_waterlily.png
--- a/Textures/game/flowers_waterlily_bottom.png
+++ b/Textures/game/flowers_waterlily_bottom.png
--- a/atlas.png
+++ b/atlas.png