setup complete - visible character

This commit is contained in:
Wolf committed 2021-07-07 23:20:04 +02:00
1 parent 9014681460
commit e4c6a45427
53 files changed
+180 -422

No files matched your search

+1
View File
@@ -0,0 +1 @@
/include/cute_headers-master
+28
View File
@@ -0,0 +1,28 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "(gdb) Launch",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/bin/main",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/bin",
"environment": [],
"externalConsole": true,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
],
"preLaunchTask": "build"
}
]
}
+34
View File
@@ -0,0 +1,34 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"type": "shell",
"command": "make",
"group": "build",
"problemMatcher": "$gcc"
},
{
"type": "cppbuild",
"label": "C/C++: g++ build active file",
"command": "/usr/bin/g++",
"args": [
"-g",
"${file}",
"-o",
"${fileDirname}/${fileBasenameNoExtension}"
],
"options": {
"cwd": "${workspaceFolder}/bin/main"
},
"problemMatcher": [
"$gcc"
],
"group": {
"kind": "build",
"isDefault": true
},
"detail": "Task generated by Debugger."
}
]
}
+22
View File
@@ -0,0 +1,22 @@
CXX := g++
CXX_FLAGS := -std=c++17 -ggdb
BIN := bin
SRC := src
INCLUDE := include
LIBRARIES :=
EXECUTABLE := main
all: $(BIN)/$(EXECUTABLE)
run: clean all
clear
./$(BIN)/$(EXECUTABLE)
$(BIN)/$(EXECUTABLE): $(SRC)/*.cpp $(SRC)/components/*.cpp $(SRC)/imgui/*.cpp $(SRC)/logic/*.cpp $(SRC)/shaders/*.cpp $(SRC)/textureManager/*.cpp src/glad.c
$(CXX) $(CXX_FLAGS) -I$(INCLUDE) -I$(INCLUDE)/imgui -I$(INCLUDE)/logic $^ -o $@ $(LIBRARIES) -lGL -lglfw3 -lX11 -lXxf86vm -lXrandr -lpthread -lXi -ldl -lXinerama -lXcursor
clean:
-rm $(BIN)/*
-209
View File
@@ -1,209 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{851AA053-F6FF-4194-AD1A-FE25D73B16CF}</ProjectGuid>
<RootNamespace>Project1</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>C:\API\opengl\include;$(IncludePath)</IncludePath>
<LibraryPath>C:\API\opengl\libs;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>C:\API\opengl\include;$(IncludePath)</IncludePath>
<LibraryPath>C:\API\opengl\libs;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>GLFW\glfw3.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>GLFW\glfw3.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="enemy.cpp" />
<ClCompile Include="game.cpp" />
<ClCompile Include="glad.c" />
<ClCompile Include="vendor\imgui.cpp" />
<ClCompile Include="vendor\imgui_demo.cpp" />
<ClCompile Include="vendor\imgui_draw.cpp" />
<ClCompile Include="vendor\imgui_impl_glfw.cpp" />
<ClCompile Include="vendor\imgui_impl_opengl3.cpp" />
<ClCompile Include="vendor\imgui_widgets.cpp" />
<ClCompile Include="Object.cpp" />
<ClCompile Include="Player.cpp" />
<ClCompile Include="resourceManager.cpp" />
<ClCompile Include="shaders\Shader.cpp" />
<ClCompile Include="SpriteRenderer.cpp" />
<ClCompile Include="stb_image.cpp" />
<ClCompile Include="Source.cpp" />
<ClCompile Include="textureManager\texture.cpp" />
<ClCompile Include="terrainFile\world.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="animationManager.h" />
<ClInclude Include="enemy.h" />
<ClInclude Include="game.h" />
<ClInclude Include="Object.h" />
<ClInclude Include="Player.h" />
<ClInclude Include="resourceManager.h" />
<ClInclude Include="shaders\Shader.h" />
<ClInclude Include="SpriteRenderer.h" />
<ClInclude Include="textureManager\texture.h" />
<ClInclude Include="terrainFile\world.h" />
</ItemGroup>
<ItemGroup>
<None Include="shaders\shader.frag" />
<None Include="shaders\shader.vert" />
<None Include="shaders\shaderTilemap.frag" />
<None Include="shaders\shaderTilemap.vert" />
</ItemGroup>
<ItemGroup>
<Image Include="art\dirt.png" />
<Image Include="art\gay1.png" />
<Image Include="art\gay2.png" />
<Image Include="art\player\idle\idle_idle_0.png" />
<Image Include="art\player\idle\idle_idle_1.png" />
<Image Include="art\player\idle\idle_idle_2.png" />
<Image Include="art\player\idle\idle_idle_3.png" />
<Image Include="art\player\playerAnim.png" />
<Image Include="art\player\playerAnim2.png" />
<Image Include="art\player\playerAnim3.png" />
<Image Include="art\player\player\idle\idle_idle_0.png" />
<Image Include="art\player\player\idle\idle_idle_1.png" />
<Image Include="art\player\player\idle\idle_idle_2.png" />
<Image Include="art\player\player\idle\idle_idle_3.png" />
<Image Include="art\player\walking_walk_0.png" />
<Image Include="art\terrain\dirt.png" />
</ItemGroup>
<ItemGroup>
<Text Include="terrainFile\terrain4.txt" />
<Text Include="terrainFile\terrain.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
-165
View File
@@ -1,165 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Source.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="game.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="glad.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="stb_image.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="textureManager\texture.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="resourceManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="SpriteRenderer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Player.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Object.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="vendor\imgui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="vendor\imgui_demo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="vendor\imgui_draw.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="vendor\imgui_impl_glfw.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="vendor\imgui_impl_opengl3.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="vendor\imgui_widgets.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="terrainFile\world.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="shaders\Shader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="enemy.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="game.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="shaders\Shader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="textureManager\texture.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resourceManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="SpriteRenderer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Player.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Object.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="animationManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="terrainFile\world.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="enemy.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="shaders\shader.vert" />
<None Include="shaders\shader.frag" />
<None Include="shaders\shaderTilemap.frag" />
<None Include="shaders\shaderTilemap.vert" />
</ItemGroup>
<ItemGroup>
<Image Include="art\dirt.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\walking_walk_0.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\gay1.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\gay2.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\player\idle\idle_idle_0.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\player\idle\idle_idle_1.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\player\idle\idle_idle_2.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\player\idle\idle_idle_3.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\idle\idle_idle_0.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\idle\idle_idle_1.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\idle\idle_idle_2.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\idle\idle_idle_3.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\playerAnim.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\playerAnim2.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\player\playerAnim3.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="art\terrain\dirt.png">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<Text Include="terrainFile\terrain4.txt" />
<Text Include="terrainFile\terrain.txt" />
</ItemGroup>
</Project>
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ShowAllFiles>true</ShowAllFiles>
</PropertyGroup>
</Project>
+10 -15
View File
@@ -1,15 +1,10 @@
[Window][Debug##Default]
Pos=60,60
Size=400,400
Collapsed=0
[Window][Hello, world!]
Pos=60,60
Size=345,180
Collapsed=0
[Window][babyboigame]
Pos=290,196
Size=352,243
Collapsed=0
[Window][Debug##Default]
Pos=60,60
Size=400,400
Collapsed=0
[Window][babyboigame]
Pos=60,60
Size=352,249
Collapsed=0
Executable
BIN
View File
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+2 -2
View File
@@ -1,13 +1,13 @@
#pragma once
#include <GLAD/glad.h>
#include <glad/glad.h>
#include <GLFW/glfw3.h>
#include <glm/glm.hpp>
#include "iostream"
#include <cute_headers-master/cute_c2.h>
//#include <cute_headers-master/cute_ani.h>
#include "SpriteRenderer.h"
#include "spriteRenderer.h"
#include "resourceManager.h"
#include "animationManager.h"
+6 -6
View File
@@ -1,5 +1,5 @@
#pragma once
#include <GLAD/glad.h>
#include <glad/glad.h>
#include <GLFW/glfw3.h>
#include <glm/glm.hpp>
@@ -11,11 +11,11 @@
#include <stb_image.h>
#include "resourceManager.h"
#include "SpriteRenderer.h"
#include "Player.h"
#include "Enemy.h"
#include "Object.h"
#include "terrainFile/world.h"
#include "spriteRenderer.h"
#include "player.h"
#include "enemy.h"
#include "object.h"
#include "world.h"
#include <cute_headers-master/cute_c2.h>
#include <cute_headers-master/cute_gl.h>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -3,11 +3,11 @@
#include <map>
#include <string>
#include <GLAD/glad.h>
#include <glad/glad.h>
#include <stb_image.h>
#include "textureManager/texture.h"
#include "shaders/shader.h"
#include "texture.h"
#include "shader.h"
// A static singleton ResourceManager class that hosts several
File renamed without changes.
@@ -1,10 +1,10 @@
#pragma once
#include <GLAD/glad.h>
#include <glad/glad.h>
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include "textureManager/texture.h"
#include "shaders/shader.h"
#include "texture.h"
#include "shader.h"
class SpriteRenderer
@@ -1,7 +1,7 @@
#pragma once
// Texture2D is able to store and configure a texture in OpenGL.
// It also hosts utility functions for easy management.
#include <GLAD/glad.h>
#include <glad/glad.h>
class Texture
{
+2 -2
View File
@@ -1,12 +1,12 @@
#pragma once
#include "SpriteRenderer.h"
#include "spriteRenderer.h"
#include "resourceManager.h"
#include "animationManager.h"
#include <cute_headers-master/cute_c2.h>
#include <GLAD/glad.h>
#include <glad/glad.h>
#include <GLFW/glfw3.h>
#include <glm/glm.hpp>
#include <iostream>
+2 -2
View File
@@ -1,13 +1,13 @@
#pragma once
#include <GLAD/glad.h>
#include <glad/glad.h>
#include <GLFW/glfw3.h>
#include <glm/glm.hpp>
#include "iostream"
#include <cute_headers-master/cute_c2.h>
//#include <cute_headers-master/cute_ani.h>
#include "SpriteRenderer.h"
#include "spriteRenderer.h"
#include "resourceManager.h"
#include "animationManager.h"
+2 -2
View File
@@ -2,12 +2,12 @@
#include <vector>
#include <iostream>
#include "../Object.h"
#include "object.h"
class World
{
public:
Texture Sprite = ResourceManager::LoadTexture("art/terrain/dirt.png", "dirtSheet");
Texture Sprite = ResourceManager::LoadTexture("../art/terrain/dirt.png", "dirtSheet");
glm::vec2 blocksize;
std::vector<Object*> objects;
std::vector<std::vector<unsigned int>> tileData;
+1 -1
View File
@@ -1,4 +1,4 @@
#include "Enemy.h"
#include "enemy.h"
Enemy::Enemy(glm::vec2 pos, glm::vec2 size)
:Position(pos), Size(size)
+1 -1
View File
@@ -1,4 +1,4 @@
#include "Object.h"
#include "object.h"
Object::Object(Texture sprite, glm::vec2 pos, glm::vec2 size, int blockType)
:Sprite(sprite),Position(pos),Size(size), blockType(blockType)
+2 -2
View File
@@ -1,9 +1,9 @@
#include "Player.h"
#include "player.h"
Player::Player(glm::vec2 pos, glm::vec2 size)
:Position(pos), Size(size)
{
ResourceManager::LoadTexture("art/player/playerAnim.png", "idle1");
ResourceManager::LoadTexture("../art/player/playerAnim.png", "idle1");
this->Sprite = ResourceManager::GetTexture("idle1");
}
Player::~Player(){}
File renamed without changes.
+1 -1
View File
@@ -1,4 +1,4 @@
#include "Game.h"
#include "game.h"
void framebuffer_size_callback(GLFWwindow* window, int width, int height);
View File
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,4 +1,4 @@
#include "SpriteRenderer.h"
#include "spriteRenderer.h"
SpriteRenderer::SpriteRenderer(Shader& shader)
File renamed without changes.
+14
View File
@@ -0,0 +1,14 @@
#version 330 core
in vec2 texCoord;
out vec4 fragColor;
uniform sampler2D image;
void main()
{
vec4 texColor = texture(image, texCoord);
if(texColor.a < 0.1)
discard;
fragColor = texColor;
}
+15
View File
@@ -0,0 +1,15 @@
#version 330 core
layout (location = 0) in vec4 aPos;
uniform mat4 model;
uniform mat4 view;
uniform mat4 projection;
out vec2 texCoord;
void main()
{
gl_Position = projection * view * vec4(aPos.xy,0.0,1.0);
texCoord = aPos.zw;
}
+14
View File
@@ -0,0 +1,14 @@
#version 330 core
in vec2 texCoord;
out vec4 fragColor;
uniform sampler2D image;
void main()
{
vec4 texColor = texture(image, texCoord);
if(texColor.a < 0.1)
discard;
fragColor = texColor;
}
+15
View File
@@ -0,0 +1,15 @@
#version 330 core
layout (location = 0) in vec4 aPos;
uniform mat4 model;
uniform mat4 view;
uniform mat4 projection;
uniform int offset[];
out vec2 texCoord;
void main()
{
gl_Position = projection * view * model * vec4(aPos.xy,0.0,1.0);
texCoord = aPos.zw;
}
View File
File renamed without changes.
View File
File renamed without changes.
File renamed without changes.