Skip to content
Browse files

Merge pull request #1 from nykac/master

New changes
  • Loading branch information...
2 parents ca67e0f + 2d2e157 commit b6ab809cbf68339baebfd2c9f3ad80e762addb5d Lucas Dohring committed Dec 26, 2012
Showing with 685 additions and 207 deletions.
  1. +3 −3 CMakeLists.txt
  2. +201 −0 LICENSE
  3. +41 −1 README.md
  4. +75 −3 context.cpp
  5. +28 −3 context.h
  6. +43 −0 entity.cpp
  7. +53 −1 entity.h
  8. +38 −0 event.cpp
  9. +42 −0 event.h
  10. +43 −33 events.cpp
  11. +20 −2 events.h
  12. +29 −71 main.cpp
  13. +22 −87 render.cpp
  14. +20 −3 render.h
  15. +27 −0 tvorba.h
View
6 CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
project (tvorba-gfx)
+set(CMAKE_CXX_FLAGS "-std=c++11")
SET(tvorba_VERSION_MAJOR 0)
SET(tvorba_VERSION_MINOR 1)
@@ -34,7 +35,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDEBUG")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG")
endif()
-find_package(OpenMP REQUIRED)
+find_package(OpenMP QUIET)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
@@ -45,11 +46,10 @@ include_directories(${OPENGL_INCLUDE_DIR})
find_package(GLEW REQUIRED)
include_directories(${GLEW_INCLUDE_DIR})
-
find_package(SDL2 REQUIRED)
include_directories(${SDL_INCLUDE_DIR})
-add_executable(gfx main.cpp events.cpp render.cpp context.cpp entity.cpp)
+add_executable(gfx main.cpp events.cpp render.cpp context.cpp entity.cpp event.cpp)
configure_file("${PROJECT_SOURCE_DIR}/config.h.in" "${PROJECT_BINARY_DIR}/config.h")
include_directories(${CMAKE_SOURCE_DIR})
View
201 LICENSE
@@ -0,0 +1,201 @@
+ The Artistic License 2.0
+
+ Copyright (c) 2000-2006, The Perl Foundation.
+
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+This license establishes the terms under which a given free software
+Package may be copied, modified, distributed, and/or redistributed.
+The intent is that the Copyright Holder maintains some artistic
+control over the development of that Package while still keeping the
+Package available as open source and free software.
+
+You are always permitted to make arrangements wholly outside of this
+license directly with the Copyright Holder of a given Package. If the
+terms of this license do not permit the full use that you propose to
+make of the Package, you should contact the Copyright Holder and seek
+a different licensing arrangement.
+
+Definitions
+
+ "Copyright Holder" means the individual(s) or organization(s)
+ named in the copyright notice for the entire Package.
+
+ "Contributor" means any party that has contributed code or other
+ material to the Package, in accordance with the Copyright Holder's
+ procedures.
+
+ "You" and "your" means any person who would like to copy,
+ distribute, or modify the Package.
+
+ "Package" means the collection of files distributed by the
+ Copyright Holder, and derivatives of that collection and/or of
+ those files. A given Package may consist of either the Standard
+ Version, or a Modified Version.
+
+ "Distribute" means providing a copy of the Package or making it
+ accessible to anyone else, or in the case of a company or
+ organization, to others outside of your company or organization.
+
+ "Distributor Fee" means any fee that you charge for Distributing
+ this Package or providing support for this Package to another
+ party. It does not mean licensing fees.
+
+ "Standard Version" refers to the Package if it has not been
+ modified, or has been modified only in ways explicitly requested
+ by the Copyright Holder.
+
+ "Modified Version" means the Package, if it has been changed, and
+ such changes were not explicitly requested by the Copyright
+ Holder.
+
+ "Original License" means this Artistic License as Distributed with
+ the Standard Version of the Package, in its current version or as
+ it may be modified by The Perl Foundation in the future.
+
+ "Source" form means the source code, documentation source, and
+ configuration files for the Package.
+
+ "Compiled" form means the compiled bytecode, object code, binary,
+ or any other form resulting from mechanical transformation or
+ translation of the Source form.
+
+
+Permission for Use and Modification Without Distribution
+
+(1) You are permitted to use the Standard Version and create and use
+Modified Versions for any purpose without restriction, provided that
+you do not Distribute the Modified Version.
+
+
+Permissions for Redistribution of the Standard Version
+
+(2) You may Distribute verbatim copies of the Source form of the
+Standard Version of this Package in any medium without restriction,
+either gratis or for a Distributor Fee, provided that you duplicate
+all of the original copyright notices and associated disclaimers. At
+your discretion, such verbatim copies may or may not include a
+Compiled form of the Package.
+
+(3) You may apply any bug fixes, portability changes, and other
+modifications made available from the Copyright Holder. The resulting
+Package will still be considered the Standard Version, and as such
+will be subject to the Original License.
+
+
+Distribution of Modified Versions of the Package as Source
+
+(4) You may Distribute your Modified Version as Source (either gratis
+or for a Distributor Fee, and with or without a Compiled form of the
+Modified Version) provided that you clearly document how it differs
+from the Standard Version, including, but not limited to, documenting
+any non-standard features, executables, or modules, and provided that
+you do at least ONE of the following:
+
+ (a) make the Modified Version available to the Copyright Holder
+ of the Standard Version, under the Original License, so that the
+ Copyright Holder may include your modifications in the Standard
+ Version.
+
+ (b) ensure that installation of your Modified Version does not
+ prevent the user installing or running the Standard Version. In
+ addition, the Modified Version must bear a name that is different
+ from the name of the Standard Version.
+
+ (c) allow anyone who receives a copy of the Modified Version to
+ make the Source form of the Modified Version available to others
+ under
+
+ (i) the Original License or
+
+ (ii) a license that permits the licensee to freely copy,
+ modify and redistribute the Modified Version using the same
+ licensing terms that apply to the copy that the licensee
+ received, and requires that the Source form of the Modified
+ Version, and of any works derived from it, be made freely
+ available in that license fees are prohibited but Distributor
+ Fees are allowed.
+
+
+Distribution of Compiled Forms of the Standard Version
+or Modified Versions without the Source
+
+(5) You may Distribute Compiled forms of the Standard Version without
+the Source, provided that you include complete instructions on how to
+get the Source of the Standard Version. Such instructions must be
+valid at the time of your distribution. If these instructions, at any
+time while you are carrying out such distribution, become invalid, you
+must provide new instructions on demand or cease further distribution.
+If you provide valid instructions or cease distribution within thirty
+days after you become aware that the instructions are invalid, then
+you do not forfeit any of your rights under this license.
+
+(6) You may Distribute a Modified Version in Compiled form without
+the Source, provided that you comply with Section 4 with respect to
+the Source of the Modified Version.
+
+
+Aggregating or Linking the Package
+
+(7) You may aggregate the Package (either the Standard Version or
+Modified Version) with other packages and Distribute the resulting
+aggregation provided that you do not charge a licensing fee for the
+Package. Distributor Fees are permitted, and licensing fees for other
+components in the aggregation are permitted. The terms of this license
+apply to the use and Distribution of the Standard or Modified Versions
+as included in the aggregation.
+
+(8) You are permitted to link Modified and Standard Versions with
+other works, to embed the Package in a larger work of your own, or to
+build stand-alone binary or bytecode versions of applications that
+include the Package, and Distribute the result without restriction,
+provided the result does not expose a direct interface to the Package.
+
+
+Items That are Not Considered Part of a Modified Version
+
+(9) Works (including, but not limited to, modules and scripts) that
+merely extend or make use of the Package, do not, by themselves, cause
+the Package to be a Modified Version. In addition, such works are not
+considered parts of the Package itself, and are not subject to the
+terms of this license.
+
+
+General Provisions
+
+(10) Any use, modification, and distribution of the Standard or
+Modified Versions is governed by this Artistic License. By using,
+modifying or distributing the Package, you accept this license. Do not
+use, modify, or distribute the Package, if you do not accept this
+license.
+
+(11) If your Modified Version has been derived from a Modified
+Version made by someone other than you, you are nevertheless required
+to ensure that your Modified Version complies with the requirements of
+this license.
+
+(12) This license does not grant you the right to use any trademark,
+service mark, tradename, or logo of the Copyright Holder.
+
+(13) This license includes the non-exclusive, worldwide,
+free-of-charge patent license to make, have made, use, offer to sell,
+sell, import and otherwise transfer the Package with respect to any
+patent claims licensable by the Copyright Holder that are necessarily
+infringed by the Package. If you institute patent litigation
+(including a cross-claim or counterclaim) against any party alleging
+that the Package constitutes direct or contributory patent
+infringement, then this Artistic License to you shall terminate on the
+date that such litigation is filed.
+
+(14) Disclaimer of Warranty:
+THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
+IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
+NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL
+LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
42 README.md
@@ -1 +1,41 @@
-This is where the rendering engine development will go for Tvorba
+The Tvorba Engine
+=================
+The Tvorba Engine is a game engine with a p2p networking model.
+
+Dependencies
+============
+ - SDL2
+ - GLEW
+ - GLM
+ - A C++11 compliant compiler (gcc-4.7 or later)
+ - OpenGL
+
+Building
+========
+Tvorba uses cmake as its build system.
+
+On Linux
+--------
+```bash
+mkdir Release #or Debug
+cmake .. -DCMAKE_BUILD_TYPE=Release # or Debug
+make
+```
+
+Authors
+======
+Lucas Dohring <lucas@xn--80atc0ah.com>
+
+Copyright and License
+=====================
+Copyright (C) 2012, Lucas Dohring.
+
+This code is free software; you can redistribute it and/or
+modify it under the terms of the Artistic License 2.0 as
+published by the Perl Foundation. For details, see the
+full text of the license in the file LICENSE.
+
+This program is distributed in the hope that it will be
+useful, but it is provided “as is” and without any express
+or implied warranties. For details, see the Artistic License 2.0
+for more details.
View
78 context.cpp
@@ -1,3 +1,20 @@
+/* context.h
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the Artistic License 2.0 as
+ * published by the Perl Foundation. For details, see the
+ * full text of the license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
+
#include "context.h"
namespace tvorba {
@@ -11,8 +28,63 @@ namespace tvorba {
Context::~Context()
{
this->is_quiting=true;
- // SDL_WaitThread(this->logic_thread, NULL); We have not enabled logic yet
- SDL_WaitThread(this->render_thread, NULL);
- SDL_WaitThread(this->event_thread, NULL);
+ std::thread *current_thread, **local_copy;
+ for(local_copy=threads;(local_copy-threads) > num_threads; local_copy++)
+ {
+ current_thread=*local_copy;
+ if(current_thread)
+ {
+ current_thread->join();
+ delete current_thread;
+ }
+ }
+ free((void*)threads);
+ }
+
+ void Context::init_graphics(char *title)
+ {
+ SDL_Init(SDL_INIT_VIDEO);
+
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
+
+ window = SDL_CreateWindow(title,
+ SDL_WINDOWPOS_UNDEFINED,
+ SDL_WINDOWPOS_UNDEFINED,
+ 1440, 900,
+ SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL
+ /*#ifndef DEBUG
+ | SDL_WINDOW_FULLSCREEN
+ #endif*/
+ );
+
+ if(window == nullptr)
+ {
+ fprintf(stderr, "ERROR: Could not create window: %s\n", SDL_GetError());
+ is_quiting = true;
+ return_value = EXIT_FAILURE;
+ }
+
+ gl_context = SDL_GL_CreateContext(window);
+ if(gl_context == nullptr)
+ {
+ fprintf(stderr, "ERROR: Could not create OpenGL context: %s\n", SDL_GetError());
+ is_quiting = true;
+ return_value = EXIT_FAILURE;
+ }
+
+ if (glewInit() != GLEW_OK)
+ {
+ fprintf(stderr, "ERROR: Failed to initialize GLEW\n");
+ is_quiting = true;
+ return_value = EXIT_FAILURE;
+ }
+
+ SDL_ShowCursor(SDL_DISABLE);
+ if(SDL_ShowCursor(SDL_QUERY) != SDL_DISABLE)
+ {
+ fputs("WARN: Unable to hide cursor.", stderr);
+ }
}
}
View
31 context.h
@@ -1,29 +1,54 @@
+/* context.h
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the Artistic License 2.0 as
+ * published by the Perl Foundation. For details, see the
+ * full text of the license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
+
+#include <GL/glew.h>
#include <glm/glm.hpp>
+#include <thread>
+#include <chrono>
+
#include <entity.h>
#ifndef RENDERCONTEXT_H
#define RENDERCONTEXT_H
namespace tvorba {
using namespace glm;
+ using namespace std;
class Context
{
public:
Context();
- ~Context();
+ void init_graphics(char *title);
- SDL_Thread *event_thread, *logic_thread, *render_thread;
+ unsigned num_threads;
+ thread **threads;
SDL_Window *window;
SDL_GLContext gl_context;
mat4 view, projection;
- Entity *entities;
+ Entity entities;
bool is_quiting;
int return_value;
+
+ ~Context();
};
}
View
43 entity.cpp
@@ -1,10 +1,31 @@
+/* entity.cpp
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the Artistic License 2.0 as published by the
+ * Perl Foundation. For details, see the full text of the
+ * license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
+
#include "entity.h"
+#include <context.h>
+#include <event.h>
namespace tvorba
{
Entity::Entity()
{
+ this->_event = default_event_handler;
+ this->_render = default_null_renderer;
}
bool Entity::pop()
@@ -24,4 +45,26 @@ namespace tvorba
return true;
}
+ void Entity::all(std::function<void (Entity*)> function)
+ {
+ function(this);
+ if(next != nullptr)
+ next->all(function);
+ }
+
+ void Entity::all(Entity *entity, std::function<void (Entity*)> function)
+ {
+ entity->all(function);
+ }
+
+ void Entity::on_event(std::function<void (Entity *, Event *)> function)
+ {
+ _event = std::bind(function, this, std::placeholders::_1);
+ }
+
+ void Entity::on_render(std::function<void (Entity *, Context *)> function)
+ {
+ _render = std::bind(function, this, std::placeholders::_1);
+ }
+
}
View
54 entity.h
@@ -1,19 +1,71 @@
+/* entity.h
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the Artistic License 2.0 as
+ * published by the Perl Foundation. For details, see the
+ * full text of the license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
+
+#include <functional>
+#include <queue>
+
#include <SDL2/SDL.h>
#ifndef ENTITY_H
#define ENTITY_H
namespace tvorba
{
+ class Context;
+ class Event;
class Entity
{
public:
Entity();
- Entity *previous, *next;
+ Entity *previous, *parent, *children, *next;
bool pop(void);
bool push(Entity *entity);
+ void all(std::function<void(Entity *)> function);
+ static void all(Entity *entity, std::function<void(Entity *)> function);
+
+ bool is_render_visible;
+
+ inline void event(Event *e)
+ {
+ _event(e);
+ };
+
+ inline void render(Context *context)
+ {
+ _render(context);
+ };
+
+ void on_event(std::function<void(Entity*, Event*)> function);
+ void on_render(std::function<void(Entity*, Context*)> function);
+
+ void *user_data;
+
+ std::queue<Event*> events;
+
+ private:
+ std::function<void(Event*)> _event;
+ static std::function<void(Event*)> default_event_handler = [this](Event *e){};
+
+ std::function<void(Context*)> _render;
+ static std::function<void(Context*)> default_null_renderer = [this](Context *c){};
+
+
};
}
View
38 event.cpp
@@ -0,0 +1,38 @@
+/* event.cpp
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the Artistic License 2.0 as
+ * published by the Perl Foundation. For details, see the
+ * full text of the license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
+
+#include "event.h"
+
+namespace tvorba {
+
+ Event::Event()
+ {
+ }
+
+ Event::Event(SDL_Event *event)
+ {
+ if(event == nullptr)
+ return;
+ e = event;
+ }
+
+ Event_Type Event::Type()
+ {
+ return type;
+ }
+
+}
View
42 event.h
@@ -0,0 +1,42 @@
+/* event.h
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the Artistic License 2.0 as
+ * published by the Perl Foundation. For details, see the
+ * full text of the license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
+
+#include <SDL2/SDL.h>
+
+#ifndef EVENT_H
+#define EVENT_H
+
+namespace tvorba {
+ typedef enum {
+ SDL_EVENT=0,
+ NETWORK_EVENT,
+ APP_EVENT
+ } Event_Type;
+ class Event
+ {
+ public:
+ Event();
+ Event(SDL_Event *event);
+ Event_Type Type(void);
+
+ private:
+ void *e;
+ Event_Type type;
+ };
+}
+
+#endif // EVENT_H
View
76 events.cpp
@@ -1,42 +1,52 @@
-#include <events.h>
+/* events.cpp
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the Artistic License 2.0 as
+ * published by the Perl Foundation. For details, see the
+ * full text of the license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
-int event_loop(void *context)
-{
- Context *main_context = (Context*) context;
- SDL_Event *event = new SDL_Event;
+#include "events.h"
+#include "entity.h"
+#include "event.h"
- while(!main_context->is_quiting)
- {
- if(SDL_WaitEvent(event) == 0)
- {
- fprintf(stderr, "ERROR waiting for events: %s", SDL_GetError());
- //return EXIT_FAILURE;
- }
+namespace tvorba {
+ int event_loop(void *context)
+ {
+ Context *main_context = (Context*) context;
+ SDL_Event *event = new SDL_Event;
-/*#ifdef DEBUG
+ while(!main_context->is_quiting)
+ {
+ if(SDL_WaitEvent(event) == 0)
+ {
+ fprintf(stderr, "ERROR waiting for events: %s", SDL_GetError());
+ //return EXIT_FAILURE;
+ }
+
+ /*#ifdef DEBUG
fprintf(stderr, "DEBUG: EventType %i\n", event->type);
#endif*/
- switch(event->type)
- {
- case SDL_QUIT:
-#ifdef DEBUG
- fputs("DEBUG: Qutting\n", stderr);
-#endif
- main_context->is_quiting = true;
- main_context->return_value = EXIT_SUCCESS;
- break;
+ if(event->type == SDL_QUIT)
+ {
+ main_context->return_value = EXIT_SUCCESS;
+ main_context->is_quiting = true;
+ }
+ main_context->entities.all(
+ [&event] (Entity *self){ self->event( new Event(event) ); });
- case SDL_KEYDOWN:
- case SDL_KEYUP:
- SDL_KeyboardEvent key = event->key;
-#ifdef DEBUG
- fprintf(stderr, "DEBUG: Key%s %c\n", (event->type == SDL_KEYDOWN) ? "Down" : "Up", key.keysym.sym);
-#endif
- break;
- }
- }
+ }
- return EXIT_SUCCESS;
+ return EXIT_SUCCESS;
+ }
}
-
View
22 events.h
@@ -1,11 +1,29 @@
+/* events.h
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the Artistic License 2.0 as
+ * published by the Perl Foundation. For details, see the
+ * full text of the license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
+
#include <SDL2/SDL.h>
#include <context.h>
#ifndef EVENTS_H
#define EVENTS_H
-using namespace tvorba;
-int event_loop(void *context);
+namespace tvorba {
+ int event_loop(void *context);
+};
#endif // EVENTS_H
View
100 main.cpp
@@ -1,99 +1,57 @@
+/* main.cpp
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the Artistic License 2.0 as
+ * published by the Perl Foundation. For details, see the
+ * full text of the license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <thread>
+
#include <SDL2/SDL.h>
#include <config.h>
#include <context.h>
#include <events.h>
#include <render.h>
-#define WIDTH 640
-#define HEIGHT 480
-
using namespace tvorba;
-inline void quit(int ret, Context *main_context);
-
-inline void checkError(int line = -1)
-{
- const char *err = SDL_GetError();
- if(strlen(err))
- {
- fprintf(stderr, "%s on line %i\n", err, line);
- }
-}
-
int main(int argc, char **argv)
{
- SDL_Init(SDL_INIT_VIDEO);
-
fprintf(stderr, "Tvorba-" VERSION " on %s\n", SDL_GetPlatform());
Context *main_context = new Context();
+ main_context->init_graphics("Tvorba-" VERSION);
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
+ SDL_GL_MakeCurrent(main_context->window, nullptr); // Free OpenGL acces from this thread
- main_context->window = SDL_CreateWindow("Tvorba-" VERSION,
- SDL_WINDOWPOS_UNDEFINED,
- SDL_WINDOWPOS_UNDEFINED,
- WIDTH, HEIGHT,
- SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL
- #ifndef DEBUG
- | SDL_WINDOW_FULLSCREEN
- #endif
- );
+ main_context->num_threads = std::thread::hardware_concurrency();
+ main_context->num_threads = (main_context->num_threads >= 4) ? main_context->num_threads : 4;
- if(main_context->window == NULL)
- {
- fprintf(stderr, "ERROR: Could not create window: %s\n", SDL_GetError());
- quit(EXIT_FAILURE, main_context);
- }
-
- main_context->gl_context = SDL_GL_CreateContext(main_context->window);
- if(main_context->gl_context == NULL)
- {
- fprintf(stderr, "ERROR: Could not create OpenGL context: %s\n", SDL_GetError());
- quit(EXIT_FAILURE, main_context);
- }
-
- if (glewInit() != GLEW_OK)
- {
- fprintf(stderr, "ERROR: Failed to initialize GLEW\n");
- quit(EXIT_FAILURE, main_context);
- }
-
- checkError(__LINE__);
-
- SDL_ShowCursor(SDL_DISABLE);
- if(SDL_ShowCursor(SDL_QUERY) != SDL_DISABLE)
- {
- fputs("WARN: Unable to hide cursor.", stderr);
- }
-
- SDL_GL_MakeCurrent(main_context->window, NULL); // Free OpenGL acces from this thread
-
- main_context->render_thread = SDL_CreateThread(render_loop, "Graphics", main_context);
- main_context->event_thread = SDL_CreateThread(event_loop, "Events", main_context);
- //main_context->logic_thread = SDL_CreateThread(logic_loop, main_context);
+ main_context->threads = (std::thread**) malloc(main_context->num_threads * sizeof(void*));
+ main_context->threads[0] = new std::thread(render_loop, main_context);
+ main_context->threads[1] = new std::thread(event_loop, main_context);
while(!main_context->is_quiting)
{
- // nothing
+ std::this_thread::yield();
}
- delete main_context;
- return main_context->return_value;
-
-}
-
-void quit(int ret, Context *main_context)
-{
- main_context->is_quiting = true;
- main_context->return_value = ret;
delete main_context;
- exit(main_context->return_value);
+ return main_context->return_value;
+
}
View
109 render.cpp
@@ -1,103 +1,38 @@
+/* render.cpp
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the Artistic License 2.0 as
+ * published by the Perl Foundation. For details, see the
+ * full text of the license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
+
#include <render.h>
using namespace tvorba;
-int render_loop(void *context)
+int tvorba::render_loop(Context *main_context)
{
- Context *main_context = (Context*) context;
SDL_GL_MakeCurrent(main_context->window, main_context->gl_context);
-
- GLuint *VertexArrayID=new GLuint();
- glGenVertexArrays(1, VertexArrayID);
- glBindVertexArray(*VertexArrayID);
-
- static const GLfloat g_vertex_buffer_data[] = {
- -1.0f,-1.0f,-1.0f,
- -1.0f,-1.0f, 1.0f,
- -1.0f, 1.0f, 1.0f,
-
- 1.0f, 1.0f,-1.0f,
- -1.0f,-1.0f,-1.0f,
- -1.0f, 1.0f,-1.0f,
-
- 1.0f,-1.0f, 1.0f,
- -1.0f,-1.0f,-1.0f,
- 1.0f,-1.0f,-1.0f,
-
- 1.0f, 1.0f,-1.0f,
- 1.0f,-1.0f,-1.0f,
- -1.0f,-1.0f,-1.0f,
-
- -1.0f,-1.0f,-1.0f,
- -1.0f, 1.0f, 1.0f,
- -1.0f, 1.0f,-1.0f,
-
- 1.0f,-1.0f, 1.0f,
- -1.0f,-1.0f, 1.0f,
- -1.0f,-1.0f,-1.0f,
-
- -1.0f, 1.0f, 1.0f,
- -1.0f,-1.0f, 1.0f,
- 1.0f,-1.0f, 1.0f,
-
- 1.0f, 1.0f, 1.0f,
- 1.0f,-1.0f,-1.0f,
- 1.0f, 1.0f,-1.0f,
-
- 1.0f,-1.0f,-1.0f,
- 1.0f, 1.0f, 1.0f,
- 1.0f,-1.0f, 1.0f,
-
- 1.0f, 1.0f, 1.0f,
- 1.0f, 1.0f,-1.0f,
- -1.0f, 1.0f,-1.0f,
-
- 1.0f, 1.0f, 1.0f,
- -1.0f, 1.0f,-1.0f,
- -1.0f, 1.0f, 1.0f,
-
- 1.0f, 1.0f, 1.0f,
- -1.0f, 1.0f, 1.0f,
- 1.0f,-1.0f, 1.0f
- };
-
-
- // This will identify our vertex buffer
- GLuint vertexbuffer;
-
- // Generate 1 buffer, put the resulting identifier in vertexbuffer
- glGenBuffers(1, &vertexbuffer);
-
- // The following commands will talk about our 'vertexbuffer' buffer
- glBindBuffer(GL_ARRAY_BUFFER, vertexbuffer);
-
- // Give our vertices to OpenGL.
- glBufferData(GL_ARRAY_BUFFER, sizeof(g_vertex_buffer_data), g_vertex_buffer_data, GL_STATIC_DRAW);
-
-
-
//SDL_GL_SwapWindow(pWindow);
while(!main_context->is_quiting)
{
glClearColor(0.0, 0.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- // 1rst attribute buffer : vertices
- glEnableVertexAttribArray(0);
- glBindBuffer(GL_ARRAY_BUFFER, vertexbuffer);
- glVertexAttribPointer(
- 0, // attribute 0. No particular reason for 0, but must match the layout in the shader.
- 3, // size
- GL_FLOAT, // type
- GL_FALSE, // normalized?
- 0, // stride
- (void*)0 // array buffer offset
- );
-
- // Draw the triangle !
- glDrawArrays(GL_TRIANGLES, 0, 12*3); // Starting from vertex 0; 3 vertices total -> 1 triangle
- glDisableVertexAttribArray(0);
+ for(Entity *current = &(main_context->entities); current; current = current->next)
+ {
+ current->render(main_context);
+ }
fputs(SDL_GetError(), stderr);
View
23 render.h
@@ -1,4 +1,19 @@
-#define DEBUG
+/* render.h
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the Artistic License 2.0 as
+ * published by the Perl Foundation. For details, see the
+ * full text of the license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
#include <GL/glew.h>
#include <GL/gl.h>
@@ -15,7 +30,9 @@
#ifndef RENDER_H
#define RENDER_H
-using namespace glm;
-int render_loop(void *context);
+namespace tvorba {
+ using namespace glm;
+ int render_loop(Context *main_context);
+}
#endif // RENDER_H
View
27 tvorba.h
@@ -0,0 +1,27 @@
+/* tvorba.h
+ * Copyright (C) 2012, Lucas Dohring.
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the Artistic License 2.0 as
+ * published by the Perl Foundation. For details, see the
+ * full text of the license in the file LICENSE.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but it is provided “as is” and without any express
+ * or implied warranties. For details, see the Artistic License 2.0
+ * for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along with this code. If not, see <http://www.perlfoundation.org/artistic_license_2_0>
+ */
+
+#ifndef TVORBA_H
+#define TVORBA_H
+
+#include <context.h>
+#include <entity.h>
+#include <event.h>
+#include <events.h>
+#include <render.h>
+
+#endif // TVORBA_H

0 comments on commit b6ab809

Please sign in to comment.
Something went wrong with that request. Please try again.