From 5df9b4d39ff701376a896969fbab20aa3d4e77fb Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Wed, 5 Oct 2022 17:08:36 +0200 Subject: [PATCH] adding imputs system --- .gitignore | 6 + LICENSE | 340 +++++++++++++++++++++++++++++++++++++++ Makefile | 53 ++++++ README.md | 28 ++++ includes/mlx.h | 28 ++++ src/core/application.cpp | 24 +++ src/core/application.h | 46 ++++++ src/core/bridge.cpp | 42 +++++ src/core/errors.cpp | 33 ++++ src/core/errors.h | 31 ++++ src/platform/inputs.cpp | 54 +++++++ src/platform/inputs.h | 56 +++++++ src/platform/window.cpp | 30 ++++ src/platform/window.h | 33 ++++ test/main.c | 21 +++ 15 files changed, 825 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 Makefile create mode 100644 README.md create mode 100644 includes/mlx.h create mode 100644 src/core/application.cpp create mode 100644 src/core/application.h create mode 100644 src/core/bridge.cpp create mode 100644 src/core/errors.cpp create mode 100644 src/core/errors.h create mode 100644 src/platform/inputs.cpp create mode 100644 src/platform/inputs.h create mode 100644 src/platform/window.cpp create mode 100644 src/platform/window.h create mode 100644 test/main.c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6504cdb --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*.swp +*.swx +*.o +*.a +*.so +*.out diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1f963da --- /dev/null +++ b/LICENSE @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..b73705b --- /dev/null +++ b/Makefile @@ -0,0 +1,53 @@ +# **************************************************************************** # +# # +# ::: :::::::: # +# Makefile :+: :+: :+: # +# +:+ +:+ +:+ # +# By: maldavid +#+ +:+ +#+ # +# +#+#+#+#+#+ +#+ # +# Created: 2022/10/04 16:43:41 by maldavid #+# #+# # +# Updated: 2022/10/04 22:08:52 by maldavid ### ########.fr # +# # +# **************************************************************************** # + +NAME = libMicroX.so + +SRCS = $(wildcard $(addsuffix /*.cpp, ./src/core)) +SRCS += $(wildcard $(addsuffix /*.cpp, ./src/platform)) +SRCS += $(wildcard $(addsuffix /*.cpp, ./src/renderer)) + +OBJS = $(SRCS:.cpp=.o) + +DEBUG ?= false + +CXX = g++ +CXXFLAGS = -std=c++17 -O3 -fPIC +INCLUDES = -I./includes -I./src + +ifeq ($(DEBUG), true) + CXXFLAGS += -g +endif + +RM = rm -f + +%.o: %.cpp + @echo "\e[1;32m[compiling... ]\e[1;00m "$< + @$(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@ + +all: $(NAME) + +$(NAME): $(OBJS) + @echo "\e[1;32m[ linking ...]\e[1;00m "$@ + @$(CXX) -shared -o $(NAME) $(OBJS) + @echo "\e[1;32m[build finished]\e[1;00m" + +clean: + @$(RM) $(OBJS) + @$(RM) $(OBJS_B) + +fclean: clean + @$(RM) $(NAME) + +re: fclean all + +.PHONY: all clean fclean re diff --git a/README.md b/README.md new file mode 100644 index 0000000..0aa918b --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +# MicroLibX + +A rewrite of School 42's MiniLibX using SDL2 and Vulkan. The goal of this version is to give a light, fast and modern graphical tool while keeping the same API as the version currently used at 42. + +# Installation + +## Linux + +1. Necessary packages : + +For Ubuntu/Debian +```bash +~ sudo apt update +~ sudo apt install libsdl2-2.0-0 libsdl2-dev build-essential +``` + +For Arch based distros +```bash +~ sudo pacman -S sdl2 +``` + +2. Get MicroLibX + +```bash +~ git clone https://github.com/420verfl0w/MicroLibX.git +~ cd MicroLibX +~ make +``` diff --git a/includes/mlx.h b/includes/mlx.h new file mode 100644 index 0000000..ef90f0a --- /dev/null +++ b/includes/mlx.h @@ -0,0 +1,28 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* mlx.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/10/04 16:56:35 by maldavid #+# #+# */ +/* Updated: 2022/10/04 22:27:45 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef __MICRO_LIB_X_H__ +#define __MICRO_LIB_X_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +void mlx_init(); +void mlx_new_window(int w, int h, const char* title); +int mlx_loop(); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/core/application.cpp b/src/core/application.cpp new file mode 100644 index 0000000..76cec42 --- /dev/null +++ b/src/core/application.cpp @@ -0,0 +1,24 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* application.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/10/04 22:10:52 by maldavid #+# #+# */ +/* Updated: 2022/10/05 16:58:11 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "application.h" + +namespace mlx::core +{ + void Application::run() noexcept + { + while(_in.is_running()) + { + _in.update(); + } + } +} diff --git a/src/core/application.h b/src/core/application.h new file mode 100644 index 0000000..1061035 --- /dev/null +++ b/src/core/application.h @@ -0,0 +1,46 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* application.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/10/04 21:49:46 by maldavid #+# #+# */ +/* Updated: 2022/10/05 16:58:25 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef __MLX_APPLICATION__ +#define __MLX_APPLICATION__ + +#include +#include +#include + +#include +#include + +namespace mlx::core +{ + class Application + { + public: + Application() = default; + + inline void new_window(std::size_t w, std::size_t h, std::string title) + { + _wins.emplace_back(std::make_unique(w, h, std::move(title))); + } + + void run() noexcept; + + ~Application() = default; + + private: + Input _in; + std::vector> _wins; + bool _is_loop_running = false; + }; +} + +#endif // __MLX_APPLICATION__ diff --git a/src/core/bridge.cpp b/src/core/bridge.cpp new file mode 100644 index 0000000..9b447be --- /dev/null +++ b/src/core/bridge.cpp @@ -0,0 +1,42 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* bridge.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/10/04 17:35:20 by maldavid #+# #+# */ +/* Updated: 2022/10/05 14:02:27 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include +#include "errors.h" +#include "application.h" + +extern "C" +{ + static std::unique_ptr __main_app = nullptr; + + void mlx_init() + { + if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) + mlx::core::error::report(e_kind::fatal_error, "Unable to init the SDL2"); + __main_app.reset(new mlx::core::Application()); + } + + void mlx_new_window(int w, int h, const char* title) + { + if(__main_app == nullptr) + mlx::core::error::report(e_kind::fatal_error, "You must initialize the mlx before you can create new windows"); + __main_app->new_window(w, h, title); + } + + int mlx_loop() + { + if(__main_app == nullptr) + mlx::core::error::report(e_kind::fatal_error, "You must initialize the mlx before you can run the main loop"); + __main_app->run(); + } +} diff --git a/src/core/errors.cpp b/src/core/errors.cpp new file mode 100644 index 0000000..e35f254 --- /dev/null +++ b/src/core/errors.cpp @@ -0,0 +1,33 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* errors.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/10/04 17:48:06 by maldavid #+# #+# */ +/* Updated: 2022/10/04 21:18:35 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include + +#include "errors.h" + +namespace mlx::core::error +{ + void report(e_kind kind, std::string msg) + { + switch(kind) + { + case e_kind::message: std::cout << "[MicroLibX] Message : " << msg << std::endl; break; + case e_kind::warning: std::cout << "[MicroLibX] Warning : " << msg << std::endl; break; + case e_kind::error: std::cerr << "[MicroLibX] Error : " << msg << std::endl; break; + case e_kind::fatal_error: + std::cerr << "[MicroLibX] Fatal Error : " << msg << std::endl; + std::exit(EXIT_SUCCESS); + break; + } + } +} diff --git a/src/core/errors.h b/src/core/errors.h new file mode 100644 index 0000000..02e601f --- /dev/null +++ b/src/core/errors.h @@ -0,0 +1,31 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* errors.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/10/04 17:42:32 by maldavid #+# #+# */ +/* Updated: 2022/10/04 21:51:42 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef __MLX_ERRORS__ +#define __MLX_ERRORS__ + +#include + +enum class e_kind +{ + message, + warning, + error, + fatal_error +}; + +namespace mlx::core::error +{ + void report(e_kind kind, std::string msg); +} + +#endif // __MLX_ERRORS__ diff --git a/src/platform/inputs.cpp b/src/platform/inputs.cpp new file mode 100644 index 0000000..ba5f823 --- /dev/null +++ b/src/platform/inputs.cpp @@ -0,0 +1,54 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* inputs.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/10/05 16:30:19 by maldavid #+# #+# */ +/* Updated: 2022/10/05 16:39:42 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "inputs.h" +#include + +namespace mlx +{ + Input::Input() + { + std::memset(_keys.data(), 0, SDL_NUM_SCANCODES); + std::memset(_mouse.data(), 0, 8); + } + + void Input::update() + { + _xRel = 0; + _yRel = 0; + + while(SDL_PollEvent(&_event)) + { + if(_event.window.event == SDL_WINDOWEVENT_CLOSE) + _end = true; + + switch(_event.type) + { + case SDL_KEYDOWN: _keys[_event.key.keysym.scancode] = static_cast(action::down); break; + case SDL_KEYUP: _keys[_event.key.keysym.scancode] = static_cast(action::up); break; + case SDL_MOUSEBUTTONDOWN: _mouse[_event.button.button] = static_cast(action::down); break; + case SDL_MOUSEBUTTONUP: _mouse[_event.button.button] = static_cast(action::up); break; + + default: break; + } + + if(_event.type == SDL_MOUSEMOTION) + { + _x = _event.motion.x; + _y = _event.motion.y; + + _xRel = _event.motion.xrel; + _yRel = _event.motion.yrel; + } + } + } +} diff --git a/src/platform/inputs.h b/src/platform/inputs.h new file mode 100644 index 0000000..d58deca --- /dev/null +++ b/src/platform/inputs.h @@ -0,0 +1,56 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* inputs.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/10/05 16:27:35 by maldavid #+# #+# */ +/* Updated: 2022/10/05 16:45:55 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include +#include + +namespace mlx +{ + enum class action : uint8_t { up = (1 << 1), down = (1 << 2) }; + + class Input + { + public: + Input(); + + void update(); + + inline bool getInKey(const SDL_Scancode key, action type = action::down) const noexcept { return _keys[key] & static_cast(type); } + + inline bool getInMouse(const uint8_t button, action type = action::down) const noexcept { return _mouse[button] & static_cast(type); } + inline bool isMouseMoving() const noexcept { return _xRel || _yRel; } + + inline int getX() const noexcept { return _x; } + inline int getY() const noexcept { return _y; } + + inline int getXRel() const noexcept { return _xRel; } + inline int getYRel() const noexcept { return _yRel; } + + inline bool is_running() const noexcept { return !_end; } + inline void finish() noexcept { _end = true; } + + ~Input() = default; + + private: + std::array _keys; + std::array _mouse; + SDL_Event _event; + + int _x = 0; + int _y = 0; + int _xRel = 0; + int _yRel = 0; + + bool _end = false; + }; +} diff --git a/src/platform/window.cpp b/src/platform/window.cpp new file mode 100644 index 0000000..e7bed3e --- /dev/null +++ b/src/platform/window.cpp @@ -0,0 +1,30 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* window.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/10/04 17:36:44 by maldavid #+# #+# */ +/* Updated: 2022/10/04 22:09:27 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "window.h" +#include + +namespace mlx +{ + Window::Window(std::size_t w, std::size_t h, std::string title) + { + _win = SDL_CreateWindow(title.c_str(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, w, h, /*SDL_WINDOW_VULKAN |*/ SDL_WINDOW_SHOWN); + if(!_win) + core::error::report(e_kind::fatal_error, std::string("Unable to open a new window, ") + SDL_GetError()); + } + + Window::~Window() + { + if(_win) + SDL_DestroyWindow(_win); + } +} diff --git a/src/platform/window.h b/src/platform/window.h new file mode 100644 index 0000000..2eb1ce3 --- /dev/null +++ b/src/platform/window.h @@ -0,0 +1,33 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* window.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/10/04 21:53:12 by maldavid #+# #+# */ +/* Updated: 2022/10/04 21:59:54 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef __MLX_WINDOW__ +#define __MLX_WINDOW__ + +#include +#include + +namespace mlx +{ + class Window + { + public: + Window(std::size_t w, std::size_t h, std::string title); + + ~Window(); + + private: + SDL_Window* _win = nullptr; + }; +} + +#endif diff --git a/test/main.c b/test/main.c new file mode 100644 index 0000000..d9fe52a --- /dev/null +++ b/test/main.c @@ -0,0 +1,21 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* main.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/10/04 17:55:21 by maldavid #+# #+# */ +/* Updated: 2022/10/05 16:58:46 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "../includes/mlx.h" + +int main(void) +{ + mlx_init(); + mlx_new_window(400, 400, "My window"); + mlx_loop(); + return (0); +}