diff --git a/.gitmodules b/.gitmodules index 82104baab..6aa4a2e44 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "amuse"] path = amuse url = https://github.com/AxioDL/amuse.git +[submodule "kabufuda"] + path = kabufuda + url = https://github.com/AxioDL/kabufuda.git diff --git a/CMakeLists.txt b/CMakeLists.txt index da192aa86..b118ce4ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,9 +93,11 @@ add_definitions(-DZE_ATHENA_TYPES=1) set(ZEUS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/specter/zeus/include) include_directories(${ATHENA_INCLUDE_DIR} ${LOGVISOR_INCLUDE_DIR} ${HECL_INCLUDE_DIR} ${NOD_INCLUDE_DIR} ${ZEUS_INCLUDE_DIR} ${BOO_INCLUDE_DIR} ${AMUSE_INCLUDE_DIR} - ${SPECTER_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) + ${SPECTER_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${KABUFUDA_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) add_subdirectory(DataSpec) +add_subdirectory(kabufuda) add_subdirectory(Editor) + set(CLIENT_SOURCES ${CMAKE_SOURCE_DIR}/Editor/ProjectResourceFactoryBase.hpp ${CMAKE_SOURCE_DIR}/Editor/ProjectResourceFactoryBase.cpp diff --git a/Runtime/Graphics/CDrawable.cpp b/Runtime/Graphics/CDrawable.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/Runtime/Graphics/CDrawable.hpp b/Runtime/Graphics/CDrawable.hpp new file mode 100644 index 000000000..4e2125acc --- /dev/null +++ b/Runtime/Graphics/CDrawable.hpp @@ -0,0 +1,28 @@ +#ifndef __URDE_CDRAWABLE_HPP__ +#define __URDE_CDRAWABLE_HPP__ + +#include "GCNTypes.hpp" +#include "zeus/CAABox.hpp" + +namespace urde +{ +enum class EDrawableType +{ + Zero, + One, +}; + +class CDrawable +{ +public: + CDrawable(EDrawableType, u16, float, const zeus::CAABox&, const void*); + + EDrawableType GetType() const; + const zeus::CAABox& GetBounds() const; + float GetDistance() const; + void* GetData() const; + void GetExtraSort() const; +}; +} + +#endif // __URDE_CDRAWABLE_HPP__ diff --git a/Runtime/Graphics/CDrawablePlaneObject.cpp b/Runtime/Graphics/CDrawablePlaneObject.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/Runtime/Graphics/CDrawablePlaneObject.hpp b/Runtime/Graphics/CDrawablePlaneObject.hpp new file mode 100644 index 000000000..5458426b4 --- /dev/null +++ b/Runtime/Graphics/CDrawablePlaneObject.hpp @@ -0,0 +1,15 @@ +#ifndef __URDE_CDRAWABLEOBJECT_HPP__ +#define __URDE_CDRAWABLEOBJECT_HPP__ + +#include "CDrawable.hpp" +#include "zeus/CPlane.hpp" + +namespace urde +{ +class CDrawablePlaneObject +{ + CDrawablePlaneObject(EDrawableType, float, float, const zeus::CAABox&, bool, const zeus::CPlane&, bool, const void*); +}; +} + +#endif // __URDE_CDRAWABLEOBJECT_HPP__ diff --git a/Runtime/Graphics/CMakeLists.txt b/Runtime/Graphics/CMakeLists.txt index 537a89d6e..956bc32b5 100644 --- a/Runtime/Graphics/CMakeLists.txt +++ b/Runtime/Graphics/CMakeLists.txt @@ -7,6 +7,8 @@ endif() set(GRAPHICS_SOURCES IRenderer.hpp CBooRenderer.hpp CBooRenderer.cpp + CDrawable.hpp CDrawable.cpp + CDrawablePlaneObject.hpp CDrawablePlaneObject.cpp CLineRenderer.hpp CLineRenderer.cpp CLineRendererShaders.hpp CLineRendererShadersGLSL.cpp CMetroidModelInstance.hpp diff --git a/kabufuda b/kabufuda new file mode 160000 index 000000000..2a9c18534 --- /dev/null +++ b/kabufuda @@ -0,0 +1 @@ +Subproject commit 2a9c18534a5085763c191c151447d598c0f9e90f