Skip to content

Commit

Permalink
Merge pull request #12 from AsulconS/release-0.2.1
Browse files Browse the repository at this point in the history
Release 0.2.1
  • Loading branch information
AsulconS authored Jan 8, 2024
2 parents cffcc17 + 7f4d129 commit ea1e0ec
Show file tree
Hide file tree
Showing 76 changed files with 303 additions and 238 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@ examples/*.so
examples/ball
examples/doubleWindow
examples/finn
examples/gyroscope
examples/keys
examples/physicsTest
examples/shaderTester
examples/triangle
23 changes: 19 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_SOURCE_DIR}>/lib)

# Set all version configuration
set(VERSION_MAJOR 0)
set(VERSION_MINOR 2)
set(VERSION_MINOR 3)
set(VERSION_PATCH 0)
set(SO_VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
set(FULL_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
Expand All @@ -19,7 +19,10 @@ project(HSGIL VERSION ${FULL_VERSION})
# Project options
option(HSGIL_BUILD_SHARED "Build HSGIL in shared mode [Static by default]." OFF)
option(HSGIL_BUILD_EXAMPLES "Build HSGIL examples." OFF)
option(HSGIL_DEV_OPT_1 OFF)
option(HSGIL_FORCE_GLX_CTX_VERSION OFF)
set(HSGIL_GLX_CTX_VERSION_MAJOR 4 CACHE STRING "Specifies Forced GLX Version Major")
set(HSGIL_GLX_CTX_VERSION_MINOR 6 CACHE STRING "Specifies Forced GLX Version Minor")
option(HSGIL_DEV_OPT_1 OFF) # VLD on Windows

# Set C++17 as the standard
set(CMAKE_CXX_STANDARD 17)
Expand Down Expand Up @@ -49,6 +52,7 @@ set(HSGIL_SOURCES
src/window/inputHandler.cpp
src/window/renderingWindow.cpp
src/window/${HSGIL_PLATFORM}/windowManagerPlatform.cpp
src/window/${HSGIL_PLATFORM}/compatUtilsPlatform.cpp
src/window/wmLazyPtr.cpp
src/window/wUtils.cpp
)
Expand All @@ -66,21 +70,32 @@ PROPERTIES
PUBLIC_HEADER include/HSGIL/hsgil.hpp
)
configure_file(${HSGIL_LIB_NAME}.pc.in ${HSGIL_LIB_NAME}.pc @ONLY)

# Set Dynamic Compile Definitions
set(HSGIL_COMPILE_DEFINITIONS C__HSGIL_COMPILING)
if(HSGIL_FORCE_GLX_CTX_VERSION)
set(HSGIL_COMPILE_DEFINITIONS ${HSGIL_COMPILE_DEFINITIONS}
C__HSGIL_FORCE_GLX_CTX_VERSION
C__HSGIL_GLX_CTX_VERSION_MAJOR=${HSGIL_GLX_CTX_VERSION_MAJOR}
C__HSGIL_GLX_CTX_VERSION_MINOR=${HSGIL_GLX_CTX_VERSION_MINOR}
)
endif()

if(HSGIL_BUILD_SHARED)
target_compile_definitions(${HSGIL_LIB_NAME}
PUBLIC
GLAD_GLAPI_EXPORT
PRIVATE
__STDC_LIB_EXT1__
C__HSGIL_COMPILING
${HSGIL_COMPILE_DEFINITIONS}
C__HSGIL_SHARED_LIB
GLAD_GLAPI_EXPORT_BUILD
)
else()
target_compile_definitions(${HSGIL_LIB_NAME}
PRIVATE
__STDC_LIB_EXT1__
C__HSGIL_COMPILING
${HSGIL_COMPILE_DEFINITIONS}
)
endif()
target_include_directories(${HSGIL_LIB_NAME} PRIVATE include)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# HSGIL
## Handy Scalable Graphics Integration Library

HSGIL - Copyright (c) 2019-2022 Adrian Bedregal
HSGIL - Copyright (c) 2019-2024 Adrian Bedregal

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<a href="#"><img src="https://img.shields.io/github/commit-activity/y/AsulconS/HSGIL"></a>
<a href="https://github.com/AsulconS/HSGIL/issues"><img src="https://img.shields.io/github/issues/AsulconS/HSGIL"></a>
<a href="https://github.com/AsulconS/HSGIL/pulls"><img src="https://img.shields.io/github/issues-pr/AsulconS/HSGIL"></a>
<a href="#"><img src="https://img.shields.io/tokei/lines/github/AsulconS/HSGIL"></a>
<a href="#"><img src="https://img.shields.io/github/stars/AsulconS/HSGIL"></a>
</p>

Expand Down
2 changes: 1 addition & 1 deletion examples/src/gyroscope.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2023 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand Down
2 changes: 1 addition & 1 deletion examples/src/shaderTester.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2023 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand Down
7 changes: 2 additions & 5 deletions include/HSGIL/config/common.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand All @@ -21,8 +21,7 @@
* *
********************************************************************************/

#ifndef HSGIL_COMMON_HPP
#define HSGIL_COMMON_HPP
#pragma once

#include <cstdint>

Expand Down Expand Up @@ -52,5 +51,3 @@ namespace erick = gil;
namespace yober = gil;
namespace pogdo = gil;
namespace zhong = gil;

#endif // HSGIL_COMMON_HPP
7 changes: 2 additions & 5 deletions include/HSGIL/config/config.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand All @@ -21,8 +21,7 @@
* *
********************************************************************************/

#ifndef HSGIL_CONFIG_HPP
#define HSGIL_CONFIG_HPP
#pragma once

/**
* This defines the OS we are working with
Expand Down Expand Up @@ -58,5 +57,3 @@
#if defined(C__HSGIL_DEV_OPT_1)
#include <vld.h>
#endif

#endif // HSGIL_CONFIG_HPP
7 changes: 2 additions & 5 deletions include/HSGIL/exception/genericException.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand All @@ -21,8 +21,7 @@
* *
********************************************************************************/

#ifndef HSGIL_GENERIC_EXCEPTION_HPP
#define HSGIL_GENERIC_EXCEPTION_HPP
#pragma once

#include <exception>

Expand All @@ -46,5 +45,3 @@ class GenericException : public std::exception
} // namespace gil

#include <HSGIL/exception/genericException.inl>

#endif // HSGIL_GENERIC_EXCEPTION_HPP
2 changes: 1 addition & 1 deletion include/HSGIL/exception/genericException.inl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand Down
7 changes: 2 additions & 5 deletions include/HSGIL/exception/graphics/graphicsException.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand All @@ -21,8 +21,7 @@
* *
********************************************************************************/

#ifndef HSGIL_GRAPHICS_EXCEPTION_HPP
#define HSGIL_GRAPHICS_EXCEPTION_HPP
#pragma once

#include <HSGIL/exception/genericException.hpp>

Expand Down Expand Up @@ -61,5 +60,3 @@ class ShaderException : public GraphicsException
} // namespace gil

#include <HSGIL/exception/graphics/graphicsException.inl>

#endif // HSGIL_GRAPHICS_EXCEPTION_HPP
2 changes: 1 addition & 1 deletion include/HSGIL/exception/graphics/graphicsException.inl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand Down
7 changes: 2 additions & 5 deletions include/HSGIL/exception/system/dstrException.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand All @@ -21,8 +21,7 @@
* *
********************************************************************************/

#ifndef HSGIL_DSTR_EXCEPTION_HPP
#define HSGIL_DSTR_EXCEPTION_HPP
#pragma once

#include <HSGIL/exception/genericException.hpp>

Expand Down Expand Up @@ -61,5 +60,3 @@ class KeyNotFoundException : public DStrException
} // namespace gil

#include <HSGIL/exception/system/dstrException.inl>

#endif // HSGIL_DSTR_EXCEPTION_HPP
2 changes: 1 addition & 1 deletion include/HSGIL/exception/system/dstrException.inl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand Down
7 changes: 2 additions & 5 deletions include/HSGIL/exception/window/windowException.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand All @@ -21,8 +21,7 @@
* *
********************************************************************************/

#ifndef HSGIL_WINDOW_EXCEPTION_HPP
#define HSGIL_WINDOW_EXCEPTION_HPP
#pragma once

#include <HSGIL/exception/genericException.hpp>

Expand Down Expand Up @@ -76,5 +75,3 @@ class GLADInitException : public WindowException
} // namespace gil

#include <HSGIL/exception/window/windowException.inl>

#endif // HSGIL_WINDOW_EXCEPTION_HPP
2 changes: 1 addition & 1 deletion include/HSGIL/exception/window/windowException.inl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand Down
7 changes: 2 additions & 5 deletions include/HSGIL/graphics.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand All @@ -21,14 +21,11 @@
* *
********************************************************************************/

#ifndef HSGIL_GRAPHICS_I_HPP
#define HSGIL_GRAPHICS_I_HPP
#pragma once

#include <HSGIL/config/config.hpp>

#include <HSGIL/graphics/shader.hpp>
#include <HSGIL/graphics/gUtils.hpp>
#include <HSGIL/graphics/mesh.hpp>
#include <HSGIL/graphics/model.hpp>

#endif // HSGIL_GRAPHICS_I_HPP
7 changes: 2 additions & 5 deletions include/HSGIL/graphics/gUtils.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand All @@ -21,8 +21,7 @@
* *
********************************************************************************/

#ifndef HSGIL_G_UTILS_HPP
#define HSGIL_G_UTILS_HPP
#pragma once

#include <HSGIL/external/glm/glm.hpp>

Expand Down Expand Up @@ -64,5 +63,3 @@ HSGIL_API uint32 loadTexture(const char* path);
HSGIL_API void setupDefaultLights(Shader& shader, const glm::vec3& viewPos = {2.0f, 4.0f, 2.0f});

} // namespace gil

#endif // HSGIL_G_UTILS_HPP
7 changes: 2 additions & 5 deletions include/HSGIL/graphics/mesh.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand All @@ -21,8 +21,7 @@
* *
********************************************************************************/

#ifndef HSGIL_MESH_HPP
#define HSGIL_MESH_HPP
#pragma once

#include <HSGIL/external/glm/glm.hpp>

Expand Down Expand Up @@ -84,5 +83,3 @@ class HSGIL_API Mesh
};

} // namespace gil

#endif // HSGIL_MESH_HPP
7 changes: 2 additions & 5 deletions include/HSGIL/graphics/model.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/********************************************************************************
* *
* HSGIL - Handy Scalable Graphics Integration Library *
* Copyright (c) 2019-2022 Adrian Bedregal *
* Copyright (c) 2019-2024 Adrian Bedregal *
* *
* This software is provided 'as-is', without any express or implied *
* warranty. In no event will the authors be held liable for any damages *
Expand All @@ -21,8 +21,7 @@
* *
********************************************************************************/

#ifndef HSGIL_MODEL_HPP
#define HSGIL_MODEL_HPP
#pragma once

#include <HSGIL/external/glm/glm.hpp>

Expand Down Expand Up @@ -74,5 +73,3 @@ class HSGIL_API Model
};

} // namespace gil

#endif // HSGIL_MODEL_HPP
Loading

0 comments on commit ea1e0ec

Please sign in to comment.