diff --git a/CPlusPlus/CPlusPlus.sln b/CPlusPlus/CPlusPlus.sln index aae379d..add3712 100644 --- a/CPlusPlus/CPlusPlus.sln +++ b/CPlusPlus/CPlusPlus.sln @@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "forward_declaration", "forw EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Classes", "Classes\Classes.vcxproj", "{467AD272-2BB3-41B7-9B74-7D193D7D2AE9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Collections", "Collections\Collections.vcxproj", "{1B177393-37B1-4C7B-BCF0-163991832930}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM64 = Debug|ARM64 @@ -55,6 +57,18 @@ Global {467AD272-2BB3-41B7-9B74-7D193D7D2AE9}.Release|x64.Build.0 = Release|x64 {467AD272-2BB3-41B7-9B74-7D193D7D2AE9}.Release|x86.ActiveCfg = Release|Win32 {467AD272-2BB3-41B7-9B74-7D193D7D2AE9}.Release|x86.Build.0 = Release|Win32 + {1B177393-37B1-4C7B-BCF0-163991832930}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {1B177393-37B1-4C7B-BCF0-163991832930}.Debug|ARM64.Build.0 = Debug|ARM64 + {1B177393-37B1-4C7B-BCF0-163991832930}.Debug|x64.ActiveCfg = Debug|x64 + {1B177393-37B1-4C7B-BCF0-163991832930}.Debug|x64.Build.0 = Debug|x64 + {1B177393-37B1-4C7B-BCF0-163991832930}.Debug|x86.ActiveCfg = Debug|Win32 + {1B177393-37B1-4C7B-BCF0-163991832930}.Debug|x86.Build.0 = Debug|Win32 + {1B177393-37B1-4C7B-BCF0-163991832930}.Release|ARM64.ActiveCfg = Release|ARM64 + {1B177393-37B1-4C7B-BCF0-163991832930}.Release|ARM64.Build.0 = Release|ARM64 + {1B177393-37B1-4C7B-BCF0-163991832930}.Release|x64.ActiveCfg = Release|x64 + {1B177393-37B1-4C7B-BCF0-163991832930}.Release|x64.Build.0 = Release|x64 + {1B177393-37B1-4C7B-BCF0-163991832930}.Release|x86.ActiveCfg = Release|Win32 + {1B177393-37B1-4C7B-BCF0-163991832930}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CPlusPlus/Classes/Classes.vcxproj b/CPlusPlus/Classes/Classes.vcxproj index 22f8981..a3596ee 100644 --- a/CPlusPlus/Classes/Classes.vcxproj +++ b/CPlusPlus/Classes/Classes.vcxproj @@ -159,6 +159,7 @@ true _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true + stdcpp20 Console diff --git a/CPlusPlus/Classes/Entity.cpp b/CPlusPlus/Classes/Entity.cpp index a379a02..d3f939e 100644 --- a/CPlusPlus/Classes/Entity.cpp +++ b/CPlusPlus/Classes/Entity.cpp @@ -1,8 +1,9 @@ #include "Entity.h" +#include Entity::Entity() { - + } Entity::Entity(std::string name) : name(name) diff --git a/CPlusPlus/Classes/Monster.cpp b/CPlusPlus/Classes/Monster.cpp index b519743..c5512c4 100644 --- a/CPlusPlus/Classes/Monster.cpp +++ b/CPlusPlus/Classes/Monster.cpp @@ -1,3 +1,5 @@ +#include + #include "Monster.h" Monster::Monster(int strength) : Entity("My Monster"), _strength(strength) @@ -5,10 +7,34 @@ Monster::Monster(int strength) : Entity("My Monster"), _strength(strength) this->name = "My Monster"; } +//Monster Monster::Create(Monsters type) +//{ +// Monster monster; +// switch (type) +// { +// case Ork: +// monster._strength = 10; +// monster._speed = 1.0f; +// break; +// case Troll: +// monster._strength = 5; +// monster._speed = 3.0f; +// break; +// case Elve: +// monster._strength = 1; +// monster._speed = 10.0f; +// break; +// default: +// break; +// } +// +// return monster; +//} + std::string Monster::ToString() { - return name + " " + "(" + std::to_string(_strength) + ")"; - // TODO: show format + //return name + " " + "(" + std::to_string(_strength) + ")"; + return std::format("{} ({})", name, _strength); } int Monster::Compare(ICompareable* other) diff --git a/CPlusPlus/Classes/Monster.h b/CPlusPlus/Classes/Monster.h index d203d51..4c55902 100644 --- a/CPlusPlus/Classes/Monster.h +++ b/CPlusPlus/Classes/Monster.h @@ -2,15 +2,25 @@ #include "Entity.h" #include "ICompareable.h" +//enum Monsters +//{ +// Ork, +// Troll, +// Elve +//}; + class Monster : public Entity, public ICompareable { public: Monster(int strength); + //static Monster Create(Monsters type); + virtual void Move() = 0; // abstract (pure virtual method) std::string ToString() override; int Compare(ICompareable* other) override; protected: int _strength = 0; -}; \ No newline at end of file + float _speed = 0.0f; +}; diff --git a/CPlusPlus/Classes/main.cpp b/CPlusPlus/Classes/main.cpp index abe05a8..18452e9 100644 --- a/CPlusPlus/Classes/main.cpp +++ b/CPlusPlus/Classes/main.cpp @@ -12,6 +12,7 @@ int main() entity.name = "My Entity"; //Monster monster; // can't be instantiated, because Monster is abstract + //Monster monster2 = Monster::Create(Monsters::Ork); Ork ork; ork.name = "My Ork"; diff --git a/CPlusPlus/Collections/Collections.vcxproj b/CPlusPlus/Collections/Collections.vcxproj new file mode 100644 index 0000000..4a6b0d6 --- /dev/null +++ b/CPlusPlus/Collections/Collections.vcxproj @@ -0,0 +1,190 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + Debug + ARM64 + + + Release + ARM64 + + + + 17.0 + Win32Proj + {1b177393-37b1-4c7b-bcf0-163991832930} + Collections + 10.0 + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + \ No newline at end of file diff --git a/CPlusPlus/Collections/Collections.vcxproj.filters b/CPlusPlus/Collections/Collections.vcxproj.filters new file mode 100644 index 0000000..ce0c35c --- /dev/null +++ b/CPlusPlus/Collections/Collections.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/CPlusPlus/Collections/main.cpp b/CPlusPlus/Collections/main.cpp new file mode 100644 index 0000000..c17d520 --- /dev/null +++ b/CPlusPlus/Collections/main.cpp @@ -0,0 +1,114 @@ +#include +#include +#include +#include + +using namespace std; + +#define INT_LIST list // simple text replacement + +// type definitions +typedef list IntegerList; +typedef IntegerList::iterator IntListIterator; + +void printArray(int numbers[]); +void printArray(int numbers[], int count); + +int main() +{ + // C Arrays + int numbers[10]; + + for (size_t i = 0; i < 10; i++) + { + numbers[i] = 0; + } + + numbers[0] = 10; + + cout << "numbers[5]: " << numbers[5] << endl; + + int numbers2[] = { 0, 1, 2, 3, 4, 5 }; + int numbers3[10] = { 0, 1, 2, 3, 4, 5 }; + + // 2d array - 10 rows, 5 columns + int numbers4[10 * 5]; + numbers4[3 + 7 * 5] = 10; // 3rd column, 7th row + + // size have to be always const, except by using pointers + const int count = 10; + int numbers5[count]; + + int length = sizeof(numbers2) / sizeof(numbers2[0]); // works locally only + for (size_t i = 0; i < std::size(numbers2); i++) // size is working locally only + { + cout << numbers2[i] << " "; + } + cout << endl; + + cout << "sizeof(numbers2): " << sizeof(numbers2) << endl; + + printArray(numbers2); + printArray(numbers2, std::size(numbers2)); + + // stl collections + vector numbers6; + vector numbers7 = { 0, 1, 2, 3 }; + numbers6.push_back(10); // add an item at the end + numbers6.pop_back(); // remove an item at the end + numbers7[2] *= 10; + vector numbers8; + numbers8.reserve(100); + cout << "size of numbers8: " << numbers8.size() << endl; + cout << "capacity of numbers8: " << numbers8.capacity() << endl; + printArray(numbers7.data(), numbers7.size()); + + list numbersList; + numbersList.push_back(10); + numbersList.push_front(100); + //numbersList[1] = 200; // random access is not available for lists + list::iterator it = numbersList.begin(); + for (; it != numbersList.end(); it++) + { + cout << *it << " "; + } + cout << endl; + numbersList.insert(--it, 20); + for (it = numbersList.begin(); it != numbersList.end(); it++) + { + cout << *it << " "; + } + cout << endl; + + for (int n : numbersList) + { + + } + + for_each(numbers7.begin(), numbers7.end(), [](const int& n) { + cout << n << " "; + }); + + return 0; +} + +void printArray(int numbers[]) +{ + int length = sizeof(numbers) / sizeof(numbers[0]); // works not outside of local scope + cout << "sizeof(numbers2): " << sizeof(numbers) << endl; + + //for (size_t i = 0; i < std::size(numbers); i++) // size is not working outside of local scope + //{ + // cout << numbers[i] << " "; + //} + //cout << endl; +} + +void printArray(int numbers[], int count) +{ + for (size_t i = 0; i < count; i++) + { + cout << numbers[i] << " "; + } + cout << endl; +}