diff options
Diffstat (limited to 'Source/Asura.Engine')
| -rw-r--r-- | Source/Asura.Engine/FileSystem/Loader.cpp (renamed from Source/Asura.Engine/GUI/Button.cpp) | 0 | ||||
| -rw-r--r-- | Source/Asura.Engine/FileSystem/Loader.h | 20 | ||||
| -rw-r--r-- | Source/Asura.Engine/GUI/README.md | 1 | ||||
| -rw-r--r-- | Source/Asura.Engine/Graphics/Canvas.h | 7 | ||||
| -rw-r--r-- | Source/Asura.Engine/Graphics/Material.h | 4 | ||||
| -rw-r--r-- | Source/Asura.Engine/Graphics/Shape.cpp | 0 | ||||
| -rw-r--r-- | Source/Asura.Engine/Graphics/Shape.h | 0 |
7 files changed, 29 insertions, 3 deletions
diff --git a/Source/Asura.Engine/GUI/Button.cpp b/Source/Asura.Engine/FileSystem/Loader.cpp index e69de29..e69de29 100644 --- a/Source/Asura.Engine/GUI/Button.cpp +++ b/Source/Asura.Engine/FileSystem/Loader.cpp diff --git a/Source/Asura.Engine/FileSystem/Loader.h b/Source/Asura.Engine/FileSystem/Loader.h new file mode 100644 index 0000000..2846c69 --- /dev/null +++ b/Source/Asura.Engine/FileSystem/Loader.h @@ -0,0 +1,20 @@ +#ifndef __AE_LOADER_H__ +#define __AE_LOADER_H__ + +namespace AsuraEngine +{ + namespace Filesystem + { + + /// + /// Դloader + /// + class Loader + { + + }; + + } +} + +#endif
\ No newline at end of file diff --git a/Source/Asura.Engine/GUI/README.md b/Source/Asura.Engine/GUI/README.md deleted file mode 100644 index 3e367c7..0000000 --- a/Source/Asura.Engine/GUI/README.md +++ /dev/null @@ -1 +0,0 @@ -immediate mode game gui
\ No newline at end of file diff --git a/Source/Asura.Engine/Graphics/Canvas.h b/Source/Asura.Engine/Graphics/Canvas.h index cd78194..7f70e7c 100644 --- a/Source/Asura.Engine/Graphics/Canvas.h +++ b/Source/Asura.Engine/Graphics/Canvas.h @@ -11,6 +11,13 @@ namespace AsuraEngine class Canvas : public Texture, public Component { + public: + + + + private: + + }; diff --git a/Source/Asura.Engine/Graphics/Material.h b/Source/Asura.Engine/Graphics/Material.h index 1cb3c88..68dfa1e 100644 --- a/Source/Asura.Engine/Graphics/Material.h +++ b/Source/Asura.Engine/Graphics/Material.h @@ -160,13 +160,13 @@ namespace AsuraEngine /// /// еimage /// - Containers::Map<uint, Image*> mImages; + Containers::Map<uint, Material*> mMaterials; /// /// image·IDӳ䡣Դ.asrimageͨ·õimageԲеimageڴmapС /// ɳimageֻͨIDȡԳҪID /// - Containers::StringMap<uint> mImageIDs; + Containers::StringMap<uint> mMaterialIDs; }; diff --git a/Source/Asura.Engine/Graphics/Shape.cpp b/Source/Asura.Engine/Graphics/Shape.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/Graphics/Shape.cpp diff --git a/Source/Asura.Engine/Graphics/Shape.h b/Source/Asura.Engine/Graphics/Shape.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/Graphics/Shape.h |