Permalink
Browse files

Placed code under the Artistic License 2.0; Switched from SDL2 thread…

…s to native C++11 threads
  • Loading branch information...
1 parent ca67e0f commit f9e76b0f7cdbcd03dc841b1484643e6b6336d0fa Lucas Dohring committed Dec 19, 2012
Showing with 437 additions and 104 deletions.
  1. +2 −2 CMakeLists.txt
  2. +201 −0 LICENSE
  3. +41 −1 README.md
  4. +28 −3 context.cpp
  5. +22 −1 context.h
  6. +22 −0 entity.cpp
  7. +18 −0 entity.h
  8. +17 −0 events.cpp
  9. +17 −0 events.h
  10. +27 −7 main.cpp
  11. +22 −87 render.cpp
  12. +20 −3 render.h
View
@@ -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 "-Wall -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,7 +46,6 @@ include_directories(${OPENGL_INCLUDE_DIR})
find_package(GLEW REQUIRED)
include_directories(${GLEW_INCLUDE_DIR})
-
find_package(SDL2 REQUIRED)
include_directories(${SDL_INCLUDE_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
@@ -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
@@ -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,16 @@ 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);
}
}
View
@@ -1,20 +1,41 @@
+/* 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 <glm/glm.hpp>
+#include <thread>
+
#include <entity.h>
#ifndef RENDERCONTEXT_H
#define RENDERCONTEXT_H
namespace tvorba {
using namespace glm;
+ using namespace std;
class Context
{
public:
Context();
~Context();
- SDL_Thread *event_thread, *logic_thread, *render_thread;
+ unsigned num_threads;
+ thread **threads;
SDL_Window *window;
SDL_GLContext gl_context;
View
@@ -1,3 +1,20 @@
+/* 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"
namespace tvorba
@@ -24,4 +41,9 @@ namespace tvorba
return true;
}
+ void Entity::render(void)
+ {
+
+ }
+
}
Oops, something went wrong.

0 comments on commit f9e76b0

Please sign in to comment.