double crystal

# Conflicts:
#	worlds/worlds.json

.idea/.gitignore

@@ -0,0 +1,6 @@
+/workspace.xml
+/vcs.xml
+/modules.xml
+/misc.xml
+/encodings.xml
+/CrystalPoint.iml

Button.cpp

@@ -0,0 +1,76 @@
+#include "Button.h"
+#include <string>
+#include "Util.h"
+#include "Vector.h"
+#include "Cursor.h"
+
+Button::Button(const std::string & text, Vec2f position, float width, float height) : Text(text,position)
+{
+	this->width = width;
+	this->height = height;
+	this->planePosition = position;
+
+	cursorOnButton = false;
+	alfa = 0.5f;
+	background = Vec3f(10, 10, 10);
+	//foreground = Vec3f(255, 255, 255);
+	this->setColor(Vec3f(255, 255, 255));
+
+	this->position.x += width / 2 - textWidth / 2;
+	this->position.y += height / 2 - textHeight / 2;
+}
+
+Button::~Button()
+{
+	/*if (action != nullptr)
+		delete action;*/
+}
+
+void Button::draw(void)
+{
+	
+	glColor4f(background.x/255.0f, background.y / 255.0f, background.z / 255.0f, alfa);
+
+	glBegin(GL_QUADS);
+	glVertex2f(planePosition.x, planePosition.y);
+	glVertex2f(planePosition.x, planePosition.y + height);
+	glVertex2f(planePosition.x + width, planePosition.y + height);
+	glVertex2f(planePosition.x + width, planePosition.y);
+	glEnd();	
+
+	/*glColor4f(foreground.x / 255.0f, foreground.y / 255.0f, foreground.z / 255.0f, 1.0f);
+	Util::glutBitmapString(text, position.x, position.y+height/2+14/2);*/
+	Text::draw();
+}
+
+void Button::update(int x, int y)
+{	
+	cursorOnButton =
+		(x > planePosition.x && x < planePosition.x + width) &&
+		y > planePosition.y && y < planePosition.y + height;
+
+
+	if (cursorOnButton)
+		alfa = 1.0f;
+	else
+		alfa = 0.5f;
+
+	if (cursorOnButton && Cursor::getInstance()->clicked)
+		if(action != nullptr)
+			action(this);
+}
+
+void Button::addAction(action_function action)
+{
+	this->action = action;
+}
+
+void Button::setForeground(Vec3f color)
+{
+	this->setColor(color);
+}
+
+void Button::setBackground(Vec3f color)
+{
+	background = color;
+}

Button.h

@@ -0,0 +1,30 @@
+#pragma once
+#include "Text.h"
+
+
+
+class Button : public Text
+{
+private:	
+	typedef void(*action_function)(Button* b);
+	float width, height;	
+	Vec3f background;
+	Vec2f planePosition;
+	bool cursorOnButton;
+	float alfa;
+	action_function action = nullptr;
+public:
+	Button(const std::string &text, Vec2f position, float width, float height);
+	~Button();
+
+
+
+	void draw();
+	void update(int x, int y);
+
+	void addAction(action_function action);
+
+	void setForeground(Vec3f color);
+	void setBackground(Vec3f color);
+};
+

CMakeLists.txt

@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.5)
+project(CrystalPoint)
+
+file(GLOB_RECURSE SOURCE_FILES
+        "*.h"
+        "*.cpp"
+        "*.cc"
+        )
+
+add_executable(CrystalPoint ${SOURCE_FILES})
+
+find_package(OpenGL REQUIRED)
+find_package(GLUT REQUIRED)
+find_package(OpenAL REQUIRED)
+include_directories( ${OPENGL_INCLUDE_DIRS}  ${GLUT_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIRS} )
+target_link_libraries(CrystalPoint ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${OPENAL_LIBRARY} )
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -lpthread")

Controller.cpp

@@ -1,12 +1,42 @@
+//
+// Created by janco on 5/24/16.
+//
+
 #include "Controller.h"
 
+Controller::Controller(int controllerId) {
+    this->controllerId = controllerId;
+    this->ypr = Vec3f();
+    this->joystick = Vec2f();
+    this->setConnected(false);
+    this->setConnected(true);
+}
 
+Controller::~Controller() { }
 
-Controller::Controller()
+void Controller::rumble(int duration, int power){
-{
+  //  controllerhandler->rumble(controllerId, duration, power);
+}
+
+void Controller::setConnected(bool connected) {
+    if(connected){
+        this->connected = true;
+    }else{
+        this->connected = false;
+        this->ypr = Vec3f(0,0,0);
+        this->joystick = Vec2f(0,0);
+        this->button = false;
+        this->magnetSwitch = false;
+        this ->joystickButton = false;
+    }
+}
+
+bool Controller::isConnected(void) {
+    return connected;
 }
 
 
-Controller::~Controller()
+
-{
+
-}
+
+

Controller.h

@@ -1,10 +1,20 @@
 #pragma once
-#include "Header.h"
 
-class Controller
+#include "Vector.h"
-{
+
+class Controller{
 public:
-	Controller();
+    Controller(int controllerId);
     ~Controller();
-};
+    Vec3f ypr;
+    Vec2f joystick;
+    bool button, joystickButton, magnetSwitch;
+    int controllerId;
 
+    void setConnected(bool connected);
+    bool isConnected(void);
+
+    void rumble(int duration, int power);
+private:
+    bool connected = false;
+};

ControllerHandler.cpp

@@ -0,0 +1,154 @@
+//
+// Created by janco on 5/23/16.
+//
+
+#include "ControllerHandler.h"
+#include <iostream>
+
+/*
+ * String split helper functions
+ */
+std::vector<std::string> &split(const std::string &s, char delim, std::vector<std::string> &elems) {
+    std::stringstream ss(s);
+    std::string item;
+    while (std::getline(ss, item, delim)) {
+        elems.push_back(item);
+    }
+    return elems;
+}
+std::vector<std::string> split(const std::string &s, char delim) {
+    std::vector<std::string> elems;
+    split(s, delim, elems);
+    return elems;
+}
+
+ControllerHandler::ControllerHandler(){
+    readthread = std::thread(&ControllerHandler::BasestationReader, this);
+};
+
+Controller* ControllerHandler::getLeftController(void){
+    for (int i = 0; i < 4; i++)
+    {
+        if(controllers[i] != nullptr && controllers[i]->isConnected()){
+            return controllers[i];
+        }
+    }
+    return nullptr;
+}
+
+Controller* ControllerHandler::getRightController(void){
+    bool c1found = false;
+    for (int i = 0; i < 4; i++)
+    {
+        if(controllers[i] != nullptr && controllers[i]->isConnected()){
+            if(c1found){
+                return controllers[i];
+            }
+            c1found = true;
+        }
+    }
+    return nullptr;
+}
+
+void ControllerHandler::SearchBasestation(void){
+    basestationFound = false;
+    std::vector<serial::PortInfo> devices_found = serial::list_ports();
+    std::vector<serial::PortInfo>::iterator iter = devices_found.begin();
+    while( iter != devices_found.end() )
+    {
+        serial::PortInfo device = *iter++;
+        if(device.hardware_id == "USB VID:PID=10c4:ea60 SNR=02133"){
+            basestationFound = true;
+            baseStation = new serial::Serial(device.port, BasestationBaudrate, serial::Timeout::simpleTimeout(1000));
+            break;
+        }
+    }
+}
+
+void ControllerHandler::rumble(int idController, int duration, int power){
+	if (basestationFound)
+	{
+		char sendbuffer[16];
+		sprintf(sendbuffer, "1|%01d|%06d|%03d\n", idController, duration, power);
+		baseStation->write(sendbuffer);
+	}
+}
+
+/*
+ * Reading from basestation
+ */
+
+void ControllerHandler::BasestationReader() {
+    while(1){
+        while(!basestationFound){
+            SearchBasestation();
+            if(basestationFound){
+                baseStation ->write("stop\n");
+                baseStation ->write("clientlist\n");
+            }
+            std::this_thread::sleep_for(std::chrono::milliseconds(2000));
+        }
+        while(baseStation->isOpen()){
+            std::string basestationMessage = baseStation->readline();
+            std::vector<std::string> basestationMessageSplit = split(basestationMessage, '|');
+            if(basestationMessageSplit.size() > 1){ //Valid message
+                std::cout << "DEBUG: Message received. Length: " << basestationMessageSplit.size() << " Type: " << basestationMessageSplit[0] << " Message: " << basestationMessage;
+                int messageId = std::stoi(basestationMessageSplit[0]);
+                switch(messageId){
+                    //commandList[messageId](basestationMessageSplit);
+                    case 0: commandDebug(basestationMessageSplit); break;  //Debug message
+                    case 1: commandControllerData(basestationMessageSplit); break;  //Data from controller
+                    case 2: commandControllerEvent(basestationMessageSplit); break;  //Controller events
+                    case 3: commandControllerList(basestationMessageSplit); break;  //Connected controller list
+                }
+            }
+        }
+    }
+}
+
+void ControllerHandler::commandDebug(std::vector<std::string> data) {
+    std::cout << "DEBUG: " << data[1];
+}
+
+void ControllerHandler::commandControllerData(std::vector<std::string> data) {
+    if(data.size() == 10){
+        Controller* c = controllers[std::stoi(data[1])];
+        if(c != nullptr && c->isConnected()){
+            c->ypr.x = std::stoi(data[5])/100.0f;
+            c->ypr.y = std::stoi(data[6])/100.0f;
+            c->ypr.z = std::stoi(data[7])/100.0f;
+
+            c->joystick.x = std::stoi(data[2])/2000.0f;
+            c->joystick.y = std::stoi(data[3])/2000.0f;
+            c->joystickButton = !(data[4] == "0");
+
+            c->magnetSwitch = !(data[9] == "0");
+        }
+    }
+}
+
+void ControllerHandler::commandControllerEvent(std::vector<std::string> data) {
+    if(data.size() == 3){
+        if(data[1] == "connected"){
+            int controllerId = std::stoi(data[2]);
+            controllers[controllerId] = new Controller(controllerId);
+            controllers[controllerId]->setConnected(true);
+        }else if(data[1] == "disconnected"){
+         //   controllers.erase(*controllers[std::stoi(data[2])]);
+        }
+    }
+}
+
+void ControllerHandler::commandControllerList(std::vector<std::string> data) {
+   for(unsigned int i = 1; i < data.size() - 1; i++){
+       int controllerId = std::stoi(data[i]);
+       controllers[controllerId] = new Controller(controllerId);
+       rumble(controllerId, 100, 100);
+   }
+   if(basestationFound)
+	 baseStation->write("start\n");
+}
+
+
+
+

ControllerHandler.h

@@ -0,0 +1,41 @@
+#pragma once
+//
+// Created by janco on 5/23/16.
+//
+
+#define BasestationBaudrate 115200
+#include <thread>
+
+#ifdef WIN32
+#include "include/serial.h"
+#else
+#include "lib/serial/include/serial.h"
+#endif
+
+
+#include "Controller.h"
+
+class ControllerHandler{
+public:
+    ControllerHandler();
+    Controller* getLeftController(void);
+    Controller* getRightController(void);
+    void rumble(int idController, int duration, int power);
+private:
+    void SearchBasestation(void);
+    void BasestationReader(void);
+
+    bool basestationFound;
+    serial::Serial *baseStation;
+    std::thread readthread;
+    Controller* controllers[4];
+
+    //Command functions
+    void commandDebug(std::vector<std::string> data);
+    void commandControllerData(std::vector<std::string> data);
+    void commandControllerEvent(std::vector<std::string> data);
+    void commandControllerList(std::vector<std::string> data);
+
+    //void(*commandList [1])(std::vector<std::string> data);
+};
+

Crystal.cpp

@@ -0,0 +1,57 @@
+#include "Crystal.h"
+#include "Model.h"
+#include "Player.h"
+
+
+Crystal::Crystal(const std::string & filled, const std::string & empty, const Vec3f & position, Vec3f & rotation, const float & scale)
+{
+	this->filled = Model::load(filled);
+	this->empty = Model::load(empty);
+	model = this->filled;	
+
+	this->position = position;
+	this->rotation = rotation;
+	this->scale = scale;
+	this->canCollide = true;
+	isFilled = true;
+
+	sound_id = CrystalPoint::GetSoundSystem().LoadSound("WAVE/Crystal.wav", false);
+	music = CrystalPoint::GetSoundSystem().GetSound(sound_id);
+	music->SetPos(position, Vec3f());
+
+	crystalRot = 0;
+}
+
+Crystal::~Crystal()
+{
+	CrystalPoint::GetSoundSystem().UnloadSound(sound_id);
+	if (model)
+		Model::unload(model);
+
+	//if isfilled, means model is model filled, so model empty has to been deleted.
+	//if is not filled, means model is model empty, so model filled has to been deleted.
+	if (isFilled)
+		if(empty)
+			Model::unload(empty);
+	else
+		if(filled)
+			Model::unload(filled);
+}
+
+void Crystal::draw()
+{	
+	crystalRot -= 3.0f;
+	rotation = Vec3f(0, crystalRot, 0);
+	Entity::draw();	
+}
+
+void Crystal::collide()
+{
+	if (isFilled)
+	{
+		music->Play();
+		Player::getInstance()->crystals++;
+		isFilled = false;
+		model = empty;
+	}	
+}

Crystal.h

@@ -0,0 +1,23 @@
+#pragma once
+#include "Entity.h"
+#include <string>
+#include "CrystalPoint.h"
+
+class Crystal :
+	public Entity
+{
+public:
+	Crystal(const std::string &filled, const std::string &empty,
+		const Vec3f &position, Vec3f &rotation, const float &scale);
+	~Crystal();
+	float crystalRot;
+	bool isFilled;
+	void draw();
+	void collide();
+private:
+	int sound_id;
+	Sound* music;
+	Model* filled;
+	Model* empty;
+};
+

Crystal.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CrystalPoint", "CrystalPoint.vcxproj", "{4986BEC0-4362-46E4-A18D-65587FA97967}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CrystalPoint", "CrystalPoint.vcxproj", "{F82158C7-7345-4CB0-9F90-3AB49A071904}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4986BEC0-4362-46E4-A18D-65587FA97967}.Debug|x64.ActiveCfg = Debug|x64
+		{F82158C7-7345-4CB0-9F90-3AB49A071904}.Debug|x64.ActiveCfg = Debug|x64
-		{4986BEC0-4362-46E4-A18D-65587FA97967}.Debug|x64.Build.0 = Debug|x64
+		{F82158C7-7345-4CB0-9F90-3AB49A071904}.Debug|x64.Build.0 = Debug|x64
-		{4986BEC0-4362-46E4-A18D-65587FA97967}.Debug|x86.ActiveCfg = Debug|Win32
+		{F82158C7-7345-4CB0-9F90-3AB49A071904}.Debug|x86.ActiveCfg = Debug|Win32
-		{4986BEC0-4362-46E4-A18D-65587FA97967}.Debug|x86.Build.0 = Debug|Win32
+		{F82158C7-7345-4CB0-9F90-3AB49A071904}.Debug|x86.Build.0 = Debug|Win32
-		{4986BEC0-4362-46E4-A18D-65587FA97967}.Release|x64.ActiveCfg = Release|x64
+		{F82158C7-7345-4CB0-9F90-3AB49A071904}.Release|x64.ActiveCfg = Release|x64
-		{4986BEC0-4362-46E4-A18D-65587FA97967}.Release|x64.Build.0 = Release|x64
+		{F82158C7-7345-4CB0-9F90-3AB49A071904}.Release|x64.Build.0 = Release|x64
-		{4986BEC0-4362-46E4-A18D-65587FA97967}.Release|x86.ActiveCfg = Release|Win32
+		{F82158C7-7345-4CB0-9F90-3AB49A071904}.Release|x86.ActiveCfg = Release|Win32
-		{4986BEC0-4362-46E4-A18D-65587FA97967}.Release|x86.Build.0 = Release|Win32
+		{F82158C7-7345-4CB0-9F90-3AB49A071904}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

CrystalPoint.cpp

@@ -0,0 +1,207 @@
+
+#include "CrystalPoint.h"
+#include <GL/freeglut.h>
+#include <cmath>
+#include <cstring>
+#include "WorldHandler.h"
+#include "Player.h"
+#include "Cursor.h"
+#include "Menu.h"
+#include "Text.h"
+#include "Vector.h"
+#include "Button.h"
+
+int CrystalPoint::width = 0;
+int CrystalPoint::height = 0;
+
+SoundSystem CrystalPoint::sound_system;
+bool state = false;
+
+void CrystalPoint::init()
+{
+	player = Player::getInstance();
+	worldhandler = WorldHandler::getInstance();
+	cursor = Cursor::getInstance();
+
+	menu = new Menu();
+	menuIsBuild = false;
+
+	lastFrameTime = 0;
+	state = true;
+
+	glClearColor(0.7f, 0.7f, 1.0f, 1.0f);
+}
+
+
+void CrystalPoint::draw()
+{
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	//Draw world
+	glEnable(GL_LIGHTING);
+	glEnable(GL_DEPTH_TEST);
+
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	gluPerspective(70, width / (float)height, 0.1f, 15000);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	
+	worldhandler->draw();
+	
+	if(!state)
+		menu->draw();
+
+	glutSwapBuffers();
+}
+
+
+void CrystalPoint::update()
+{
+	float frameTime = glutGet(GLUT_ELAPSED_TIME) / 1000.0f;
+	float deltaTime = frameTime - lastFrameTime;
+	lastFrameTime = frameTime;
+
+	if (keyboardState.keys[27] && !prevKeyboardState.keys[27])
+		state = !state;
+		
+	if (state)
+	{
+		Player* player = Player::getInstance();
+
+		if (keyboardState.special[GLUT_KEY_LEFT] && !prevKeyboardState.special[GLUT_KEY_LEFT])
+			worldhandler->PreviousWorld();
+		if (keyboardState.special[GLUT_KEY_RIGHT] && !prevKeyboardState.special[GLUT_KEY_RIGHT])
+			worldhandler->NextWorld();
+		if (keyboardState.special[GLUT_KEY_UP] && !prevKeyboardState.special[GLUT_KEY_UP])
+			player->NextLeftWeapon();
+		if (keyboardState.special[GLUT_KEY_DOWN] && !prevKeyboardState.special[GLUT_KEY_DOWN])
+			player->PreviousLeftWeapon();
+		if (keyboardState.keys[27])
+			state = false;
+
+		//testing code
+		if (keyboardState.keys['u'])
+			player->HpUp(1);
+		if (keyboardState.keys['i'])
+			player->HpDown(1);
+		if (keyboardState.keys['o'])
+			player->XpUp(1);
+
+		player->rotation.y += mouseOffset.x / 10.0f;
+		player->rotation.x += mouseOffset.y / 10.0f;
+
+
+		float speed = 10;
+
+		Vec3f oldPosition = player->position;
+		if (keyboardState.keys['a']) player->setPosition(0, deltaTime*speed, false);
+		if (keyboardState.keys['d']) player->setPosition(180, deltaTime*speed, false);
+		if (keyboardState.keys['w']) player->setPosition(90, deltaTime*speed, false);
+		if (keyboardState.keys['s']) player->setPosition(270, deltaTime*speed, false);
+		if (keyboardState.keys['q']) player->setPosition(1, deltaTime*speed, true);
+		if (keyboardState.keys['e']) player->setPosition(-1, deltaTime*speed, true);
+
+		Controller *leftcontroller = controller.getLeftController();
+		if (leftcontroller != nullptr) {
+			Vec2f *leftControllerJoystick = &leftcontroller->joystick;
+
+
+			if (leftcontroller->joystickButton) {
+				controller.rumble(leftcontroller->controllerId, 100, 100);
+			}
+
+
+			if (leftControllerJoystick->y > 0.3) {
+				player->setPosition(270, leftControllerJoystick->y * deltaTime * 2.0f, false);
+			}
+			else if (leftControllerJoystick->y < -0.3) {
+				player->setPosition(90, leftControllerJoystick->y * -1 * deltaTime * 2.0f, false);
+			}
+			if (leftControllerJoystick->x > 0.3) {
+				player->setPosition(180, leftControllerJoystick->x * deltaTime * 2.0f, false);
+			}
+			else if (leftControllerJoystick->x < -0.3) {
+				player->setPosition(0, leftControllerJoystick->x * -1 * deltaTime * 2.0f, false);
+			}
+
+			player->leftWeapon->rotateWeapon(Vec3f(leftcontroller->ypr.y + 140, 0, -leftcontroller->ypr.z));
+
+		}
+		Controller *rightcontroller = controller.getRightController();
+		if(rightcontroller != nullptr){
+			Vec2f *rightControllerJoystick = &rightcontroller->joystick;
+			if (rightControllerJoystick->y > 0.3 || rightControllerJoystick->y < -0.3) {
+				player->rotation.x += rightcontroller->joystick.y/4;
+			}
+
+			if (rightControllerJoystick->x > 0.3 || rightControllerJoystick->x < -0.3) {
+				player->rotation.y += rightcontroller->joystick.x/4;
+			}
+            player->rightWeapon->rotateWeapon(Vec3f(rightcontroller->ypr.y + 140, 0, -rightcontroller->ypr.z));
+        }
+
+		if (player->rotation.x > 90)
+			player->rotation.x = 90;
+		if (player->rotation.x < -90)
+			player->rotation.x = -90;
+
+		player->position.y = worldhandler->getHeight(player->position.x, player->position.z) + 1.7f;
+
+		if (!worldhandler->isPlayerPositionValid())
+			player->position = oldPosition;
+		/*else if (player->position.y > oldPosition.y + 1.2)
+			player->position = oldPosition;
+		*/
+		worldhandler->update(deltaTime);
+	}	
+	else
+	{
+		if (!menuIsBuild)
+		{
+			buildMenu();
+			menuIsBuild = true;
+		}
+		menu->update();
+		cursor->update(cursor->mousePosition + mouseOffset);
+	}
+
+
+	mouseOffset = Vec2f(0, 0);
+	prevKeyboardState = keyboardState;
+	glutPostRedisplay();
+
+	sound_system.SetListener(player->position, Vec3f(), Vec3f());
+}
+
+void CrystalPoint::buildMenu()
+{
+	Button* start = new Button("Resume", Vec2f(width / 2 - 50, height / 2 - 30), 100, 50);
+	auto toWorld = [](Button* b)
+	{
+		state = true;
+	};
+	start->addAction(toWorld);
+	menu->AddMenuElement(start);
+
+
+	Button* test = new Button("Exit", Vec2f(width / 2 - 50, height / 2 + 30), 100, 50);
+	test->addAction([](Button* b)
+	{
+		exit(0);
+	});
+	menu->AddMenuElement(test);
+
+	Text* t = new Text("Pause", Vec2f(width / 2 - Util::glutTextWidth("Pause") / 2, height / 2 - 75));
+	t->setColor(Vec3f(255, 255, 0));
+	menu->AddMenuElement(t);
+}
+
+
+
+KeyboardState::KeyboardState()
+{
+	memset(keys, 0, sizeof(keys));
+	memset(special, 0, sizeof(special));
+}

CrystalPoint.h

@@ -0,0 +1,51 @@
+#pragma once
+
+class WorldHandler;
+class SoundSystem;
+class Player;
+class Cursor;
+class Menu;
+#include "Vector.h"
+#include "SoundSystem.h"
+#include "ControllerHandler.h"
+
+class KeyboardState
+{
+public:
+	bool keys[256];
+	bool special[256];
+	bool control, shift, alt;
+
+	KeyboardState();
+};
+
+class CrystalPoint
+{
+public:
+	void init();
+	void draw();
+	void update();
+
+	WorldHandler* worldhandler;
+	Player* player;
+	ControllerHandler controller;
+	Cursor* cursor;
+	Menu* menu;
+
+	static int width, height;
+	KeyboardState keyboardState;
+	KeyboardState prevKeyboardState;
+
+	Vec2f mouseOffset;
+	Vec2f mousePosition;
+
+	float lastFrameTime;
+
+	static SoundSystem& GetSoundSystem() { return sound_system; }
+	
+	bool menuIsBuild;
+
+private:
+	static SoundSystem sound_system;
+	void buildMenu();
+};

CrystalPoint.vcxproj

@@ -19,9 +19,9 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{4986BEC0-4362-46E4-A18D-65587FA97967}</ProjectGuid>
+    <ProjectGuid>{F82158C7-7345-4CB0-9F90-3AB49A071904}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>CrystalPoint</RootNamespace>
+    <RootNamespace>CrystalJohan</RootNamespace>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
     <ProjectName>CrystalPoint</ProjectName>
   </PropertyGroup>
@@ -84,63 +84,66 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>freeglut/include</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile />
+      <AdditionalIncludeDirectories>lib/serial;freeglut/include; openAL/include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>freeglut/lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>freeglut/lib; openAL/libs/Win32</AdditionalLibraryDirectories>
+      <AdditionalDependencies>setupapi.lib;openal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>freeglut/include</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile />
+      <AdditionalIncludeDirectories>lib/serial;freeglut/include;C:\Program Files (x86)\OpenAL 1.1 SDK\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>freeglut/lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>freeglut/lib;C:\Program Files (x86)\OpenAL 1.1 SDK\libs\Win32</AdditionalLibraryDirectories>
+      <AdditionalDependencies>setupapi.lib;openal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>freeglut/include</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile />
+      <AdditionalIncludeDirectories>lib/serial;freeglut/include; openAL/include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>freeglut/lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>freeglut/lib; openAL/libs/Win32</AdditionalLibraryDirectories>
+      <AdditionalDependencies>setupapi.lib;openal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>freeglut/include</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile />
+      <AdditionalIncludeDirectories>lib/serial;freeglut/include;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -148,49 +151,91 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>freeglut/lib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>setupapi.lib;openal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="Controller.h" />
+    <ClCompile Include="Button.cpp" />
-    <ClInclude Include="Enemy.h" />
+    <ClCompile Include="Controller.cpp" />
-    <ClInclude Include="Header.h" />
+    <ClCompile Include="ControllerHandler.cpp" />
-    <ClInclude Include="InitState.h" />
+    <ClCompile Include="Crystal.cpp" />
-    <ClInclude Include="Keyboard.h" />
+    <ClCompile Include="CrystalPoint.cpp" />
-    <ClInclude Include="LoadingState.h" />
+    <ClCompile Include="Cursor.cpp" />
-    <ClInclude Include="MenuState.h" />
+    <ClCompile Include="Enemy.cpp" />
-    <ClInclude Include="Model.h" />
+    <ClCompile Include="Entity.cpp" />
-    <ClInclude Include="ModelHandler.h" />
+    <ClCompile Include="HeightMap.cpp" />
-    <ClInclude Include="ModelInstance.h" />
+    <ClCompile Include="Interface.cpp" />
-    <ClInclude Include="Mouse.h" />
+    <ClCompile Include="json.cpp" />
-    <ClInclude Include="Player.h" />
+    <ClCompile Include="LevelObject.cpp" />
-    <ClInclude Include="SettingsState.h" />
+    <ClCompile Include="lib\serial\src\impl\list_ports\list_ports_win.cc" />
-    <ClInclude Include="State.h" />
+    <ClCompile Include="lib\serial\src\impl\win.cc" />
-    <ClInclude Include="StateHandler.h" />
+    <ClCompile Include="lib\serial\src\serial.cc" />
-    <ClInclude Include="Vector.h" />
+    <ClCompile Include="LoadingScreen.cpp" />
-    <ClInclude Include="Weapon.h" />
+    <ClCompile Include="Main.cpp" />
-    <ClInclude Include="WorldModel.h" />
+    <ClCompile Include="Menu.cpp" />
-    <ClInclude Include="WorldState.h" />
+    <ClCompile Include="MenuElement.cpp" />
+    <ClCompile Include="Model.cpp" />
+    <ClCompile Include="Portal.cpp" />
+    <ClCompile Include="Sound.cpp" />
+    <ClCompile Include="SoundSystem.cpp" />
+    <ClCompile Include="Player.cpp" />
+    <ClCompile Include="Skybox.cpp" />
+    <ClCompile Include="Text.cpp" />
+    <ClCompile Include="Util.cpp" />
+    <ClCompile Include="Vector.cpp" />
+    <ClCompile Include="Vertex.cpp" />
+    <ClCompile Include="Weapon.cpp" />
+    <ClCompile Include="World.cpp" />
+    <ClCompile Include="WorldHandler.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Controller.cpp" />
+    <ClInclude Include="Button.h" />
-    <ClCompile Include="Enemy.cpp" />
+    <ClInclude Include="Controller.h" />
-    <ClCompile Include="InitState.cpp" />
+    <ClInclude Include="ControllerHandler.h" />
-    <ClCompile Include="Keyboard.cpp" />
+    <ClInclude Include="Crystal.h" />
-    <ClCompile Include="LoadingState.cpp" />
+    <ClInclude Include="CrystalPoint.h" />
-    <ClCompile Include="Main.cpp" />
+    <ClInclude Include="Cursor.h" />
-    <ClCompile Include="MenuState.cpp" />
+    <ClInclude Include="Enemy.h" />
-    <ClCompile Include="Model.cpp" />
+    <ClInclude Include="Entity.h" />
-    <ClCompile Include="ModelHandler.cpp" />
+    <ClInclude Include="HeightMap.h" />
-    <ClCompile Include="ModelInstance.cpp" />
+    <ClInclude Include="Interface.h" />
-    <ClCompile Include="Mouse.cpp" />
+    <ClInclude Include="json.h" />
-    <ClCompile Include="Player.cpp" />
+    <ClInclude Include="LevelObject.h" />
-    <ClCompile Include="SettingsState.cpp" />
+    <ClInclude Include="lib\serial\include\impl\win.h" />
-    <ClCompile Include="State.cpp" />
+    <ClInclude Include="lib\serial\include\serial.h" />
-    <ClCompile Include="StateHandler.cpp" />
+    <ClInclude Include="lib\serial\include\v8stdint.h" />
-    <ClCompile Include="Vector.cpp" />
+    <ClInclude Include="LoadingScreen.h" />
-    <ClCompile Include="Weapon.cpp" />
+    <ClInclude Include="Main.h" />
-    <ClCompile Include="WorldModel.cpp" />
+    <ClInclude Include="Menu.h" />
-    <ClCompile Include="WorldState.cpp" />
+    <ClInclude Include="MenuElement.h" />
+    <ClInclude Include="Model.h" />
+    <ClInclude Include="Portal.h" />
+    <ClInclude Include="Sound.h" />
+    <ClInclude Include="SoundSystem.h" />
+    <ClInclude Include="Player.h" />
+    <ClInclude Include="Skybox.h" />
+    <ClInclude Include="stb_image.h" />
+    <ClInclude Include="Text.h" />
+    <ClInclude Include="Util.h" />
+    <ClInclude Include="vector.h" />
+    <ClInclude Include="Vertex.h" />
+    <ClInclude Include="Weapon.h" />
+    <ClInclude Include="World.h" />
+    <ClInclude Include="WorldHandler.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="weapons.json" />
+    <None Include="worlds\fire.json" />
+    <None Include="worlds\ice.json" />
+    <None Include="worlds\rock.json" />
+    <None Include="worlds\small.json" />
+    <None Include="worlds\worlds.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Media Include="WAVE\Crystal.wav" />
+    <Media Include="WAVE\ghostEnemy.wav" />
+    <Media Include="WAVE\portal.wav" />
+    <Media Include="WAVE\world1.wav" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

CrystalPoint.vcxproj.filters

@@ -13,138 +13,253 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Source Files\State">
+    <Filter Include="Source Files\Object">
-      <UniqueIdentifier>{6c99658e-2c17-469b-a3d1-2c4d3d61d440}</UniqueIdentifier>
+      <UniqueIdentifier>{1e464995-b141-43fd-9e25-16d6ac47176b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Control">
+    <Filter Include="Source Files\World">
-      <UniqueIdentifier>{e444364a-17f6-4464-a98c-6bd34d3e6263}</UniqueIdentifier>
+      <UniqueIdentifier>{0de1a037-e536-40df-a0d0-0d929f2fe752}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Model">
+    <Filter Include="Source Files\json">
-      <UniqueIdentifier>{842778c9-ff0f-4a6d-9c86-0a178ad40fcc}</UniqueIdentifier>
+      <UniqueIdentifier>{9c655946-3f99-44ea-bc97-2817656954e0}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Model\Enemy">
+    <Filter Include="Source Files\Serial">
-      <UniqueIdentifier>{1be14b84-6fa7-4cfb-94b9-666f3ee14198}</UniqueIdentifier>
+      <UniqueIdentifier>{98128574-9e08-4c28-9372-8d50b6e1a101}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Handler">
-      <UniqueIdentifier>{1b39afb7-b64b-458a-bba3-755631986211}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Model.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Header.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="StateHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="State.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MenuState.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LoadingState.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Keyboard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Mouse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Controller.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WorldModel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WorldState.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Enemy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Player.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Weapon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Vector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ModelInstance.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ModelHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SettingsState.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="InitState.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="State.cpp">
-      <Filter>Source Files\State</Filter>
-    </ClCompile>
-    <ClCompile Include="MenuState.cpp">
-      <Filter>Source Files\State</Filter>
-    </ClCompile>
-    <ClCompile Include="Keyboard.cpp">
-      <Filter>Source Files\Control</Filter>
-    </ClCompile>
-    <ClCompile Include="Mouse.cpp">
-      <Filter>Source Files\Control</Filter>
-    </ClCompile>
-    <ClCompile Include="Controller.cpp">
-      <Filter>Source Files\Control</Filter>
-    </ClCompile>
-    <ClCompile Include="LoadingState.cpp">
-      <Filter>Source Files\State</Filter>
-    </ClCompile>
-    <ClCompile Include="Model.cpp">
-      <Filter>Source Files\Model</Filter>
-    </ClCompile>
-    <ClCompile Include="WorldModel.cpp">
-      <Filter>Source Files\Model</Filter>
-    </ClCompile>
-    <ClCompile Include="WorldState.cpp">
-      <Filter>Source Files\State</Filter>
-    </ClCompile>
-    <ClCompile Include="Enemy.cpp">
-      <Filter>Source Files\Model\Enemy</Filter>
-    </ClCompile>
     <ClCompile Include="Player.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Weapon.cpp">
+    <ClCompile Include="json.cpp">
-      <Filter>Source Files\Model</Filter>
-    </ClCompile>
-    <ClCompile Include="Vector.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ModelInstance.cpp">
+    <ClCompile Include="WorldHandler.cpp">
-      <Filter>Source Files\Model</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="StateHandler.cpp">
+    <ClCompile Include="Entity.cpp">
-      <Filter>Source Files\Handler</Filter>
+      <Filter>Source Files\Object</Filter>
     </ClCompile>
-    <ClCompile Include="ModelHandler.cpp">
+    <ClCompile Include="Model.cpp">
-      <Filter>Source Files\Handler</Filter>
+      <Filter>Source Files\Object</Filter>
     </ClCompile>
-    <ClCompile Include="SettingsState.cpp">
+    <ClCompile Include="Vertex.cpp">
-      <Filter>Source Files\State</Filter>
+      <Filter>Source Files\Object</Filter>
     </ClCompile>
-    <ClCompile Include="InitState.cpp">
+    <ClCompile Include="Vector.cpp">
-      <Filter>Source Files\State</Filter>
+      <Filter>Source Files\Object</Filter>
+    </ClCompile>
+    <ClCompile Include="World.cpp">
+      <Filter>Source Files\World</Filter>
+    </ClCompile>
+    <ClCompile Include="HeightMap.cpp">
+      <Filter>Source Files\World</Filter>
+    </ClCompile>
+    <ClCompile Include="LevelObject.cpp">
+      <Filter>Source Files\World</Filter>
+    </ClCompile>
+    <ClCompile Include="Enemy.cpp">
+      <Filter>Source Files\Object</Filter>
+    </ClCompile>
+    <ClCompile Include="CrystalPoint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Cursor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Interface.cpp">
+      <Filter>Source Files\World</Filter>
+    </ClCompile>
+    <ClCompile Include="Skybox.cpp">
+      <Filter>Source Files\World</Filter>
+    </ClCompile>
+    <ClCompile Include="Crystal.cpp">
+      <Filter>Source Files\Object</Filter>
+    </ClCompile>
+    <ClCompile Include="SoundSystem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sound.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Crystal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Portal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Controller.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ControllerHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="lib\serial\src\impl\list_ports\list_ports_win.cc">
+      <Filter>Source Files\Serial</Filter>
+    </ClCompile>
+    <ClCompile Include="lib\serial\src\impl\win.cc">
+      <Filter>Source Files\Serial</Filter>
+    </ClCompile>
+    <ClCompile Include="lib\serial\src\serial.cc">
+      <Filter>Source Files\Serial</Filter>
+    </ClCompile>
+    <ClCompile Include="Weapon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Button.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Menu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MenuElement.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Text.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LoadingScreen.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="World.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Entity.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Enemy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LevelObject.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Model.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="stb_image.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Player.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="json.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="HeightMap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Vertex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WorldHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CrystalPoint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Interface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Cursor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SoundSystem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Sound.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Crystal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Skybox.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Portal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Controller.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="lib\serial\include\serial.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="lib\serial\include\v8stdint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="lib\serial\include\impl\win.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Weapon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Button.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Menu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MenuElement.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Text.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LoadingScreen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="worlds\worlds.json">
+      <Filter>Source Files\json</Filter>
+    </None>
+    <None Include="worlds\fire.json">
+      <Filter>Source Files\json</Filter>
+    </None>
+    <None Include="worlds\ice.json">
+      <Filter>Source Files\json</Filter>
+    </None>
+    <None Include="worlds\small.json">
+      <Filter>Source Files\json</Filter>
+    </None>
+    <None Include="worlds\rock.json">
+      <Filter>Source Files\json</Filter>
+    </None>
+    <None Include="weapons.json">
+      <Filter>Source Files\json</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Media Include="WAVE\Crystal.wav">
+      <Filter>Resource Files</Filter>
+    </Media>
+    <Media Include="WAVE\portal.wav">
+      <Filter>Resource Files</Filter>
+    </Media>
+    <Media Include="WAVE\ghostEnemy.wav">
+      <Filter>Resource Files</Filter>
+    </Media>
+    <Media Include="WAVE\world1.wav">
+      <Filter>Resource Files</Filter>
+    </Media>
+  </ItemGroup>
 </Project>

Cursor.cpp

@@ -0,0 +1,80 @@
+#include "Cursor.h"
+#include <GL/freeglut.h>
+#include <cmath>
+#include "CrystalPoint.h"
+
+Cursor* Cursor::instance = NULL;
+
+Cursor::Cursor()
+{
+	enabled = false;
+	mousePosition = Vec2f(CrystalPoint::width / 2, CrystalPoint::height / 2);
+	clicked = false;
+}
+
+Cursor::~Cursor()
+{
+	
+}
+
+Cursor* Cursor::getInstance(void)
+{
+	if (instance == nullptr)
+		instance = new Cursor();
+	
+	return instance;
+}
+
+void Cursor::enable(bool enable)
+{
+	enabled = enable;
+}
+
+bool Cursor::isEnabled(void)
+{
+	return enabled;
+}
+
+void Cursor::draw(void)
+{
+	//Draw Cursor
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(0, CrystalPoint::width, CrystalPoint::height, 0, -10, 10);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	glDisable(GL_LIGHTING);
+	glDisable(GL_DEPTH_TEST);
+	glColor4f(1, cos(glutGet(GLUT_ELAPSED_TIME) / 1000.0f), sin(glutGet(GLUT_ELAPSED_TIME) / 1000.0f), 1);
+
+	glBegin(GL_TRIANGLES);
+	glVertex2f(mousePosition.x, mousePosition.y);
+	glVertex2f(mousePosition.x + 15, mousePosition.y + 15);
+	glVertex2f(mousePosition.x + 5, mousePosition.y + 20);
+	glEnd();
+}
+
+void Cursor::update(Vec2f newPosition)
+{
+	if (newPosition.x < 0)
+		newPosition.x = 0;
+
+	if (newPosition.y < 0)
+		newPosition.y = 0;
+
+	if (newPosition.x > CrystalPoint::width)
+		newPosition.x = CrystalPoint::width;
+
+	if (newPosition.y > CrystalPoint::height)
+		newPosition.y = CrystalPoint::height;
+
+	mousePosition = newPosition;
+
+	if (clicked)
+		clicked = !clicked;
+	if (state != prev)
+		if(state == GLUT_UP)
+			clicked = true;
+	prev = state;
+}

Cursor.h

@@ -0,0 +1,28 @@
+#pragma once
+#include "Vector.h"
+
+class Cursor
+{
+private:
+	Cursor();
+
+	static Cursor* instance;
+	bool enabled;
+	
+public:
+	Vec2f mousePosition;
+	~Cursor();
+
+	static Cursor* getInstance(void);
+	
+	void enable(bool enable);
+	bool isEnabled(void);
+
+	bool clicked;
+	int state, prev;
+
+
+	void draw(void);
+	void update(Vec2f newPosition);
+};
+

Enemy.cpp

@@ -1,12 +1,105 @@
+#define _USE_MATH_DEFINES
+#include <cmath>
 #include "Enemy.h"
+#include "Model.h"
+#include <iostream>
 
-
+Enemy::Enemy(const std::string &fileName,
-
+	const std::string &fileMusic,
-Enemy::Enemy()
+	float damage,
+	float health,
+	const Vec3f &position,
+	const Vec3f &rotation,
+	const float &scale)
 {
+	model = Model::load(fileName);
+	this->position = position;
+	this->rotation = rotation;
+	this->scale = scale;
+	this->canCollide = true;
+	target = position;
+	speed = 1;
+	radius = 10;
+
+	xp = health;
+	this->health = health;
+	this->damage = damage;
+
+	hasTarget = false;
+	hit_sound_id = CrystalPoint::GetSoundSystem().LoadSound(fileMusic.c_str(), false);
+	music = CrystalPoint::GetSoundSystem().GetSound(hit_sound_id);
+	attack = false;	
 }
 
 
 Enemy::~Enemy()
 {
+	music->Stop();
+	CrystalPoint::GetSoundSystem().UnloadSound(hit_sound_id);
+	if (model)
+		Model::unload(model);
+}
+
+void Enemy::draw()
+{
+	Entity::draw();
+}
+
+void Enemy::inEyeSight(Vec3f & TargetPosition)
+{
+	if (position.Distance(TargetPosition) <= radius)
+	{
+		hasTarget = true;
+		target = TargetPosition;
+	}
+	else
+		hasTarget = false;
+}
+
+void Enemy::collide(const Entity * entity)
+{
+	Vec3f difference = position - entity->position; //zou misschien omgedraait moeten worden
+	difference.y = 0;
+	difference.Normalize();
+	difference = difference * (entity->model->radius + 0.01f);
+	position.x = difference.x + entity->position.x;
+	position.z = difference.z + entity->position.z;
+}
+
+void Enemy::update(float delta)
+{
+	music->SetPos(position, Vec3f());
+
+	if (hasTarget)
+	{
+		if (music->IsPlaying() == false)
+		{
+			music->Play();
+		}
+		//just 2d walking
+		float dx, dz, length;
+
+		dx = target.x - position.x;
+		dz = target.z - position.z;
+
+		length = sqrt(dx*dx + dz*dz);
+		if (length > 1)
+		{
+			attack = false;
+
+			dx /= length;
+			dz /= length;
+
+			dx *= speed*delta;
+			dz *= speed*delta;
+
+			position.x += dx;
+			position.z += dz;
+		}
+		else
+		{	
+			attack = true;
+		}
+		rotation.y = atan2f(dx, dz) * 180 / M_PI;		
+	}
 }

Enemy.h

@@ -1,10 +1,32 @@
 #pragma once
-#include "Header.h"
 
-class Enemy
+#include "Entity.h"
+#include <string>
+#include "Vector.h"
+#include "CrystalPoint.h"
+
+class Enemy : public Entity
 {
 public:
-	Enemy();
+	Enemy(const std::string &fileName, const std::string &fileMusic, float damage, float health, const Vec3f &position, const Vec3f &rotation, const float &scale);
 	~Enemy();
+
+	Sound* music;
+
+	bool hasTarget;
+	Vec3f target;
+	float speed,radius;
+	float health;
+	float damage;
+	int xp;
+	bool attack;
+
+	void update(float);
+	void draw();
+
+	void inEyeSight(Vec3f &);
+	void collide(const Entity *entity);
+private:
+	int hit_sound_id;
 };
 

Entity.cpp

@@ -0,0 +1,56 @@
+#include "Entity.h"
+#include "cmath"
+#include <GL/freeglut.h>
+#include "Model.h"
+
+
+Entity::Entity()
+{
+	model = NULL;
+	scale = 1;
+	canCollide = true;
+}
+
+
+Entity::~Entity()
+{
+	if(model)
+		Model::unload(model);
+}
+
+
+void Entity::draw()
+{
+	if (model)
+	{
+		glPushMatrix();
+
+		glTranslatef(position.x, position.y, position.z);
+		glRotatef(rotation.x, 1, 0, 0);
+		glRotatef(rotation.y, 0, 1, 0);
+		glRotatef(rotation.z, 0, 0, 1);
+		glScalef(scale, scale, scale);
+
+		glEnable(GL_CULL_FACE);
+		glCullFace(GL_BACK);
+		model->draw();
+		glCullFace(GL_FRONT);
+		model->draw();
+		glDisable(GL_CULL_FACE);
+
+		glPopMatrix();
+	}
+
+}
+
+bool Entity::inObject(const Vec3f & point)
+{
+	if (!model)
+		return false;
+	Vec3f center = position + model->center;
+	float distance = ((point.x - center.x) * (point.x - center.x) + (point.z - center.z)*(point.z - center.z));
+	if (distance < model->radius*scale*model->radius*scale)
+		return true;
+	return false;
+}
+

Entity.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include "Vector.h"
+class Model;
+
+class Entity
+{
+public:
+	Entity();
+	~Entity();
+
+	Model* model;
+
+	virtual void draw();
+	virtual void update(float elapsedTime) {};
+	virtual void collide() {};
+
+	Vec3f position;
+	Vec3f rotation;
+	float scale;
+
+	bool canCollide;
+	bool inObject(const Vec3f &position);
+};
+

Header.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <GL/freeglut.h>
-
-#define _USE_MATH_DEFINES
-#include <cmath>
-#include <math.h>
-
-#include <string>
-#include <vector>
-#include <list>
-#include <fstream>
-#include <iostream>
-#include <algorithm>
-#include <vector>
-
-#include <windows.h>
-#include <gl/GL.h>
-
-#include "Vector.h"
-
-using namespace std;

HeightMap.cpp

@@ -0,0 +1,184 @@
+#include "HeightMap.h"
+#include "stb_image.h"
+#include "Vector.h"
+
+#include "LevelObject.h"
+
+#include <GL/freeglut.h>
+#include <iostream>
+#include <string>
+#include "World.h"
+
+#define RED 0
+#define GREEN 1
+#define BLUE 2
+#define ALPHA 3
+
+HeightMap::HeightMap(const std::string &file, World* world)
+{
+	int bpp;
+	unsigned char* imgData = stbi_load(file.c_str(), &width, &height, &bpp, 4);
+
+	auto heightAt = [&](int x, int y)
+	{
+		return (imgData[(x + y * width) * 4 ] / 256.0f) * 50.0f;
+	};
+
+	auto valueAt = [&](int x, int y, int offset = 0)
+	{
+		return imgData[(x + y * width) * 4 + offset];
+	};
+
+	std::vector<std::vector<Vec3f>> faceNormals(width-1, std::vector<Vec3f>(height-1, Vec3f(0,1,0)));
+	for (int y = 0; y < height - 1; y++)
+	{
+		for (int x = 0; x < width - 1; x++)
+		{
+			int offsets[4][2] = { { 0, 0 },{ 1, 0 },{ 1, 1 },{ 0, 1 } };
+			Vec3f ca(0, heightAt(x, y + 1) - heightAt(x, y), 1);
+			Vec3f ba(1, heightAt(x + 1, y) - heightAt(x, y), 0);
+			Vec3f normal = ca.cross(ba);
+			normal.Normalize();
+			faceNormals[x][y] = normal;
+		}
+	}
+
+	for (int y = 0; y < height-1; y++)
+	{
+		for (int x = 0; x < width-1; x++)
+		{
+			int offsets[4][2] = { { 0, 0 },{ 1, 0 },{ 1, 1 },{ 0, 1 } };
+
+			if (valueAt(x, y, GREEN) > 5)
+			{
+				world->addLevelObject(new LevelObject(world->getObjectFromValue(valueAt(x, y, GREEN)).first, Vec3f(x, heightAt(x, y), y), Vec3f(0, 0, 0), 1, world->getObjectFromValue(valueAt(x, y, GREEN)).second));
+			}
+
+			for (int i = 0; i < 4; i++)
+			{
+				int xx = x + offsets[i][0];
+				int yy = y + offsets[i][1];
+
+				Vec3f normal(0, 0, 0);
+				if(xx < width-1 && yy < height-1)
+					normal = normal + faceNormals[xx][yy];
+				if(xx > 0 && yy < height-1)
+					normal = normal + faceNormals[xx-1][yy];
+				if (xx > 0 && yy > 0)
+					normal = normal + faceNormals[xx-1][yy-1];
+				if (yy > 0 && xx < width-1)
+					normal = normal + faceNormals[xx][yy-1];
+				normal.Normalize();
+
+				float h = heightAt(xx, yy);
+				vertices.push_back(Vertex{ (float)(xx), h, (float)(yy),
+									normal.x, normal.y, normal.z,
+									(xx) / (float)height, (yy) / (float)width } );
+			}
+		}
+	}
+
+	glGenTextures(1, &imageIndex);
+	glBindTexture(GL_TEXTURE_2D, imageIndex);
+
+	glTexImage2D(GL_TEXTURE_2D,
+		0,					//level
+		GL_RGBA,			//internal format
+		width,				//width
+		height,				//height
+		0,					//border
+		GL_RGBA,			//data format
+		GL_UNSIGNED_BYTE,	//data type
+		imgData);			//data
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+	stbi_image_free(imgData);
+}
+
+HeightMap::~HeightMap()
+{
+	glDeleteTextures(1, &imageIndex);
+}
+
+void HeightMap::Draw()
+{
+	glEnable(GL_LIGHTING);
+	float color[] = { 0.7f, 0.7f, 0.7f, 1 };
+	glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, color);
+	glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, color);
+
+	glEnable(GL_TEXTURE_2D);
+	glBindTexture(GL_TEXTURE_2D, imageIndex);
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+	//glEnableClientState(GL_COLOR_ARRAY);
+	glEnableClientState(GL_NORMAL_ARRAY);
+
+	glVertexPointer(3, GL_FLOAT, sizeof(Vertex), ((float*)vertices.data()) + 0);
+	glTexCoordPointer(2, GL_FLOAT, sizeof(Vertex), ((float*)vertices.data()) + 6);
+	glNormalPointer(GL_FLOAT, sizeof(Vertex), ((float*)vertices.data()) + 3);
+	glDrawArrays(GL_QUADS, 0, vertices.size());
+
+	glDisableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+	//glDisableClientState(GL_COLOR_ARRAY);
+	glDisableClientState(GL_NORMAL_ARRAY);
+}
+
+float HeightMap::GetHeight(float x, float y)
+{
+	int ix = x;
+	int iy = y;
+
+	int index = (ix + (width - 1) * iy) * 4;
+
+	if (index + 3 >= vertices.size())
+		index = vertices.size() - 4;
+
+	if (index < 0)
+		index = 0;
+
+	Vertex& a = vertices[index];
+	Vertex& b = vertices[index+1];
+	Vertex& c = vertices[index+3];
+
+	float lowervalue = ((b.z - c.z)*(a.x - c.x) + (c.x - b.x)*(a.z - c.z));
+	float labda1 = ((b.z - c.z)*(x - c.x) + (c.x - b.x)*(y - c.z)) / lowervalue;
+	float labda2 = ((c.y - a.y)*(x - c.x) + (a.x - c.x)*(y - c.y)) / lowervalue;
+	float labda3 = 1 - labda1 - labda2;
+
+	Vertex z = a * labda1 + b * labda2 + c * labda3;
+//	Vertex z = (a * labda1) + (b * labda2) ;
+
+	return z.y;
+}
+
+
+int HeightMap::GetSize()
+{
+	return height >= width ? height : width;
+}
+
+void HeightMap::SetTexture(const std::string &file)
+{
+	int bpp, width2, height2;
+	unsigned char* imgData = stbi_load(file.c_str(), &width2, &height2, &bpp, 4);
+
+	glBindTexture(GL_TEXTURE_2D, imageIndex);
+
+	glTexImage2D(GL_TEXTURE_2D,
+		0,		//level
+		GL_RGBA,		//internal format
+		width2,		//width
+		height2,		//height
+		0,		//border
+		GL_RGBA,		//data format
+		GL_UNSIGNED_BYTE,	//data type
+		imgData);		//data
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+	stbi_image_free(imgData);
+}

HeightMap.h

@@ -0,0 +1,28 @@
+#pragma once
+#include "Vertex.h"
+
+#include <string>
+#include <vector>
+#include <GL/freeglut.h>
+
+class World;
+
+class HeightMap
+{
+private:
+	int height;
+	int width;
+
+	GLuint imageIndex;
+public:
+	HeightMap(const std::string &file, World* world);
+	~HeightMap();
+
+	void Draw();
+	float GetHeight(float x, float y);
+	int GetSize();
+	void SetTexture(const std::string &file);
+
+	std::vector<Vertex> vertices;
+};
+

InitState.cpp

@@ -1,12 +0,0 @@
-#include "InitState.h"
-
-
-
-InitState::InitState()
-{
-}
-
-
-InitState::~InitState()
-{
-}

InitState.h

@@ -1,11 +0,0 @@
-#pragma once
-#include "Header.h"
-#include "State.h"
-
-class InitState : public State
-{
-public:
-	InitState();
-	~InitState();
-};
-

Interface.cpp

@@ -0,0 +1,123 @@
+#include "Interface.h"
+#include <GL/freeglut.h>
+#include "CrystalPoint.h"
+
+#include <string>
+
+#include "Player.h"
+#include "Util.h"
+
+Interface::Interface()
+{
+	crystalWidth = 20;
+	crystalHeight = 50;
+	crystalOffset = 5;
+	maxCrystals = 0;
+}
+
+Interface::Interface(int maxCrystal)
+{
+	crystalWidth = 20;
+	crystalHeight = 50;
+	crystalOffset = 5;
+	maxCrystals = maxCrystal;
+}
+
+
+Interface::~Interface()
+{
+}
+
+void Interface::draw()
+{
+	Player* player = Player::getInstance();
+
+	//Switch view to Ortho
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(0, 1000, 1000, 0, -10, 10);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	glDisable(GL_LIGHTING);
+	glDisable(GL_DEPTH_TEST);
+	glDisable(GL_TEXTURE_2D);
+	
+	//Draw interface
+
+	//Health bar
+	glBegin(GL_QUADS);
+	glColor4f(0,0,0, 1.0);
+	glVertex2f(250, 980);
+	glVertex2f(250, 965);
+	glVertex2f(750, 965);
+	glVertex2f(750, 980);
+	glEnd();
+
+	glBegin(GL_QUADS);
+	glColor4f(1.0f, 0.1f, 0.1f, 1.0);
+	glVertex2f(250, 980);
+	glVertex2f(250, 965);
+
+	glColor4f(1.0f, 0.5f, 0.5f, 1.0);
+	glVertex2f(250 + (player->health / player->maxHp * 500), 965);
+	glVertex2f(250 + (player->health / player->maxHp * 500), 980);
+	glEnd();
+
+	//XP bar
+	glBegin(GL_QUADS);
+	glColor4f(0, 0, 0, 1.0);
+	glVertex2f(250, 950);
+	glVertex2f(250, 935);
+	glVertex2f(750, 935);
+	glVertex2f(750, 950);
+	glEnd();
+
+	glBegin(GL_QUADS);
+	glColor4f(1.0f, 1.0f, 0.1f, 1.0);
+	glVertex2f(250, 950);
+	glVertex2f(250, 935);
+
+	glColor4f(1.0f, 1.0f, 0.5f, 1.0);
+	glVertex2f(250 + (player->xp / player->maxXp * 500), 935);
+	glVertex2f(250 + (player->xp / player->maxXp * 500), 950);
+	glEnd();
+
+	//Text: level
+	glColor4f(1.0f, 1.0f, 0.1f, 1.0);
+	Util::glutBitmapString("Level: " + std::to_string(player->level), 490, 900);
+
+	//Text: weapons
+	Util::glutBitmapString(player->leftWeapon->name, 850, 900);
+	Util::glutBitmapString(player->rightWeapon->name, 10, 900);
+
+	for (int i = 0; i < maxCrystals; i++)
+	{
+		glBegin(GL_QUADS);
+
+		if(i < player->crystals)
+			glColor4f(0, 1.0f, 1.0f, 1.0f);
+		else
+			glColor4f(0, 0.4f, 0.4f, 1.0f);
+
+		glVertex2f(975 - crystalWidth / 2	, crystalOffset*i + crystalHeight*i);
+		glVertex2f(975 - crystalWidth		, crystalHeight / 2 + crystalOffset*i + crystalHeight*i);
+
+		if (i < player->crystals)
+			glColor4f(0, 0.7f, 0.7f, 1.0f);
+		else
+			glColor4f(0, 0.2f, 0.2f, 1.0f);
+
+		glVertex2f(975 - crystalWidth / 2	, crystalHeight + crystalOffset*i + crystalHeight*i);
+		glVertex2f(975						, crystalHeight / 2 + crystalOffset*i + crystalHeight*i);
+		glEnd();
+	}
+
+	glEnable(GL_LIGHTING);
+	glEnable(GL_DEPTH_TEST);
+}
+
+void Interface::update(float deltaTime)
+{
+
+}

Interface.h

@@ -0,0 +1,15 @@
+#pragma once
+class Interface
+{
+public:
+	Interface();
+	Interface(int);
+	~Interface();
+
+	void draw(void);
+	void update(float deltaTime);
+
+	int crystalWidth, crystalHeight, crystalOffset;
+	int maxCrystals;
+};
+

Keyboard.cpp

@@ -1,12 +0,0 @@
-#include "Keyboard.h"
-
-
-
-Keyboard::Keyboard()
-{
-}
-
-
-Keyboard::~Keyboard()
-{
-}

Keyboard.h

@@ -1,10 +0,0 @@
-#pragma once
-#include "Header.h"
-
-class Keyboard
-{
-public:
-	Keyboard();
-	~Keyboard();
-};
-

LevelObject.cpp

@@ -0,0 +1,22 @@
+#include "LevelObject.h"
+
+#include "Model.h"
+
+
+LevelObject::LevelObject(const std::string &fileName, const Vec3f &position, const Vec3f &rotation, const float &scale, const bool &hasCollision)
+{
+	model = Model::load(fileName);
+	this->position = position;
+	this->position.x -= model->center.x;
+	this->position.z -= model->center.z;
+	this->rotation = rotation;
+	this->scale = scale;
+	this->canCollide = hasCollision;
+}
+
+
+LevelObject::~LevelObject()
+{
+	if (model)
+		Model::unload(model);
+}

LevelObject.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "Entity.h"
+#include <string>
+
+
+class LevelObject : public Entity
+{
+public:
+	LevelObject(const std::string &fileName, 
+		const Vec3f &position, 
+		const Vec3f &rotation, 
+		const float &scale, 
+		const bool &hasCollision);
+	~LevelObject();
+};
+

LoadingScreen.cpp

@@ -0,0 +1,71 @@
+
+#include "stb_image.h"
+#include "LoadingScreen.h"
+
+#include "CrystalPoint.h"
+#include "Util.h"
+#include <ostream>
+
+LoadingScreen::LoadingScreen()
+{
+	points = 0;
+}
+
+
+LoadingScreen::~LoadingScreen()
+{
+}
+
+void LoadingScreen::draw()
+{
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(0, CrystalPoint::width, CrystalPoint::height, 0, -10, 10);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+	
+	glDisable(GL_LIGHTING);
+	glDisable(GL_DEPTH_TEST);
+	glDisable(GL_COLOR_MATERIAL);
+	glEnable(GL_TEXTURE_2D);
+	
+		
+	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+	glBindTexture(GL_TEXTURE_2D, textureId);
+	glBegin(GL_QUADS);
+	glTexCoord2f(0, 1);
+	glVertex2f(0, 0);
+	glTexCoord2f(0, 0);
+	glVertex2f(0, CrystalPoint::height);
+	glTexCoord2f(1, 0);
+	glVertex2f(CrystalPoint::width, CrystalPoint::height);
+	glTexCoord2f(1, 1);
+	glVertex2f(CrystalPoint::width, 0);	
+	glEnd();
+	
+	/*glColor4f(1.0f, 1.0f, 0.0f, 1.0f);
+	
+	std::ostringstream oss;
+
+	oss << loading << points << std::endl;
+
+	Util::glutBitmapString(oss.str(),
+		CrystalPoint::width / 2 - Util::glutTextWidth(oss.str()),
+		CrystalPoint::height / 2 - 7);*/
+	
+	glDisable(GL_TEXTURE_2D);
+	glEnable(GL_LIGHTING);
+	glEnable(GL_DEPTH_TEST);
+	glutSwapBuffers();
+}
+
+void LoadingScreen::rise()
+{
+	points++;
+	draw();
+}
+
+void LoadingScreen::setTexture(const std::string filename)
+{
+	textureId = Util::loadTexture(filename);
+}

LoadingScreen.h

@@ -0,0 +1,22 @@
+#pragma once
+#include <string>
+#include <GL\freeglut.h>
+
+class LoadingScreen
+{
+public:
+	LoadingScreen();
+	~LoadingScreen();
+
+	void draw();
+	void rise();
+	int points;
+
+	GLuint textureId;
+	void setTexture(const std::string fileName);
+
+private:
+	const std::string loading = "Loaded: ";
+
+};
+

LoadingState.cpp

@@ -1,12 +0,0 @@
-#include "LoadingState.h"
-
-
-
-LoadingState::LoadingState()
-{
-}
-
-
-LoadingState::~LoadingState()
-{
-}

LoadingState.h

@@ -1,11 +0,0 @@
-#pragma once
-#include "Header.h"
-#include "State.h"
-
-class LoadingState : public State
-{
-public:
-	LoadingState();
-	~LoadingState();
-};
-

Main.cpp

@@ -1,148 +1,90 @@
-#include "Header.h"
+#include <GL/freeglut.h>
-#include "Model.h"
+
-#include "Player.h"
+#include "CrystalPoint.h"
-#include "StateHandler.h"
+#include <stdio.h>
-#include "State.h"
+#include "Vector.h"
+
+#define STB_IMAGE_IMPLEMENTATION
+#include "stb_image.h"
+
+#include "Cursor.h"
 
-//Prototypes
-void bindFuncOpenGL(void);
 void configureOpenGL(void);
-void loadModels(void);
 
-static int Width;
+CrystalPoint* app;
-static int Height;
 
-float lastFrameTime = 0;
+bool justMoved = false;
-bool keys[255];
-
-//vector<Model*> models;
-//int currentModel = 0;
-
-
-StateHandler *statehandler;
-
-void display()
-{
-	glClearColor(0.6f, 0.6f, 1, 1);
-	glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	gluPerspective(60.0f, (float)Width / Height, 0.5, 300);
-
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
-
-	/*glRotatef(player.eyes.rotX, 1, 0, 0);
-	glRotatef(player.eyes.rotY, 0, 1, 0);
-	glTranslatef(player.eyes.posX, player.eyes.posY, player.eyes.posZ);
-
-	glPushMatrix();
-	glScalef(0.5f, 0.5f, 0.5f);
-	glRotatef(180, 1, 0, 0);
-	glRotatef(45, 0, 0, 1);
-	glRotatef(90, 0, 1, 0);
-	models[currentModel]->draw();
-	glPopMatrix();*/
-
-	//Draw here	
-
-	statehandler->GetCurrentState()->Display();
-
-	//player->Display();
-	
-	//glutSolidCube(10.0);
-
-	glDisable(GL_TEXTURE_2D);
-	glutSwapBuffers();
-}
-
-
-
-void idle()
-{
-	float frameTime = glutGet(GLUT_ELAPSED_TIME) / 1000.0f;
-	float deltaTime = frameTime - lastFrameTime;
-	lastFrameTime = frameTime;
-
-	statehandler->GetCurrentState()->Keyboard(keys,deltaTime);
-	statehandler->GetCurrentState()->Idle(deltaTime);
-
-	glutPostRedisplay();
-}
-
-void mousemotion(int x, int y)
-{
-	int dx = x - Width / 2;
-	int dy = y - Height / 2;
-	if ((dx != 0 || dy != 0) && abs(dx) < 400 && abs(dy) < 400)
-	{
-		statehandler->GetCurrentState()->MouseMove(x, y, dx, dy);
-		glutWarpPointer(Width / 2, Height / 2);
-	}
-}
-
-void mouse(int button, int type, int x, int y)
-{
-	statehandler->GetCurrentState()->MouseClick(button, type, x, y);
-}
-
-void keyboard(unsigned char key, int, int)
-{
-	if (key == 27)
-		exit(0);	
-	//std::cout << key << std::endl;
-	keys[key] = true;
-}
-
-void keyboardup(unsigned char key, int, int)
-{
-	keys[key] = false;
-}
 
 int main(int argc, char* argv[])
 {
-	//Init GLUT
+	app = new CrystalPoint();
 	glutInit(&argc, argv);
 
-	//Configre OpenGL and FreeGLut
 	configureOpenGL();
 
-	//Bind functions
+	app->init();
-	bindFuncOpenGL();
 
-	//Init models
+	glutDisplayFunc([]() { app->draw(); } );
-	loadModels();
+	glutIdleFunc([]() { app->update(); } );
-
+	glutReshapeFunc([](int w, int h) { CrystalPoint::width = w; CrystalPoint::height = h; glViewport(0, 0, w, h); });
-	//Start the main loop
-	glutMainLoop();
-	return 0;
-}
-
-void bindFuncOpenGL()
-{
-	glutDisplayFunc(display);
-	glutIdleFunc(idle);
-	glutReshapeFunc([](int w, int h) { Width = w; Height= h; glViewport(0, 0, w, h); });
 
 	//Keyboard
-	glutKeyboardFunc(keyboard);
+	glutKeyboardFunc([](unsigned char c, int, int) { app->keyboardState.keys[c] = true; });
-	glutKeyboardUpFunc(keyboardup);
+	glutKeyboardUpFunc([](unsigned char c, int, int) { app->keyboardState.keys[c] = false; });
+	glutSpecialFunc([](int c, int, int) { app->keyboardState.special[c] = true; });
+	glutSpecialUpFunc([](int c, int, int) { app->keyboardState.special[c] = false; });
+	
+	auto mousemotion = [](int x, int y)
+	{
+		if (justMoved)
+		{
+			justMoved = false;
+			return;
+		}
+		int dx = x - app->width / 2;
+		int dy = y - app->height / 2;
+		if ((dx != 0 || dy != 0) && abs(dx) < 400 && abs(dy) < 400)
+		{
+			app->mouseOffset = app->mouseOffset + Vec2f(dx, dy);
+			glutWarpPointer(app->width / 2, app->height / 2);
+			justMoved = true;
+		}
+	};
 
 	//Mouse
-	glutMouseFunc(mouse);
 	glutPassiveMotionFunc(mousemotion);
+	glutMotionFunc(mousemotion);
 
+	auto mouseclick = [](int button, int state,
+		int x, int y)
+	{
+		if (button == GLUT_LEFT_BUTTON)
+			Cursor::getInstance()->state = state;
+
+			//std::cout << "Left button is down" << std::endl;
+	};
+
+	glutMouseFunc(mouseclick);
+
+	CrystalPoint::height = GLUT_WINDOW_HEIGHT;
+	CrystalPoint::width = GLUT_WINDOW_WIDTH;
+
+	glutMainLoop();
+
+	delete app;
+	return 0;
 }
 
 void configureOpenGL()
 {
 	//Init window and glut display mode
 	glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
-	glutInitWindowSize(800, 600);
+	glutInitWindowSize(1440, 900);	
+	//glutInitWindowPosition((glutGet(GLUT_SCREEN_WIDTH) / 2) - (glutGet(GLUT_WINDOW_WIDTH) / 2), (glutGet(GLUT_SCREEN_HEIGHT) / 2) - (glutGet(GLUT_WINDOW_HEIGHT) / 2));
+
 	glutCreateWindow("Crystal Point");	
-	glutFullScreen();
+	//glutFullScreen();
-	//glutPositionWindow((glutGet(GLUT_SCREEN_WIDTH) / 2) - (glutGet(GLUT_WINDOW_WIDTH) / 2), (glutGet(GLUT_SCREEN_HEIGHT) / 2) - (glutGet(GLUT_WINDOW_HEIGHT) / 2));
+
 
 	//Depth testing
 	glEnable(GL_DEPTH_TEST);
@@ -156,32 +98,21 @@ void configureOpenGL()
 	glAlphaFunc(GL_GREATER, 0.01f);
 
 	//Lighting
-	GLfloat mat_specular[] = { 1.0, 1.0, 1.0, 1.0 };
+	GLfloat mat_specular[] = { 0.2, 0.2, 0.2, 0 };
-	GLfloat mat_shininess[] = { 20.0 };
+	//GLfloat mat_shininess[] = { 5.0 };
-	GLfloat light_position[] = { 30.0, 30.0, 30.0, 1.0 };
+	GLfloat light_position[] = { 0.0, 2.0, 1.0, 0 };
-	GLfloat light_diffuse[] = { 2.0, 2.0, 2.0, 1.0 };
+	GLfloat light_diffuse[] = { 1.0, 1.0, 1.0, 0 };
-	GLfloat light_ambient[] = { 2.0, 2.0, 2.0, 1.0 };
+	GLfloat light_ambient[] = { 0.3, 0.3, 0.3, 0 };
-	glClearColor(0.0, 0.0, 0.0, 0.0);
+	glClearColor(0.7, 0.7, 1.0, 1.0);
-	glShadeModel(GL_SMOOTH);
 
-	glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular);
+	//glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular);
-	glMaterialfv(GL_FRONT, GL_SHININESS, mat_shininess);
+	//glMaterialfv(GL_FRONT, GL_SHININESS, mat_shininess);
-	glLightfv(GL_LIGHT0, GL_POSITION, light_position);
+	//glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
-	glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
+	//glLightfv(GL_LIGHT0, GL_AMBIENT, light_ambient);
-	glLightfv(GL_LIGHT0, GL_AMBIENT, light_ambient);
 
 	glEnable(GL_LIGHTING);
 	glEnable(GL_LIGHT0);
+	//glEnable(GL_COLOR_MATERIAL);
 
-	//Cursor
+	glutSetCursor(GLUT_CURSOR_NONE);
-	glutWarpPointer(Width / 2, Height / 2);
-	glutSetCursor(GLUT_CURSOR_CROSSHAIR);
-}
-
-void loadModels() 
-{	
-	statehandler = new StateHandler();
-
-	statehandler->Navigate(statehandler->WORLD_STATE);
-	//models.push_back(new Model("models/weapons/ZwaardMetTextures/TextureZwaard.obj"));
 }

Menu.cpp

@@ -0,0 +1,59 @@
+#include <GL/freeglut.h>
+#include "Menu.h"
+#include "CrystalPoint.h"
+
+Menu::Menu()
+{
+	cursor = Cursor::getInstance();
+}
+
+
+Menu::~Menu()
+{
+}
+
+void Menu::draw(void)
+{
+	//Switch view to Ortho
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(0, CrystalPoint::width, CrystalPoint::height, 0, -10, 10);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	glDisable(GL_LIGHTING);
+	glDisable(GL_DEPTH_TEST);
+	glDisable(GL_TEXTURE_2D);
+
+	glColor4f(60/255.0f, 60/255.0f, 60/255.0f, 0.8f);
+	glBegin(GL_QUADS);
+	glVertex2f(0,0);
+	glVertex2f(0, CrystalPoint::height);
+	glVertex2f(CrystalPoint::width, CrystalPoint::height);
+	glVertex2f(CrystalPoint::width, 0);
+	glEnd();
+
+
+	for (MenuElement* e : elements)
+	{
+		e->draw();
+	}
+
+	cursor->draw();
+
+	glEnable(GL_LIGHTING);
+	glEnable(GL_DEPTH_TEST);
+}
+
+void Menu::update()
+{
+	for (MenuElement* e : elements)
+	{
+		e->update(cursor->mousePosition.x, cursor->mousePosition.y);
+	}
+}
+
+void Menu::AddMenuElement(MenuElement * e)
+{
+	elements.push_back(e);
+}

Menu.h

@@ -0,0 +1,20 @@
+#pragma once
+#include <vector>
+#include "MenuElement.h"
+#include "Cursor.h"
+
+class Menu
+{
+private:
+	std::vector<MenuElement*> elements;
+	Cursor* cursor;
+public:
+	Menu();
+	~Menu();
+
+	void draw(void);
+	void update(void);
+
+	void AddMenuElement(MenuElement* e);
+};
+

MenuElement.cpp

@@ -0,0 +1,12 @@
+#include "MenuElement.h"
+
+MenuElement::MenuElement(Vec2f position)
+{
+	hover = false;
+	this->position = position;
+}
+
+
+MenuElement::~MenuElement()
+{
+}

MenuElement.h

@@ -0,0 +1,17 @@
+#pragma once
+#include "Vector.h"
+#include <string>
+
+class MenuElement
+{
+protected:
+	bool hover;
+	Vec2f position;
+public:
+	MenuElement(Vec2f position);
+	~MenuElement();
+
+	virtual void draw(void) {};
+	virtual void update(int x, int y) {};
+};
+

MenuState.cpp

@@ -1,12 +0,0 @@
-#include "MenuState.h"
-
-
-
-MenuState::MenuState()
-{
-}
-
-
-MenuState::~MenuState()
-{
-}

MenuState.h

@@ -1,10 +0,0 @@
-#pragma once
-#include "Header.h"
-#include "State.h"
-
-class MenuState : public State
-{
-public:
-	MenuState();
-	~MenuState();
-};

Model.cpp

@@ -1,14 +1,20 @@
 #include "Model.h"
 
-#define STB_IMAGE_IMPLEMENTATION
 #include "stb_image.h"
 
-//Prototypes
+#include <iostream>
-vector<string> split(string str, string sep);
+#include <fstream>
-string replace(string str, string toReplace, string replacement);
+#include <string>
-string toLower(string data);
+#include <algorithm>
+#include <cmath>
+#include <cstring>
 
-Model::Model(string fileName)
+//Prototypes
+std::vector<std::string> split(std::string str, std::string sep);
+std::string replace(std::string str, std::string toReplace, std::string replacement);
+std::string toLower(std::string data);
+
+Model::Model(std::string fileName)
 {
 	std::string dirName = fileName;
 	if (dirName.rfind("/") != std::string::npos)
@@ -70,7 +76,7 @@ Model::Model(string fileName)
 
 				for (size_t i = ii - 3; i < ii; i++)	//magische forlus om van quads triangles te maken ;)
 				{
-					Vertex vertex;
+					VertexIndex vertex;
 					std::vector<std::string> indices = split(params[i == (ii - 3) ? 1 : i], "/");
 					if (indices.size() >= 1)	//er is een positie
 						vertex.position = atoi(indices[0].c_str()) - 1;
@@ -115,24 +121,48 @@ Model::Model(string fileName)
 		}
 	}
 	groups.push_back(currentGroup);
+
+	minVertex = vertices[0];
+	maxVertex = vertices[0];
+	for (auto v : vertices)
+	{
+		for (int i = 0; i < 3; i++)
+		{
+			minVertex[i] = fmin(minVertex[i], v[i]);
+			maxVertex[i] = fmax(maxVertex[i], v[i]);
+		}
+	}
+	center = (minVertex + maxVertex) / 2.0f;
+	radius = 0;
+	for (auto v : vertices)
+		radius = fmax(radius, (center.x - v.x) * (center.x - v.x) + (center.z - v.z) * (center.z - v.z));
+	radius = sqrt(radius);
+
+	for (ObjGroup *group : groups)
+	{
+		Optimise(group);
+	}
 }
 
-Model::Model(void)
+void Model::Optimise(ObjGroup *t)
 {
-	Model("models/TextureZwaard.obj");
+	for (Face &face : t->faces)
-}
+	{
+		for (auto &vertex : face.vertices)
+		{
+			t->VertexArray.push_back(Vertex(vertices[vertex.position].x, vertices[vertex.position].y, vertices[vertex.position].z,
+				normals[vertex.normal].x, normals[vertex.normal].y, normals[vertex.normal].z,
+				texcoords[vertex.texcoord].x, texcoords[vertex.texcoord].y));
 
-Model::~Model(void)
-{
 		}
-
+	}
-void Model::AddInstance(ModelInstance* inst)
-{
-	instances.push_back(inst);
 }
 
 void Model::draw()
 {
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_NORMAL_ARRAY);
+	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	for (auto &g : groups)
 	{
 		if (materials[g->materialIndex]->hasTexture)
@@ -163,31 +193,14 @@ void Model::draw()
 			}
 		}
 
-		for (auto &instance : instances)
+		glVertexPointer(3, GL_FLOAT, sizeof(Vertex), ((float*)g->VertexArray.data()) + 0);
-		{
+		glNormalPointer(GL_FLOAT, sizeof(Vertex), ((float*)g->VertexArray.data()) + 3);
-
+		glTexCoordPointer(2, GL_FLOAT, sizeof(Vertex), ((float*)g->VertexArray.data()) + 6);
-			glBegin(GL_TRIANGLES);
+		glDrawArrays(GL_TRIANGLES, 0, g->VertexArray.size());
-			for (auto &f : g->faces)
-			{
-				for (auto &v : f.vertices)
-				{
-					glPushMatrix();
-
-					glTranslatef(instance->translation.x, instance->translation.y, instance->translation.z);
-					glRotatef(instance->rotation.x, 1, 0, 0);
-					glRotatef(instance->rotation.y, 0, 1, 0);
-					glRotatef(instance->rotation.z, 0, 0, 1);
-					glScalef(instance->scale.x, instance->scale.y, instance->scale.z);
-
-					glNormal3f(normals[v.normal].x, normals[v.normal].y, normals[v.normal].z);
-					glTexCoord2f(texcoords[v.texcoord].x, texcoords[v.texcoord].y);
-					glVertex3f(vertices[v.position].x, vertices[v.position].y, vertices[v.position].z);
-				}
-			}
-			glEnd();
-
-		}
 	}
+	glDisableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_NORMAL_ARRAY);
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 }
 
 void Model::loadMaterialFile(std::string fileName, std::string dirName)
@@ -287,6 +300,9 @@ Model::Texture::Texture(const std::string & fileName)
 		imgData);		//data
 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+
 	stbi_image_free(imgData);
 }
 
@@ -295,7 +311,7 @@ void Model::Texture::bind()
 	glBindTexture(GL_TEXTURE_2D, index);
 }
 
-string replace(string str, string toReplace, string replacement)
+std::string replace(std::string str, std::string toReplace, std::string replacement)
 {
 	size_t index = 0;
 	while (true)
@@ -309,7 +325,7 @@ string replace(string str, string toReplace, string replacement)
 	return str;
 }
 
-vector<string> split(string str, string sep)
+std::vector<std::string> split(std::string str, std::string sep)
 {
 	std::vector<std::string> ret;
 	size_t index;
@@ -325,8 +341,43 @@ vector<string> split(string str, string sep)
 	return ret;
 }
 
-inline string toLower(string data)
+inline std::string toLower(std::string data)
 {
 	std::transform(data.begin(), data.end(), data.begin(), ::tolower);
 	return data;
 }
+
+
+
+std::map<std::string, std::pair<Model*, int>> Model::cache;
+
+Model* Model::load(const std::string &fileName)
+{
+	if (cache.find(fileName) == cache.end())
+		cache[fileName] = std::pair<Model*, int>(new Model(fileName), 0);
+	cache[fileName].second++;
+	return cache[fileName].first;
+}
+
+void Model::unload(Model* model)
+{
+	for (auto m : cache)
+	{
+		if (m.second.first == model)
+		{
+			m.second.second--;
+			if (m.second.second == 0)
+			{
+				delete m.second.first;
+				cache.erase(cache.find(m.first));
+				break;
+			}
+
+		}
+	}
+}
+
+Model::~Model(void)
+{
+
+}

Model.h

@@ -1,11 +1,17 @@
 #pragma once
-#include "Header.h"
+
-#include "ModelInstance.h"
+#include <GL/freeglut.h>
+#include <list>
+#include <vector>
+#include <map>
+#include "Vector.h"
+#include "Vertex.h"
 
 class Model
 {
 private:
-	class Vertex
+	
+	class VertexIndex
 	{
 	public:
 		int position;
@@ -16,7 +22,7 @@ private:
 	class Face
 	{
 	public:
-		list<Vertex> vertices;
+		std::list<VertexIndex> vertices;
 	};
 
 	class Texture
@@ -49,7 +55,8 @@ private:
 	public:
 		std::string name;
 		int materialIndex;
-		list<Face> faces;
+		std::list<Face> faces;
+		std::vector<Vertex> VertexArray;
 	};
 
 	std::vector<Vec3f>	vertices;
@@ -58,15 +65,23 @@ private:
 	std::vector<ObjGroup*> groups;
 	std::vector<MaterialInfo*> materials;
 
-	std::vector<ModelInstance*> instances;
-
 	void loadMaterialFile(std::string fileName, std::string dirName);
-public:
+
 	Model(std::string filename);
-	Model(void);
 	~Model(void);
 
-	void AddInstance(ModelInstance* inst);
+	public:
+
+	static std::map<std::string, std::pair<Model*, int> > cache;
+	static Model* load(const std::string &fileName);
+	static void unload(Model* model);
 
 	void draw();
+	void Optimise(ObjGroup *t);
+
+	Vec3f minVertex;
+	Vec3f maxVertex;
+
+	Vec3f center;
+	float radius;
 };

ModelHandler.cpp

@@ -1,12 +0,0 @@
-#include "ModelHandler.h"
-
-
-
-ModelHandler::ModelHandler()
-{
-}
-
-
-ModelHandler::~ModelHandler()
-{
-}

ModelHandler.h

@@ -1,8 +0,0 @@
-#pragma once
-class ModelHandler
-{
-public:
-	ModelHandler();
-	~ModelHandler();
-};
-

ModelInstance.cpp

@@ -1,10 +0,0 @@
-#include "ModelInstance.h"
-
-ModelInstance::ModelInstance()
-{
-}
-
-
-ModelInstance::~ModelInstance()
-{
-}

ModelInstance.h

@@ -1,16 +0,0 @@
-#pragma once
-#include "Header.h"
-
-class ModelInstance
-{
-private:
-public:
-	ModelInstance();
-	~ModelInstance();
-
-	Vec3f translation;
-	Vec3f rotation;
-	Vec3f scale;
-
-};
-

Mouse.cpp

@@ -1,12 +0,0 @@
-#include "Mouse.h"
-
-
-
-Mouse::Mouse()
-{
-}
-
-
-Mouse::~Mouse()
-{
-}

Mouse.h

@@ -1,10 +0,0 @@
-#pragma once
-#include "Header.h"
-
-class Mouse
-{
-public:
-	Mouse();
-	~Mouse();
-};
-

Player.cpp

@@ -1,77 +1,221 @@
+#define _USE_MATH_DEFINES
+#include <cmath>
 #include "Player.h"
+#include <GL/freeglut.h>
+
+#include <string>
+#include <iostream>
+#include <fstream>
+
+Player* Player::instance = NULL;
 
 Player::Player()
 {
+	speed = 10;
+	maxHp = 100;
+	health = maxHp;
+	xp = 0;
+	maxXp = 100;
+	level = 1;
+	crystals = 0;
 
+	loadWeapons();
+
+	currentleftweapon = 0;
+	leftWeapon = leftweapons[0];
+	leftWeapon->rotateWeapon(Vec3f(150, 0, 60));
+
+	currentrightweapon = 0;
+	rightWeapon = rightweapons[0];
+	rightWeapon->rotateWeapon(Vec3f(150, 0, 60));
 }
 
-
+Player* Player::getInstance()
-Player::~Player()
 {
-	if(right != nullptr)
+	if (instance == nullptr)
-		delete right;
+		instance = new Player();
-	if(left != nullptr)
-		delete left;
-	/*if (player != nullptr)
-		delete player;*/
-}
 
-void Player::Display(void)
-{
-	if (right != nullptr)
-	{			
-		right->draw_weapon();		
-	}
-		
-	if (left != nullptr)
-	{		
-		left->draw_weapon();		
-	}
-
-	/*glRotatef(player->eyes.rotX, 1, 0, 0);
-	glRotatef(player->eyes.rotY, 0, 1, 0);
-	glTranslatef(player->eyes.posX, player->eyes.posY, player->eyes.posZ);*/
-	glRotatef(eyes.rotX, 1, 0, 0);
-	glRotatef(eyes.rotY, 0, 1, 0);
-	glTranslatef(eyes.posX, eyes.posY, eyes.posZ);
-}
-
-Player & Player::GetInstance(void)
-{
-	static Player instance;
 	return instance;
 }
 
-//Player * Player::GetInstance(void)
+void Player::init()
-//{
-//	if (player == nullptr)
-//		player = new Player();
-//	return player;
-//}
-
-void Player::PlayerMoveEyes(float angle, float fac, bool heigth)
 {
-	//player movement
+	instance = new Player();
+}
 
-	/*if (heigth)
+Player::~Player()
-		player->eyes.posY += angle*fac;
+{
+	if (leftWeapon)
+		delete leftWeapon;
+
+	if (rightWeapon)
+		delete rightWeapon;
+}
+
+void Player::setCamera()
+{
+	glRotatef(rotation.x, 1, 0, 0);
+	glRotatef(rotation.y, 0, 1, 0);
+	glTranslatef(-position.x, -position.y, -position.z);
+
+	leftWeapon->rotate(rotation);
+	rightWeapon->rotate(rotation);
+
+}
+
+void Player::setPosition(float angle, float fac, bool height)
+{	
+	if (height)
+		position.y += angle*fac;
 	else
 	{
-		player->eyes.posX += (float)cos((player->eyes.rotY + angle) / 180 * M_PI) * fac;
+		position.x -= (float)cos((rotation.y + angle) / 180 * M_PI) * fac;
-		player->eyes.posZ += (float)sin((player->eyes.rotY + angle) / 180 * M_PI) * fac;
+		position.z -= (float)sin((rotation.y + angle) / 180 * M_PI) * fac;
-	}*/
+	}
-	if (heigth)
+
-		eyes.posY += angle*fac;
+	leftWeapon->move(position);
+	rightWeapon->move(position);
+}
+
+void Player::draw() {
+	leftWeapon->draw();
+	rightWeapon->draw();
+}
+
+void Player::HpDown(int damage)
+{
+	int newHealth = health - damage;
+	if (newHealth <= 0)
+	{
+		exit(0);
+	}
+	health = newHealth;
+}
+
+void Player::HpUp(int hp)
+{
+	if (health != maxHp)
+	{
+		int newHealth = health + hp;
+		if (newHealth >= maxHp)
+		{
+			newHealth = maxHp;
+		}
+		health = newHealth;
+	}	
+}
+
+void Player::XpUp(int xpUp)
+{
+	float newXp = xp + xpUp;
+	if (newXp >= maxXp)
+	{
+		newXp -= maxXp;		
+		levelUp();
+	}
+	xp = newXp;
+}
+
+
+void Player::levelUp()
+{
+	level++;
+	maxXp += 50;
+	maxHp += 10;
+	health = maxHp;
+}
+
+void Player::loadWeapons()
+{
+	std::string fileName = "weapons.json";
+
+	//Open world json file
+	std::ifstream file(fileName);
+	if (!file.is_open())
+		std::cout << "Error, can't open world file - " << fileName << "\n";
+
+	json::Value v = json::readJson(file);
+	file.close();
+
+	//Check file
+	if (v["weapons"].isNull())
+		std::cout << "Invalid weapons file: " << fileName << "\n";
+
+	//Load object templates
+	for (auto w : v["weapons"])
+	{
+		Weapon* lweapon;
+		Weapon* rweapon;
+
+		std::string name = w["name"].asString();
+		std::string fileN = w["file"].asString();
+		float damage = w["damage"].asFloat();
+
+		Weapon::Element e = Weapon::FIRE;
+
+		if(w["element"].asString() == "fire")
+			e = Weapon::FIRE;
+		else if (w["element"].asString() == "water")
+			e = Weapon::WATER;
+		else if (w["element"].asString() == "earth")
+			e = Weapon::EARTH;
+		else if (w["element"].asString() == "air")
+			e = Weapon::AIR;
 		else
-	{
+			e = Weapon::FIRE;
-		eyes.posX += (float)cos((eyes.rotY + angle) / 180 * M_PI) * fac;
+
-		eyes.posZ += (float)sin((eyes.rotY + angle) / 180 * M_PI) * fac;
+
-	}
+		Vec3f leftoffset = Vec3f(w["left"]["offset"][0].asFloat(), w["left"]["offset"][1].asFloat(), w["left"]["offset"][2].asFloat());
+		Vec3f rightoffset = Vec3f(w["right"]["offset"][0].asFloat(), w["right"]["offset"][1].asFloat(), w["right"]["offset"][2].asFloat());
+
+		Vec3f anchor = Vec3f(w["anchor"][0].asFloat(), w["anchor"][1].asFloat(), w["anchor"][2].asFloat());
+		Vec3f collision = Vec3f(w["collision"][0].asFloat(), w["collision"][1].asFloat(), w["collision"][2].asFloat());
+
+		Vec2f maxRot = Vec2f(w["maxRotation"][0].asFloat(), w["maxRotation"][1].asFloat());
+		Vec2f minRot = Vec2f(w["minRotation"][0].asFloat(), w["minRotation"][1].asFloat());
+
+		lweapon = new Weapon(name, damage, e, fileN, 1, position, rotation, leftoffset, anchor, maxRot, minRot, collision);
+		rweapon = new Weapon(name, damage, e, fileN, 1, position, rotation, rightoffset, anchor, maxRot, minRot, collision);
+
+		leftweapons.push_back(lweapon);
+		rightweapons.push_back(rweapon);
 	}
 	
-void Player::PlayerRotateEyes(int dx, int dy)
-{
-	eyes.rotY += dx / 10.0f;
-	eyes.rotX += dy / 10.0f;
 }
 
+void Player::PreviousRightWeapon()
+{
+	currentrightweapon--;
+
+	if (currentrightweapon < 0)
+		currentrightweapon = (rightweapons.size() > level ? level - 1 : rightweapons.size() - 1);
+
+	rightWeapon = rightweapons[currentrightweapon];
+}
+void Player::NextRightWeapon(void)
+{
+	currentrightweapon++;
+
+	if (currentrightweapon > level - 1 || currentrightweapon > rightweapons.size() - 1)
+		currentrightweapon = 0;
+
+	rightWeapon = rightweapons[currentrightweapon];
+}
+void Player::PreviousLeftWeapon(void)
+{
+	currentleftweapon--;
+
+	if (currentleftweapon < 0)
+		currentleftweapon = (leftweapons.size() > level ? level - 1 : leftweapons.size() - 1);
+
+	leftWeapon = leftweapons[currentleftweapon];
+}
+void Player::NextLeftWeapon(void)
+{
+	currentleftweapon++;
+
+	if (currentleftweapon > level - 1 || currentleftweapon > leftweapons.size() - 1)
+		currentleftweapon = 0;
+
+	leftWeapon = leftweapons[currentleftweapon];
+}

Player.h

@@ -1,38 +1,53 @@
 #pragma once
-#include "Header.h"
+#include "Vector.h"
 #include "Weapon.h"
+#include "json.h"
+
+#include <vector>
 
 class Player
 {
+private:
+	static Player* instance;
+	void levelUp();
+
+	std::vector<Weapon*> leftweapons;
+	std::vector<Weapon*> rightweapons;
+	void loadWeapons(void);
+
+	int currentrightweapon;
+	int currentleftweapon;
+
 public:
+	Player();
 	~Player();
 
-	struct Eyes
+	void setCamera();
-	{
+	void setPosition(float angle, float fac, bool height);
-		float posX = 0;
+	void draw(void);
-		float posY = 0;
-		float posZ = 0;
-		float rotX = 0;
-		float rotY = 0;
-	} eyes;	
 
-	void Display(void);
+	static Player* getInstance(void);
-	//static Player* GetInstance(void);
+	static void init(void);
-	static Player& GetInstance(void);
 
+	Vec3f position;
+	Vec2f rotation;
 
-	void PlayerMoveEyes(const float angle, const float fac, const bool heigth);
+	Weapon* leftWeapon;
-	void PlayerRotateEyes(const int dx, const int dy);
+	Weapon* rightWeapon;
-private:
+
+	float health, maxHp;
+	float xp, maxXp;
 	int level;
-	int xp;
+	int crystals;
-	Weapon* right = nullptr;
-	Weapon* left = nullptr;
-	vector<Weapon> weapons;
-	Player();
-	Player(Player const&);
-	void operator=(Player const&);
 
-	//static Player* player;
+	float speed;
+
+	void HpUp(int);
+	void HpDown(int);
+	void XpUp(int);
+
+	void PreviousRightWeapon(void);
+	void NextRightWeapon(void);
+	void PreviousLeftWeapon(void);
+	void NextLeftWeapon(void);
 };
-

Portal.cpp

@@ -0,0 +1,61 @@
+#include "Portal.h"
+#include "Model.h"
+#include <iostream>
+#include "Player.h"
+#include "WorldHandler.h"
+
+Portal::Portal(const std::string &fileName,
+	const Vec3f &position,
+	Vec3f &rotation,
+	const float &scale)
+{
+	model = Model::load(fileName);
+	this->position = position;
+	this->rotation = rotation;
+	this->scale = scale;
+	this->canCollide = true;
+
+	started = false;
+	delay = 0;
+
+	sound_id = CrystalPoint::GetSoundSystem().LoadSound("WAVE/portal.wav", false);
+	music = CrystalPoint::GetSoundSystem().GetSound(sound_id);
+	music->SetPos(position, Vec3f());
+
+	mayEnter = false;
+	maxCrystals = 0;
+}
+
+
+Portal::~Portal()
+{
+//	Model::unload(model);
+	CrystalPoint::GetSoundSystem().UnloadSound(sound_id);
+}
+
+void Portal::collide()
+{		
+	if (maxCrystals == (Player::getInstance()->crystals) && !mayEnter)
+	{
+		canCollide = false;
+		mayEnter = true;
+	}
+}
+
+bool Portal::enter(float deltaTime)
+{
+	if (delay > 3 && started)
+	{
+		delay = 0;
+		return true;
+	}
+
+	if (delay == 0 && !started)
+	{
+		music->Play();
+		started = true;
+	}
+
+	delay += deltaTime;
+	return false;
+}

Portal.h

@@ -0,0 +1,27 @@
+#pragma once
+#include "Entity.h"
+#include <string>
+#include "CrystalPoint.h"
+
+class Portal :
+	public Entity
+{
+public:
+	Portal(const std::string &fileName,
+		const Vec3f &position,
+		Vec3f &rotation,
+		const float &scale);
+	~Portal();
+
+	bool enter(float deltaTime);
+
+	void collide();
+	int maxCrystals;
+	bool mayEnter;
+private:
+	int sound_id;
+	Sound* music;
+	bool started;
+	float delay;
+};
+

README.md

@@ -1,2 +0,0 @@
-# CrystalPoint
-Crystal Point: The Elemental Labyrinth

ReadMe.txt

@@ -0,0 +1,40 @@
+========================================================================
+    CONSOLE APPLICATION : CrystalPoint Project Overview
+========================================================================
+
+AppWizard has created this CrystalPoint application for you.
+
+This file contains a summary of what you will find in each of the files that
+make up your CrystalPoint application.
+
+
+CrystalPoint.vcxproj
+    This is the main project file for VC++ projects generated using an Application Wizard.
+    It contains information about the version of Visual C++ that generated the file, and
+    information about the platforms, configurations, and project features selected with the
+    Application Wizard.
+
+CrystalPoint.vcxproj.filters
+    This is the filters file for VC++ projects generated using an Application Wizard. 
+    It contains information about the association between the files in your project 
+    and the filters. This association is used in the IDE to show grouping of files with
+    similar extensions under a specific node (for e.g. ".cpp" files are associated with the
+    "Source Files" filter).
+
+CrystalPoint.cpp
+    This is the main application source file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+    These files are used to build a precompiled header (PCH) file
+    named CrystalPoint.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////

SettingsState.cpp

@@ -1,12 +0,0 @@
-#include "SettingsState.h"
-
-
-
-SettingsState::SettingsState()
-{
-}
-
-
-SettingsState::~SettingsState()
-{
-}

SettingsState.h

@@ -1,11 +0,0 @@
-#pragma once
-#include "Header.h"
-#include "State.h"
-
-class SettingsState : public State
-{
-public:
-	SettingsState();
-	~SettingsState();
-};
-

Skybox.cpp

@@ -0,0 +1,166 @@
+#include "cmath"
+#include <GL/freeglut.h>
+
+#include "Util.h"
+#include "stb_image.h"
+#include "Skybox.h"
+#include <string>
+#include <iostream>
+
+enum{SKY_LEFT=0,SKY_BACK,SKY_RIGHT,SKY_FRONT,SKY_TOP,SKY_BOTTOM};
+GLuint skybox[6];
+
+Skybox::Skybox(const float &size, const std::string &folder)
+{
+	this->size = size;
+	this->folder = folder;
+
+	brightness = 80;
+	targetBrightness = 80;
+}
+
+Skybox::~Skybox()
+{
+	glDeleteTextures(6, &skybox[0]);
+}
+
+void Skybox::init() 
+{
+	skybox[SKY_LEFT] = Util::loadTexture(folder + "left.png");
+	skybox[SKY_BACK] = Util::loadTexture(folder + "back.png");
+	skybox[SKY_RIGHT] = Util::loadTexture(folder + "right.png");
+	skybox[SKY_FRONT] = Util::loadTexture(folder + "front.png");
+	skybox[SKY_TOP] = Util::loadTexture(folder + "top.png");
+	skybox[SKY_BOTTOM] = Util::loadTexture(folder + "bottom.png");
+}
+
+void Skybox::draw()
+{
+	glColor4f(brightness/255, brightness/255, brightness/255, 1);
+
+	bool b1 = glIsEnabled(GL_TEXTURE_2D);
+	glDisable(GL_LIGHTING);
+	glDisable(GL_DEPTH_TEST);
+	glEnable(GL_TEXTURE_2D);
+	glDisable(GL_COLOR_MATERIAL);
+
+	glBindTexture(GL_TEXTURE_2D, skybox[SKY_BACK]);
+	glBegin(GL_QUADS);
+		glTexCoord2f(1,1);
+		glVertex3f(size / 2, size / 2, size / 2);
+		glTexCoord2f(0,1);
+		glVertex3f(-size / 2, size / 2, size / 2);
+		glTexCoord2f(0,0);
+		glVertex3f(-size / 2, -size / 2, size / 2);
+		glTexCoord2f(1,0);
+		glVertex3f(size / 2, -size / 2, size / 2);
+	glEnd();
+
+	glBindTexture(GL_TEXTURE_2D, skybox[SKY_LEFT]);
+	glBegin(GL_QUADS);
+		//left face
+		glTexCoord2f(1,1);
+		glVertex3f(-size / 2, size / 2, size / 2);
+		glTexCoord2f(0,1);
+		glVertex3f(-size / 2, size / 2, -size / 2);
+		glTexCoord2f(0,0);
+		glVertex3f(-size / 2, -size / 2, -size / 2);
+		glTexCoord2f(1,0);
+		glVertex3f(-size / 2, -size / 2, size / 2);
+	glEnd();
+	glBindTexture(GL_TEXTURE_2D, skybox[SKY_FRONT]);
+	glBegin(GL_QUADS);
+		//front face
+		glTexCoord2f(0, 1);
+		glVertex3f(size / 2, size / 2, -size / 2);
+		glTexCoord2f(1, 1);
+		glVertex3f(-size / 2, size / 2, -size / 2);
+		glTexCoord2f(1, 0);
+		glVertex3f(-size / 2, -size / 2, -size / 2);
+		glTexCoord2f(0, 0);
+		glVertex3f(size / 2, -size / 2, -size / 2);
+	glEnd();
+	glBindTexture(GL_TEXTURE_2D, skybox[SKY_RIGHT]);
+	glBegin(GL_QUADS);
+		//right face
+		glTexCoord2f(1, 1);
+		glVertex3f(size / 2, size / 2, -size / 2);
+		glTexCoord2f(0,1);
+		glVertex3f(size / 2, size / 2, size / 2);
+		glTexCoord2f(0,0);
+		glVertex3f(size / 2, -size / 2, size / 2);
+		glTexCoord2f(1, 0);
+		glVertex3f(size / 2, -size / 2, -size / 2);
+	glEnd();
+	glBindTexture(GL_TEXTURE_2D, skybox[SKY_TOP]);
+	glBegin(GL_QUADS);                      //top face
+		glTexCoord2f(0,0);
+		glVertex3f(size / 2, size / 2, size / 2);
+		glTexCoord2f(0,1);
+		glVertex3f(-size / 2, size / 2, size / 2);
+		glTexCoord2f(1,1);
+		glVertex3f(-size / 2, size / 2, -size / 2);
+		glTexCoord2f(1,0);
+		glVertex3f(size / 2, size / 2, -size / 2);
+	glEnd();
+	glBindTexture(GL_TEXTURE_2D, skybox[SKY_BOTTOM]);
+	glBegin(GL_QUADS);
+		//bottom face
+		glTexCoord2f(0,1);
+		glVertex3f(size / 2, -size / 2, size / 2);
+		glTexCoord2f(0,0);
+		glVertex3f(-size / 2, -size / 2, size / 2);
+		glTexCoord2f(1,0);
+		glVertex3f(-size / 2, -size / 2, -size / 2);
+		glTexCoord2f(1,1);
+		glVertex3f(size / 2, -size / 2, -size / 2);
+	glEnd();
+	glEnable(GL_LIGHTING);  //turn everything back, which we turned on, and turn everything off, which we have turned on.
+	glEnable(GL_DEPTH_TEST);
+	if (!b1)
+		glDisable(GL_TEXTURE_2D);
+}
+
+void Skybox::update(float deltaTime, int curr, int max)
+{
+	targetBrightness = 80 + ((255 - 80) / max) * curr;
+
+	if (targetBrightness > brightness + 2)
+	{
+		brightness += 20 * deltaTime;
+	}
+
+	if (targetBrightness < brightness - 2)
+	{
+		brightness -= 20 * deltaTime;
+	}
+}
+
+GLuint Skybox::loadTexture(const std::string & fileName)  //load the filename named texture
+{
+	int width, height, bpp;
+
+	stbi_set_flip_vertically_on_load(true);
+	unsigned char* imgData = stbi_load(fileName.c_str(), &width, &height, &bpp, 4);
+	GLuint num;
+	glGenTextures(1, &num);
+	glBindTexture(GL_TEXTURE_2D, num);
+
+	glTexImage2D(GL_TEXTURE_2D,
+		0,		//level
+		GL_RGBA,		//internal format
+		width,		//width
+		height,		//height
+		0,		//border
+		GL_RGBA,		//data format
+		GL_UNSIGNED_BYTE,	//data type
+		imgData);		//data
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+
+	stbi_image_free(imgData);
+	return num;
+}
+

Skybox.h

@@ -0,0 +1,21 @@
+#pragma once
+#include <string>
+ 
+class Skybox
+{
+private:
+	float size;
+	std::string folder;
+	float brightness;
+	float targetBrightness;
+public:
+	Skybox(const float &size, const std::string &folder);
+	~Skybox();
+
+	void init();
+	void draw();
+
+	void update(float deltaTime, int, int);
+	GLuint loadTexture(const std::string &fileName);
+
+};

Sound.cpp

@@ -0,0 +1,167 @@
+#include "Sound.h"
+
+#include <iostream>
+#ifdef WIN32
+#include <windows.h>
+#include <al.h>
+#else
+#include <AL/al.h>
+typedef unsigned long DWORD;
+typedef unsigned short WORD;
+typedef unsigned int UNINT32;
+typedef unsigned char BYTE;
+#endif
+
+
+Sound::Sound(const char* inWavPath, bool inLooping):
+	buffer_id(0),
+	source_id(0),
+	is_looping(inLooping)
+{
+	const char* path = inWavPath;
+
+	FILE *fp = fopen(path, "rb");													// Open the WAVE file
+	if (!fp)
+		return;																		// Could not open file
+
+	// Check that the WAVE file is OK
+	char type[4];
+	fread(type, sizeof(char), 4, fp);												// Reads the first bytes in the file
+	if (type[0] != 'R' || type[1] != 'I' || type[2] != 'F' || type[3] != 'F')		// Should be "RIFF"
+		return;																// Not RIFF
+
+	DWORD size;
+	fread(&size, sizeof(DWORD), 1, fp);												// Continue to read the file
+	fread(type, sizeof(char), 4, fp);												// Continue to read the file
+	if (type[0] != 'W' || type[1] != 'A' || type[2] != 'V' || type[3] != 'E')		// This part should be "WAVE"
+		return;																		// Not WAVE
+
+	fread(type, sizeof(char), 4, fp);												// Continue to read the file
+	if (type[0] != 'f' || type[1] != 'm' || type[2] != 't' || type[3] != ' ')		// This part should be "fmt "
+		return;																		// Not fmt 
+
+	// Now we know that the file is a acceptable WAVE file
+	// Info about the WAVE data is now read and stored
+	DWORD chunkSize;
+	fread(&chunkSize, sizeof(DWORD), 1, fp);
+	short formatType;
+	fread(&formatType, sizeof(short), 1, fp);
+	short channels;
+	fread(&channels, sizeof(short), 1, fp);
+	DWORD sampleRate;
+	fread(&sampleRate, sizeof(DWORD), 1, fp);
+	DWORD avgBytesPerSec;
+	fread(&avgBytesPerSec, sizeof(DWORD), 1, fp);
+	short bytesPerSample;
+	fread(&bytesPerSample, sizeof(short), 1, fp);
+	short bitsPerSample;
+	fread(&bitsPerSample, sizeof(short), 1, fp);
+	ALenum format = 0;																// The audio format (bits per sample, number of channels)
+	if (bitsPerSample == 8)
+	{
+		if (channels == 1)
+			format = AL_FORMAT_MONO8;
+		else if (channels == 2)
+			format = AL_FORMAT_STEREO8;
+	}
+	else if (bitsPerSample == 16)
+	{
+		if (channels == 1)
+			format = AL_FORMAT_MONO16;
+		else if (channels == 2)
+			format = AL_FORMAT_STEREO16;
+	}
+	if (!format)
+		return;																		// Not valid format
+
+	fread(type, sizeof(char), 4, fp);
+	if (type[0] != 'd' || type[1] != 'a' || type[2] != 't' || type[3] != 'a')       // This part should be "data"
+		return;																		// not data
+
+	DWORD dataSize;
+	fread(&dataSize, sizeof(DWORD), 1, fp);											// The size of the sound data is read
+
+	// Display the info about the WAVE file
+	std::cout << "Chunk Size: " << chunkSize << "\n";
+	std::cout << "Format Type: " << formatType << "\n";
+	std::cout << "Channels: " << channels << "\n";
+	std::cout << "Sample Rate: " << sampleRate << "\n";
+	std::cout << "Average Bytes Per Second: " << avgBytesPerSec << "\n";
+	std::cout << "Bytes Per Sample: " << bytesPerSample << "\n";
+	std::cout << "Bits Per Sample: " << bitsPerSample << "\n";
+	std::cout << "Data Size: " << dataSize << "\n";
+
+	unsigned char* buf = new unsigned char[dataSize];								// Allocate memory for the sound data
+	std::cout << fread(buf, sizeof(BYTE), dataSize, fp) << " bytes loaded\n";		// Read the sound data and display the 
+	fclose(fp);
+
+	alGenBuffers(1, &buffer_id);														// Generate one OpenAL Buffer and link to "buffer"
+	alGenSources(1, &source_id);														// Generate one OpenAL Source and link to "source"
+	if (alGetError() != AL_NO_ERROR)
+		return;																		// Error during buffer/source generation
+
+	alBufferData(buffer_id, format, buf, dataSize, sampleRate);						// Store the sound data in the OpenAL Buffer
+	if (alGetError() != AL_NO_ERROR)
+		return;																		// Error during buffer loading
+
+	delete[] buf;																// Delete the sound data buffer
+}
+
+
+Sound::~Sound()
+{
+	alSourceStop(source_id);
+	alDeleteSources(1, &source_id);												// Delete the OpenAL Source
+	alDeleteBuffers(1, &buffer_id);												// Delete the OpenAL Buffer
+}
+
+
+void Sound::SetPos(const Vec3f& inPos, const Vec3f& inVel)
+{
+	alSourcei(source_id, AL_BUFFER, buffer_id);									// Link the buffer to the source
+	alSourcef(source_id, AL_PITCH, 1.0f);										// Set the pitch of the source
+	alSourcef(source_id, AL_GAIN, 1.0f);										// Set the gain of the source
+	alSourcefv(source_id, AL_POSITION, inPos.v);								// Set the position of the source
+	alSourcefv(source_id, AL_VELOCITY, inVel.v);								// Set the velocity of the source
+	alSourcei(source_id, AL_LOOPING, is_looping ? AL_TRUE : AL_FALSE);			// Set if source is looping sound
+}
+
+
+void Sound::Play()
+{
+	alSourcePlay(source_id);
+	int e = alGetError(); // != AL_NO_ERROR) return;
+}
+
+
+void Sound::Pause()
+{
+	alSourcePause(source_id);
+}
+
+
+void Sound::Stop()
+{
+	alSourceStop(source_id);
+}
+
+bool Sound::IsPlaying()
+{
+	ALenum state;
+
+	alGetSourcei(source_id, AL_SOURCE_STATE, &state);
+
+	return (state == AL_PLAYING);
+}
+
+bool Sound::IsStopped()
+{
+	ALenum state;
+
+	alGetSourcei(source_id, AL_SOURCE_STATE, &state);
+
+	std::cout << "MUSIC STATE: " << state << std::endl;
+
+	return (state == AL_STOPPED);
+}
+

Sound.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "Vector.h"
+
+class Sound
+{
+public:
+	Sound(const char* inWavPath, bool inLooping);
+	~Sound();
+
+	void SetPos(const Vec3f& inPos, const Vec3f& inVel);
+
+	void Play();
+	void Pause();
+	void Stop();
+	bool IsPlaying();
+	bool IsStopped();
+
+private:
+	unsigned int buffer_id;
+	unsigned int source_id;
+
+	bool is_looping;
+};

SoundSystem.cpp

@@ -0,0 +1,58 @@
+#include "SoundSystem.h"
+
+SoundSystem::SoundSystem():
+	device(nullptr),
+	context(nullptr)
+{
+	device = alcOpenDevice(nullptr);
+	if (!device) 
+		return;
+	context = alcCreateContext(device, nullptr);
+	if (!context)
+		return;
+	alcMakeContextCurrent(context);
+}
+
+
+SoundSystem::~SoundSystem()
+{
+	for (auto sound : sounds)
+		delete sound;
+	alcMakeContextCurrent(nullptr);
+	alcDestroyContext(context); 
+	alcCloseDevice(device);
+}
+
+
+void SoundSystem::SetListener(const Vec3f& inPos, const Vec3f& inVel, const Vec3f& inOri)
+{
+	ALfloat orientation[] = { 0.0, 0.0, -1.0,  0.0, 1.0, 0.0 };
+                                                                           
+	alListenerfv(AL_POSITION, inPos.v);
+	alListenerfv(AL_VELOCITY, inVel.v);
+	alListenerfv(AL_ORIENTATION, orientation);
+}
+
+
+unsigned int SoundSystem::LoadSound(const char* inWavPath, bool inLooping)
+{
+	Sound* sound = new Sound(inWavPath, inLooping);
+	sounds.push_back(sound);
+	return sounds.size() - 1;
+}
+
+
+Sound* SoundSystem::GetSound(unsigned int inID)
+{
+	if (inID > sounds.size())
+		return nullptr;
+	return sounds[inID];
+}
+
+void SoundSystem::UnloadSound(unsigned int inID)
+{
+	if (inID > sounds.size())
+		return;
+	delete sounds[inID];
+	//sounds.erase(sounds.begin() + inID);
+}

SoundSystem.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <vector>
+
+#ifdef WIN32
+#include <al.h>
+#include <alc.h>
+#else
+#include <AL/al.h>
+#include <AL/alc.h>
+#endif
+
+#include "Vector.h"
+#include "Sound.h"
+
+
+class SoundSystem
+{
+public:
+	SoundSystem();
+	~SoundSystem();
+
+	void SetListener(const Vec3f& inPos, const Vec3f& inVel, const Vec3f& inOri);
+
+	unsigned int LoadSound(const char* inWavPath, bool inLooping);
+	Sound* GetSound(unsigned int inID);
+	void UnloadSound(unsigned int inID);
+
+private:
+	ALCdevice* device;
+	ALCcontext* context;
+	std::vector<Sound*> sounds;
+};

State.cpp

@@ -1,40 +0,0 @@
-#include "State.h"
-
-
-
-State::State()
-{
-}
-
-
-State::~State()
-{
-}
-
-void State::Entry()
-{
-}
-
-void State::Exit()
-{
-}
-
-void State::Idle(float delta)
-{
-}
-
-void State::Display()
-{
-}
-
-void State::Keyboard(bool keys[255],float deltaTime)
-{
-}
-
-void State::MouseMove(int x, int y, int dx, int dy)
-{
-}
-
-void State::MouseClick(int button, int type, int x, int y)
-{
-}

State.h

@@ -1,26 +0,0 @@
-#pragma once
-#include "Header.h"
-
-class State
-{
-public:
-	State();
-	~State();
-
-	virtual void Entry();
-	virtual void Exit();
-
-	virtual void Idle(float delta);
-	virtual void Display();
-
-	virtual void Keyboard(bool keys[255],float deltaTime);
-	virtual void MouseMove(int x, int y, int dx, int dy);
-	virtual void MouseClick(int button, int type, int x, int y);
-};
-
-#include "InitState.h"
-#include "LoadingState.h"
-#include "MenuState.h"
-#include "SettingsState.h"
-#include "WorldState.h"
-

StateHandler.cpp

@@ -1,33 +0,0 @@
-#include "StateHandler.h"
-
-StateHandler::StateHandler()
-{
-	StateList.push_back(new InitState()); //INIT_STATE
-	StateList.push_back(new LoadingState()); //LOADING_STATE
-	StateList.push_back(new MenuState()); //MENU_STATE
-	StateList.push_back(new SettingsState()); //SETTINGS_STATE
-	StateList.push_back(new WorldState()); //WORLD_STATE
-
-	//CurrentState = INIT_STATE;
-	CurrentState = WORLD_STATE;
-}
-
-
-StateHandler::~StateHandler()
-{
-}
-
-void StateHandler::Navigate(EState state)
-{
-	if (CurrentState == state)
-		return;
-
-	StateList.at(CurrentState)->Exit();
-	CurrentState = state;
-	StateList.at(CurrentState)->Entry();
-}
-
-State* StateHandler::GetCurrentState()
-{
-	return StateList.at(CurrentState);
-}

StateHandler.h

@@ -1,19 +0,0 @@
-#pragma once
-#include "Header.h"
-#include "State.h"
-
-class StateHandler
-{
-public:
-	enum EState { INIT_STATE = 0, LOADING_STATE = 1, MENU_STATE = 2, SETTINGS_STATE = 3, WORLD_STATE = 4 };
-
-	StateHandler();
-	~StateHandler();
-
-	void Navigate(EState state);
-	State* GetCurrentState();
-private:
-	EState CurrentState;
-	vector<State*> StateList;
-};
-

Text.cpp

@@ -0,0 +1,31 @@
+#include "Text.h"
+
+
+Text::Text(const std::string &text, Vec2f position) : MenuElement(position)
+{
+	this->text = text;
+	color = Vec3f(50, 150, 150);
+	textHeight = 14;
+	textWidth = Util::glutTextWidth(text);
+}
+
+
+Text::~Text()
+{
+}
+
+void Text::draw()
+{
+	glColor4f(color.x/255.0f, color.y/255.0f, color.z/255.0f, 1.0f);
+	Util::glutBitmapString(text, position.x-1, position.y+textHeight);
+}
+
+void Text::update(int x, int y)
+{
+	//Do nothing
+}
+
+void Text::setColor(Vec3f color)
+{
+	this->color = color;
+}

Text.h

@@ -0,0 +1,23 @@
+#pragma once
+#include "MenuElement.h"
+#include "Vector.h"
+#include "Util.h"
+
+class Text : public MenuElement
+{
+private:
+	std::string text;
+	Vec3f color;	
+protected:
+	int textWidth;
+	int textHeight;
+public:
+	Text(const std::string &text, Vec2f position);
+	~Text();
+
+	virtual void draw();
+	virtual void update(int x, int y);
+
+	void setColor(Vec3f color);
+};
+

Util.cpp

@@ -0,0 +1,65 @@
+#include "Util.h"
+#include "stb_image.h"
+
+Util::Util()
+{
+	
+}
+
+
+Util::~Util()
+{
+}
+
+GLuint Util::loadTexture(const std::string &filename)
+{
+	int width, height, bpp;
+
+	stbi_set_flip_vertically_on_load(true);
+	unsigned char* imgData = stbi_load(filename.c_str(), &width, &height, &bpp, 4);
+	GLuint num;
+	glGenTextures(1, &num);
+	glBindTexture(GL_TEXTURE_2D, num);
+
+	glTexImage2D(GL_TEXTURE_2D,
+		0,		//level
+		GL_RGBA,		//internal format
+		width,		//width
+		height,		//height
+		0,		//border
+		GL_RGBA,		//data format
+		GL_UNSIGNED_BYTE,	//data type
+		imgData);		//data
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+
+	stbi_image_free(imgData);
+	return num;
+}
+
+void Util::glutBitmapString(std::string str, int x, int y)
+{
+	glRasterPos2f(x, y);
+	for (int i = 0; i < str.size(); i++)
+	{
+		glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, str[i]);
+	}
+}
+
+int Util::glutTextWidth(const std::string str)
+{
+	int total = 0;
+	for (int i = 0; i < str.size(); i++)
+	{
+		total += glutBitmapWidth(GLUT_BITMAP_HELVETICA_18, str[i]);
+	}
+	return total;
+}
+
+//int Util::glutTextHeight()
+//{
+//	return glutBitmapHeight(GLUT_BITMAP_HELVETICA_18);
+//}
+

Util.h

@@ -0,0 +1,16 @@
+#pragma once
+#include <string>
+#include <GL/freeglut.h>
+
+class Util
+{
+private:
+	Util();
+	~Util();	
+public:
+	static GLuint loadTexture(const std::string &filename);
+	static void glutBitmapString(std::string str, int x, int y);
+	static int glutTextWidth(const std::string str);
+	//static int glutTextHeight();
+};
+

Vector.cpp

@@ -1,3 +1,5 @@
+#define _USE_MATH_DEFINES
+#include <cmath>
 #include "Vector.h"
 
 Vec3f::Vec3f(float x, float y, float z)
@@ -6,13 +8,36 @@ Vec3f::Vec3f(float x, float y, float z)
 	this->y = y;
 	this->z = z;
 }
+/*The length of the vector*/
+float Vec3f::Length()
+{
+	return (float)sqrt(x*x+y*y+z*z);
+}
+
+void Vec3f::Normalize()
+{	
+	float length = this->Length();
+
+	if (length != 0)
+	{
+		x = x / length;
+		y = y / length;
+		z = z / length;
+	}
+}
+
+float Vec3f::Distance(const Vec3f &other)
+{
+	return (float)sqrt(pow(other.x - x, 2)+pow(other.y - y, 2)+pow(other.z - z, 2));
+}
+
 Vec3f::Vec3f()
 {
 	this->x = 0;
 	this->y = 0;
 	this->z = 0;
 }
-Vec3f::Vec3f(Vec3f &other)
+Vec3f::Vec3f(const Vec3f &other)
 {
 	this->x = other.x;
 	this->y = other.y;
@@ -24,6 +49,51 @@ float& Vec3f::operator [](int index)
 	return v[index];
 }
 
+Vec3f Vec3f::operator+(const Vec3f & other)
+{
+	return Vec3f(x + other.x, y + other.y, z + other.z);
+}
+
+Vec3f Vec3f::operator-(const Vec3f & other)
+{
+	return Vec3f(x - other.x, y - other.y, z - other.z);
+}
+
+Vec3f Vec3f::operator/(float value)
+{
+	return Vec3f(x / value, y / value, z / value);
+}
+
+bool  Vec3f::operator==(const Vec3f & other)
+{
+	/*bool xb, yb,zb;
+	xb = x == other.x;
+	yb = y == other.y;
+	zb = z == other.z;
+	if (xb & yb & zb)
+		return true;*/
+	return x == other.x & y == other.y & z == other.z;
+}
+
+bool Vec3f::operator!=(const Vec3f & other)
+{
+	return x != other.x & y != other.y & z != other.z;
+}
+
+Vec3f Vec3f::operator*(const float & other)
+{
+	return Vec3f(x*other, y*other, z*other);
+}
+
+Vec3f Vec3f::cross(const Vec3f & other)
+{
+	return Vec3f(
+		y*other.z - other.y*z,
+		z*other.x - other.z*x,
+		x*other.y - other.x*y
+		);
+}
+
 
 
 Vec2f::Vec2f(float x, float y)
@@ -36,7 +106,7 @@ Vec2f::Vec2f()
 	this->x = 0;
 	this->y = 0;
 }
-Vec2f::Vec2f(Vec2f &other)
+Vec2f::Vec2f(const Vec2f &other)
 {
 	this->x = other.x;
 	this->y = other.y;
@@ -46,3 +116,14 @@ float& Vec2f::operator [](int index)
 {
 	return v[index];
 }
+
+Vec2f Vec2f::operator+(const Vec2f & other)
+{
+	return Vec2f(x + other.x, y+other.y);
+}
+
+float Vec2f::length()
+{
+	return (float)sqrt(x*x + y*y);
+}
+

Vector.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "Header.h"
 
 class Vec3f
 {
@@ -13,9 +12,21 @@ public:
 		float v[3];
 	};
 	Vec3f();
-	Vec3f(Vec3f &other);
+	Vec3f(const Vec3f &other);
 	Vec3f(float x, float y, float z);
+	float Length();
+	void Normalize();
+	float Distance(const Vec3f &);
 	float& operator [](int);
+	Vec3f operator + (const Vec3f &other);
+	Vec3f operator -(const Vec3f &other);
+	Vec3f operator / (float value);
+	bool operator ==(const Vec3f &other);
+	bool operator !=(const Vec3f &other);
+	Vec3f operator *(const float &other);
+
+	Vec3f cross(const Vec3f &other);
+
 };
 
 class Vec2f
@@ -31,7 +42,9 @@ public:
 	};
 	Vec2f();
 	Vec2f(float x, float y);
-	Vec2f(Vec2f &other);
+	Vec2f(const Vec2f &other);
 	float& operator [](int);
+	Vec2f operator + (const Vec2f &other);
+	float length();	
 };
 

Vertex.cpp

@@ -0,0 +1,39 @@
+#include "Vertex.h"
+
+Vertex::Vertex(float x, float y, float z, float nx, float ny, float nz, float tx, float ty)
+{
+	this->x = x;
+	this->y = y;
+	this->z = z;
+
+	this->normalX = nx;
+	this->normalY = ny;
+	this->normalZ = nz;
+
+	this->texX = tx;
+	this->texY = ty;
+}
+
+Vertex::~Vertex()
+{
+}
+
+Vertex Vertex::operator/(const float &other) const
+{
+	return Vertex(x / other, y / other, z / other, normalX, normalY, normalZ, texX, texY);
+}
+
+Vertex Vertex::operator*(const Vertex & other) const
+{
+	return Vertex(x*other.x, y*other.y, z*other.z, normalX, normalY, normalZ, texX, texY);
+}
+
+Vertex Vertex::operator*(const float & other) const
+{
+	return Vertex(x*other, y*other, z*other, normalX, normalY, normalZ, texX, texY);
+}
+
+Vertex Vertex::operator+(const Vertex & other) const
+{
+	return Vertex(x+other.x, y+other.y, z+other.z, normalX, normalY, normalZ, texX, texY);
+}

Vertex.h

@@ -0,0 +1,24 @@
+#pragma once
+class Vertex
+{
+public:
+	Vertex(float x, float y, float z, float nx, float ny, float nz, float tx, float ty);
+	~Vertex();
+
+	float x;
+	float y;
+	float z;
+
+	float normalX;
+	float normalY;
+	float normalZ;
+
+	float texX;
+	float texY;
+
+	Vertex operator/(const float &other) const;
+	Vertex operator*(const Vertex &other) const;
+	Vertex operator*(const float &other) const;
+	Vertex operator+(const Vertex &other) const;
+};
+

Weapon.cpp

@@ -1,28 +1,93 @@
+//
+// Created by janco on 25-5-16.
+//
+
 #include "Weapon.h"
+#include "Model.h"
+#include <iostream>
+#include <string>
+#include <cmath>
 
-Weapon::Weapon(const string &filename)
-{
-	weaponModel = new Model(filename);
-}
 
-Weapon::Weapon()
+Weapon::Weapon(std::string name, int damage, Element e, std::string modelFilename, float scale, Vec3f location, Vec2f rotation,
-{
+               Vec3f offsetPlayer, Vec3f ankerPoint,
+               Vec2f maxRotation, Vec2f minRotation,
+			   Vec3f collision){
+
+    weaponmodel = Model::load(modelFilename);
+    rotate(rotation);
+    move(location);
+    this->scale = scale;
+
+	this->name = name;
+	this->damage = damage;
+	this->element = e;
+
+    this->offsetPlayer = offsetPlayer;
+    this->ankerPoint = ankerPoint;
+    this->maxRotation = maxRotation;
+    this->minRotation = minRotation;
+	this->collision = collision;
+};
+
+Weapon::~Weapon(){
 
 }
 
-Weapon::~Weapon()
+void Weapon::rotateWeapon(Vec3f rotation){
-{
+    if(rotation.x < maxRotation.x && rotation.x > minRotation.x){
+        rotationWeapon.x = rotation.x;
+    }
+    if(rotation.z < maxRotation.y && rotation.z > minRotation.y){
+        rotationWeapon.z = rotation.z;
+    }
+    rotationWeapon.y = rotation.y;
 }
 
-void Weapon::draw_weapon(void)
+void Weapon::rotate(Vec2f rotation){
-{
+    this->rotation.y = -rotation.y;
+}
 
-	if (weaponModel != nullptr)
+void Weapon::move(Vec3f location){
+    position = location;
+}
+
+void Weapon::draw(){
+    if (weaponmodel != nullptr)
     {
+        glPushMatrix();
+
+        //Player position and rotation
+        glTranslatef(position.x, position.y, position.z);
+        glRotatef(rotation.x, 1, 0, 0);
+        glRotatef(rotation.y, 0, 1, 0);
+        glRotatef(rotation.z, 0, 0, 1);
+
+        //offset from player
+        glTranslatef(offsetPlayer.x, offsetPlayer.y, offsetPlayer.z);
+
+        //Rotate weapon itself, from specific anker point
+        glTranslatef(ankerPoint.x, ankerPoint.y, ankerPoint.z);
+        glRotatef(rotationWeapon.z, 0, 0, 1);
+        glRotatef(rotationWeapon.y, 0, 1, 0);
+        glRotatef(rotationWeapon.x, 1, 0, 0);
+        glTranslatef(-ankerPoint.x, -ankerPoint.y, -ankerPoint.z);
+
         glScalef(scale, scale, scale);
-		glRotatef(135, 1, 0, 0);
+
-		weaponModel->draw();		
+        weaponmodel->draw();
+
+        //Test code for finding anker point
+        glColor3ub(255, 255, 0);
+        glTranslatef(ankerPoint.x, ankerPoint.y, ankerPoint.z);
+        glBegin(GL_LINES);
+        glVertex2f(0, 4);
+        glVertex2f(0, -4);
+        glVertex2f(4, 0);
+        glVertex2f(-4, 0);
+        glEnd();
+
+        glPopMatrix();
+
     }
 }
-
-

Weapon.h

@@ -1,16 +1,40 @@
-#pragma once
+//
-#include "Header.h"
+// Created by janco on 25-5-16.
-#include "Model.h"
+//
 
-class Weapon
+#ifndef CRYSTALPOINT_WEAPON_H
-{
+#define CRYSTALPOINT_WEAPON_H
+
+#include "Vector.h"
+#include "Model.h"
+#include <string>
+
+class Weapon {
 public:
-	Weapon(const string &filename);
+	enum Element {FIRE, WATER, EARTH, AIR};
-	Weapon();
+
+    Weapon(std::string name, int damage, Element element, std::string modelFilename, float scale, Vec3f location, Vec2f rotation,
+           Vec3f offsetPlayer, Vec3f ankerPoint,
+           Vec2f maxRotation, Vec2f minXRotation,
+		   Vec3f collision);
     ~Weapon();
-	void draw_weapon(void);
+
-private:
+    void draw();
-	Model *weaponModel = nullptr;
+    void rotateWeapon(Vec3f rotation);
-	float scale = 0.5f;	
+    void rotate(Vec2f rotation);
+    void move(Vec3f location);
+	
+	std::string name;
+    unsigned int damage;
+	Element element;
+
+    Model* weaponmodel;
+
+    float scale;
+    Vec3f position, rotation, rotationWeapon;
+    Vec3f offsetPlayer, ankerPoint, collision;
+    Vec2f maxRotation, minRotation;
 };
 
+
+#endif //CRYSTALPOINT_WEAPON_H

World.cpp

@@ -0,0 +1,387 @@
+#include "World.h"
+#include <GL/freeglut.h>
+#include "Entity.h"
+#include "json.h"
+#include "Model.h"
+#include <fstream>
+#include <iostream>
+#include <algorithm>
+#include "WorldHandler.h"
+
+World::World(const std::string &fileName)
+{		
+	nextworld = false;
+
+	//Store player instance
+	player = Player::getInstance();
+	
+
+	//Create the interface
+	interface = new Interface();
+	
+
+	//Open world json file
+	std::ifstream file(fileName);
+	if(!file.is_open())
+		std::cout<<"Error, can't open world file - " << fileName << "\n";
+
+	json::Value v = json::readJson(file);
+	file.close();
+	
+
+	//Check file
+	if(v["world"].isNull() || v["world"]["heightmap"].isNull() || v["world"]["skybox"].isNull())
+		std::cout << "Invalid world file: world - " << fileName << "\n";
+	if (v["world"]["object-templates"].isNull())
+		std::cout << "Invalid world file: object templates - " << fileName << "\n";
+	if (v["player"].isNull() || v["player"]["startposition"].isNull())
+		std::cout << "Invalid world file: player - " << fileName << "\n";
+	if (v["objects"].isNull())
+		std::cout << "Invalid world file: objects - " << fileName << "\n";
+	if (v["enemies"].isNull())
+		std::cout << "Invalid world file: enemies - " << fileName << "\n";
+	if (v["crystal"].isNull())
+		std::cout << "Invalid world file: crystals - " << fileName << "\n";
+	
+
+	if (!v["world"]["loadingscreen"].isNull())
+	{
+		ls.setTexture(v["world"]["loadingscreen"].asString());
+		ls.draw();
+	}	
+
+	//Load object templates
+	for (auto objt : v["world"]["object-templates"])
+	{
+		//collision
+		bool cancollide = true;
+		if (!objt["collision"].isNull())
+			cancollide = objt["collision"].asBool();
+
+		objecttemplates.push_back(std::pair<int, std::pair<std::string, bool>>(objt["color"], std::pair<std::string, bool>(objt["file"], cancollide)));
+		
+	}
+
+	//Generate heightmap for this world
+	heightmap = new HeightMap(v["world"]["heightmap"].asString(), this);
+	
+
+	//Load skybox
+	skybox = new Skybox(15000.0f, v["world"]["skybox"].asString());
+	skybox->init();
+	
+
+	//Map different texture to heightmap if available
+	if(!v["world"]["texture"].isNull())
+		heightmap->SetTexture(v["world"]["texture"].asString());
+	
+
+	//Set player starting position
+	player->position.x = v["player"]["startposition"][0].asFloat();
+	player->position.z = v["player"]["startposition"][2].asFloat();
+	player->position.y = heightmap->GetHeight(player->position.x, player->position.z);
+	
+
+	//Load and place objects into world
+	for (auto object : v["objects"])
+	{
+		//Collision
+		bool hasCollision = true;
+		if (!object["collide"].isNull())
+			hasCollision = object["collide"].asBool();
+
+		//Rotation
+		Vec3f rotation(0, 0, 0);
+		if(!object["rot"].isNull())
+			rotation = Vec3f(object["rot"][0].asFloat(), object["rot"][1].asFloat(), object["rot"][2].asFloat());
+
+		//Scale
+		float scale = 1;
+		if (!object["scale"].isNull())
+			scale = object["scale"].asFloat();
+		
+		//Position
+		if (object["pos"].isNull())
+			std::cout << "Invalid world file: objects pos - " << fileName << "\n";
+		
+		//File
+		if (object["file"].isNull())
+			std::cout << "Invalid world file: objects file - " << fileName << "\n";
+
+		//Create
+		Vec3f position(object["pos"][0].asFloat(), object["pos"][1].asFloat(), object["pos"][2].asFloat());		
+		position.y = getHeight(position.x, position.z);
+
+		entities.push_back(new LevelObject(object["file"].asString(), position, rotation, scale, hasCollision));
+		
+	}
+
+	maxEnemies = 0;
+	//Load and place enemies into world
+	for (auto e : v["enemies"])
+	{		
+		//Rotation
+		Vec3f rotation(0, 0, 0);
+		if (!e["rot"].isNull())
+			rotation = Vec3f(e["rot"][0].asFloat(), e["rot"][1].asFloat(), e["rot"][2].asFloat());
+
+		//Scale
+		float scale = 1.0f;
+		if (!e["scale"].isNull())
+			scale = e["scale"].asFloat();
+
+		//Position
+		if (e["pos"].isNull())
+			std::cout << "Invalid world file: enemies pos - " << fileName << "\n";
+
+		//File
+		if (e["file"].isNull())
+			std::cout << "Invalid world file: enemies file - " << fileName << "\n";
+
+		//Music
+		if (e["music"].isNull())
+			std::cout << "Invalid world file: enemies music - " << fileName << "\n";
+
+		//Damage
+		if (e["damage"].isNull())
+			std::cout << "Invalid world file: enemies damage - " << fileName << "\n";
+
+		//Health
+		if (e["health"].isNull())
+			std::cout << "Invalid world file: enemies health - " << fileName << "\n";
+
+		//Create
+		Vec3f position(e["pos"][0].asFloat(), e["pos"][1].asFloat(), e["pos"][2].asFloat());
+		position.y = getHeight(position.x, position.z) + 2.0f;
+
+		maxEnemies++;
+		enemies.push_back(new Enemy(e["file"].asString(), e["music"].asString(), e["damage"].asFloat(), e["health"].asFloat(), position, rotation, scale));
+		
+	}
+	maxCrystals = 0;
+	if (!v["crystal"].isNull())
+	{
+		std::string filled = "unknown";
+		std::string empty = "unknown";
+
+		if(!v["crystal"]["full texture"].isNull())
+			filled = v["crystal"]["full texture"].asString();
+
+		if(!v["crystal"]["empty texture"].isNull())
+			empty = v["crystal"]["empty texture"].asString();
+
+		if (!v["crystal"]["instances"].isNull())
+		{
+			for (auto instance : v["crystal"]["instances"])
+			{
+				Vec3f position(0, 0, 0);
+				Vec3f rotation(0, 0, 0);
+				float scale = 1.0f;
+
+				if (!instance["pos"].isNull())
+				{
+					position.x = instance["pos"][0];
+					position.y = instance["pos"][1];
+					position.z = instance["pos"][2];
+				}
+				
+				if (!instance["rot"].isNull())
+				{
+					rotation.x = instance["rot"][0];
+					rotation.y = instance["rot"][1];
+					rotation.z = instance["rot"][2];
+				}
+
+				if (!instance["scale"].isNull())
+					scale = instance["scale"].asFloat();
+
+				position.y = getHeight(position.x, position.z);
+				maxCrystals++;
+				Crystal *c = new Crystal(filled, empty, position, rotation, scale);
+								
+				entities.push_back(c);
+				
+			}
+			interface->maxCrystals = maxCrystals;
+		}
+	}
+
+	if (!v["world"]["music"].isNull())
+	{
+		sound_id = CrystalPoint::GetSoundSystem().LoadSound(v["world"]["music"].asString().c_str(), true);
+		music = CrystalPoint::GetSoundSystem().GetSound(sound_id);
+		
+	}
+
+	if (!v["portal"].isNull())
+	{
+		Vec3f pos(0, 0, 0);
+		if (!v["portal"]["pos"].isNull())
+			pos = Vec3f(v["portal"]["pos"][0].asFloat(),
+				v["portal"]["pos"][1].asFloat(),
+				v["portal"]["pos"][2].asFloat());
+
+		pos.y = getHeight(pos.x, pos.z);
+
+		Vec3f rot(0, 0, 0);
+		if (!v["portal"]["rot"].isNull())
+			pos = Vec3f(v["portal"]["rot"][0].asFloat(),
+				v["portal"]["rot"][1].asFloat(),
+				v["portal"]["rot"][2].asFloat());
+
+		float scale = 1.0f;
+		if (!v["portal"]["scale"].isNull())
+			scale = !v["portal"]["scale"].asFloat();
+
+		portal = new Portal(v["portal"]["file"], pos, rot, scale);
+		entities.push_back(portal);
+		portal->maxCrystals = maxCrystals;
+		
+	}
+}
+
+
+World::~World()
+{
+	delete heightmap;
+	music->Stop();
+	CrystalPoint::GetSoundSystem().UnloadSound(sound_id);
+	delete skybox;	
+	delete portal;
+}
+
+std::pair<std::string, bool> World::getObjectFromValue(int val)
+{
+	for (auto i : objecttemplates)
+	{
+		if (i.first == val)
+			return i.second;
+	}
+
+	return objecttemplates[0].second;
+}
+
+float World::getHeight(float x, float y)
+{
+	return heightmap->GetHeight(x, y);
+}
+
+void World::draw()
+{
+
+
+	float lightPosition[4] = { 0, 2, 1, 0 };
+	glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
+
+	GLfloat lightAmbient[] = { 0.05, 0.05, 0.05, 0 };
+	GLfloat light_diffuse[] = { 0.9, 0.9, 0.9, 0 };
+	glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
+	glLightfv(GL_LIGHT0, GL_AMBIENT, lightAmbient);
+
+	GLfloat mat_specular[] = { 0.15, 0.15, 0.15, 0 };
+	glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular);
+
+
+
+	player->setCamera();
+	skybox->draw();
+	player->draw();
+
+	heightmap->Draw();
+
+	for (auto &enemy : enemies)
+		enemy->draw();
+
+	for (auto &entity : entities)
+		entity->draw();
+
+	interface->draw();
+}
+
+void World::update(float elapsedTime)
+{
+	if (nextworld)
+	{
+		WorldHandler::getInstance()->NextWorld();
+		return;
+	}
+
+	music->SetPos(player->position, Vec3f());
+
+	if (music->IsPlaying() ==  false)
+	{
+		music->Play();
+	}
+	for (auto &entity : entities)
+		entity->update(elapsedTime);
+
+	int count = 0;
+	int remove = false;
+
+	for (auto &enemy : enemies)
+	{
+
+		//Al deze code zou in enemy moeten staan
+		enemy->inEyeSight(player->position);
+		
+
+		enemy->update(elapsedTime);
+		if (enemy->hasTarget)
+		{
+			for (auto e : entities)
+			{
+				if (e->canCollide && e->inObject(enemy->position))
+				{
+					enemy->collide(e);
+					break;
+				}
+			}
+		}
+
+		if (enemy->attack)
+		{			
+			remove = true;
+			continue;
+		}
+		enemy->position.y = getHeight(enemy->position.x, enemy->position.z);
+		
+		if(!remove)
+			count++;
+	}
+
+	if (remove)
+	{
+		player->XpUp(enemies[count]->xp);
+		delete enemies[count];
+		
+		enemies.erase(enemies.begin() + count);
+		player->HpUp(10);		
+	}
+
+	skybox->update(elapsedTime, maxEnemies - enemies.size(), maxEnemies);
+
+	if (portal->mayEnter)
+	{
+		if (portal->enter(elapsedTime))
+			nextworld = true;
+	}
+		
+}
+
+void World::addLevelObject(LevelObject* obj)
+{
+	entities.push_back(obj);
+}
+
+bool World::isPlayerPositionValid()
+{
+	for (auto &e : entities)
+	{
+		if (e->canCollide && e->inObject(player->position))
+		{
+			e->collide();
+			return false;
+		}
+	}
+	return true;
+}

World.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <vector>
+#include "HeightMap.h"
+#include "Player.h"
+#include "Enemy.h"
+#include "LevelObject.h"
+#include "Interface.h"
+#include "Crystal.h"
+#include "Skybox.h"
+#include "CrystalPoint.h"
+#include "Portal.h"
+#include "LoadingScreen.h"
+
+class Entity;
+
+class World
+{
+private:
+	std::vector<std::pair<int, std::pair<std::string, bool>>> objecttemplates;
+	Sound* music;
+
+	Player* player;
+	HeightMap* heightmap;
+	Interface* interface;
+	Skybox* skybox;
+	Portal* portal;
+
+	bool nextworld;
+	
+	int sound_id,maxCrystals,maxEnemies;
+
+	std::vector<Entity*> entities;
+	std::vector<Enemy*> enemies;
+	//std::vector<Crystal*> crystals;
+
+	LoadingScreen ls;
+public:
+	World(const std::string &fileName);
+	~World();
+
+	void draw();
+	void update(float elapsedTime);
+	bool isPlayerPositionValid();
+	float getHeight(float x, float y);
+	void addLevelObject(LevelObject* obj);
+	std::pair<std::string, bool> getObjectFromValue(int i);
+	
+};
+

WorldHandler.cpp

@@ -0,0 +1,140 @@
+#include "WorldHandler.h"
+#include "World.h"
+
+#include "json.h"
+#include <fstream>
+#include <iostream>
+#include <string>
+
+WorldHandler* WorldHandler::instance = nullptr;
+
+void WorldHandler::ChangeWorld(int i)
+{
+	if (i < 0)
+		i = worldfiles.size() - 1;
+
+	else if (i >= worldfiles.size())
+		i = 0;
+
+	if (i != worldIndex)
+	{
+		loadingWorld = true;
+
+		if(worldIndex != -1)
+			delete world;
+
+		world = new World(worldfiles[i]);
+		worldIndex = i;		
+		loadingWorld = false;
+	}
+}
+
+WorldHandler::WorldHandler()
+{
+	loadingWorld = true;
+	worldIndex = -1;
+
+	//Find worlds.json
+	std::ifstream file("worlds/worlds.json");
+	if (!file.is_open())
+		std::cout << "Error, can't open worlds overview file\n";
+
+	json::Value v = json::readJson(file);
+	file.close();
+
+	//Load file names into vector
+	if (v["worlds"].isNull() || !v["worlds"].isArray())
+		std::cout << "Error, no content in worlds overview file\n";
+
+	for (auto line : v["worlds"])
+	{
+		std::cout << "Found world: " << line << "\n";
+		worldfiles.push_back(line);
+	}
+
+	if (worldfiles.size() > 0)
+	{
+		ChangeWorld(0);
+	}
+}
+
+WorldHandler::~WorldHandler()
+{
+	worldIndex = -1;
+	delete world;
+}
+
+WorldHandler* WorldHandler::getInstance()
+{
+	if (instance == nullptr)
+		instance = new WorldHandler();
+
+	return instance;
+}
+
+void WorldHandler::init()
+{
+	instance = new WorldHandler();
+}
+
+void WorldHandler::draw(void)
+{
+	if(!loadingWorld)
+		world->draw();
+	else
+	{
+		//Draw Loading screen
+	}
+}
+
+void WorldHandler::update(float deltaTime)
+{
+	if(!loadingWorld)
+		world->update(deltaTime);
+}
+
+bool WorldHandler::isPlayerPositionValid(void)
+{
+	if(!loadingWorld)
+		return world->isPlayerPositionValid();
+	return false;
+}
+
+float WorldHandler::getHeight(float x, float y)
+{
+	if (!loadingWorld)
+		return world->getHeight(x, y);
+	else
+		return 0.0f;
+}
+
+
+void WorldHandler::Navigate(const std::string &fileName)
+{
+	if (!loadingWorld)
+	{
+		for (int i = 0; i < worldfiles.size(); i++)
+		{
+			if (worldfiles[i] == fileName)
+				ChangeWorld(i);
+		}
+	}
+}
+
+void WorldHandler::NextWorld()
+{
+	if (!loadingWorld)
+	{
+		ChangeWorld(worldIndex + 1);
+		Player::getInstance()->crystals = 0;
+	}
+}
+
+void WorldHandler::PreviousWorld()
+{
+	if (!loadingWorld)
+	{
+		ChangeWorld(worldIndex - 1);
+		Player::getInstance()->crystals = 0;
+	}
+}

WorldHandler.h

@@ -0,0 +1,36 @@
+#pragma once
+#include <string>
+#include <vector>
+
+class World;
+
+class WorldHandler
+{
+private:
+	WorldHandler();
+	static WorldHandler* instance;
+
+	bool loadingWorld;
+	World* world;
+	int worldIndex;
+	void ChangeWorld(int i);
+public:
+	
+	~WorldHandler();
+
+	static WorldHandler* getInstance(void);
+	static void init();
+
+	void draw(void);
+	void update(float deltaTime);
+
+	bool isPlayerPositionValid(void);
+	float getHeight(float x, float y);
+
+	void Navigate(const std::string &fileName);
+	void NextWorld();
+	void PreviousWorld();
+
+	std::vector<std::string> worldfiles;
+};
+

WorldModel.cpp

@@ -1,12 +0,0 @@
-#include "WorldModel.h"
-
-
-
-WorldModel::WorldModel()
-{
-}
-
-
-WorldModel::~WorldModel()
-{
-}

WorldModel.h

@@ -1,10 +0,0 @@
-#pragma once
-#include "Header.h"
-
-class WorldModel
-{
-public:
-	WorldModel();
-	~WorldModel();
-};
-

WorldState.cpp

@@ -1,49 +0,0 @@
-#include "WorldState.h"
-#include "Player.h"
-
-
-
-WorldState::WorldState()
-{
-	/*player = Player::GetInstance();*/
-}
-
-
-WorldState::~WorldState()
-{
-	//if (player != nullptr)
-		//delete player;
-}
-
-void WorldState::Keyboard(bool keys[255],float deltaTime)
-{
-	float speed = 10;
-	std::cout << "Keyboard doet het in de world state" << std::endl;
-	/*if (keys['a']) player->PlayerMoveEyes(0, deltaTime*speed, false);
-	if (keys['d']) player->PlayerMoveEyes(180, deltaTime*speed, false);
-	if (keys['w']) player->PlayerMoveEyes(90, deltaTime*speed, false);
-	if (keys['s']) player->PlayerMoveEyes(270, deltaTime*speed, false);
-	if (keys['q']) player->PlayerMoveEyes(1, deltaTime*speed, true);
-	if (keys['e']) player->PlayerMoveEyes(-1, deltaTime*speed, true);	*/
-
-	if (keys['a']) Player::GetInstance().PlayerMoveEyes(0, deltaTime*speed, false);
-	if (keys['d']) Player::GetInstance().PlayerMoveEyes(180, deltaTime*speed, false);
-	if (keys['w']) Player::GetInstance().PlayerMoveEyes(90, deltaTime*speed, false);
-	if (keys['s']) Player::GetInstance().PlayerMoveEyes(270, deltaTime*speed, false);
-	if (keys['q']) Player::GetInstance().PlayerMoveEyes(1, deltaTime*speed, true);
-	if (keys['e']) Player::GetInstance().PlayerMoveEyes(-1, deltaTime*speed, true);	
-}
-
-void WorldState::MouseMove(int x, int y, int dx, int dy)
-{
-	//player->PlayerRotateEyes(dx, dy);
-	Player::GetInstance().PlayerRotateEyes(dx, dy);
-}
-
-void WorldState::Display()
-{
-	Player::GetInstance().Display();
-
-	glutSolidCube(10.0);
-}
-

WorldState.h

@@ -1,18 +0,0 @@
-#pragma once
-#include "Header.h"
-#include "State.h"
-#include "Player.h"
-
-class WorldState : public State
-{
-public:
-	WorldState();
-	~WorldState();
-
-	void Keyboard(bool keys[255],float deltaTime);
-	void MouseMove(int x, int y, int dx, int dy);
-	void Display();
-private:
-	//Player* player;
-};
-

json.cpp

@@ -0,0 +1,730 @@
+#include "json.h"
+#include <iomanip>
+#include <sstream>
+#include <iostream>
+#include <cmath>
+#include <cfloat>
+#include <set>
+#include <cstdlib>
+#include <math.h>
+#include <stdlib.h>
+
+namespace json
+{
+
+Value Value::null;
+//constructors
+Value::Value()
+{
+    type = Type::nullValue;
+    value.objectValue = NULL;
+}
+
+Value::Value(Type type)
+{
+    this->type = type;
+    if (type == Type::stringValue)
+        value.stringValue = new std::string();
+    if (type == Type::arrayValue)
+        value.arrayValue = new std::vector<Value>();
+    if (type == Type::objectValue)
+        value.objectValue = new std::map<std::string, Value>();
+}
+
+Value::Value(int value)
+{
+    type = Type::intValue;
+    this->value.intValue = value;
+}
+
+Value::Value(float value)
+{
+    type = Type::floatValue;
+    this->value.floatValue = value;
+}
+
+Value::Value(bool value)
+{
+    type = Type::boolValue;
+    this->value.boolValue = value;
+}
+
+Value::Value(const std::string &value)
+{
+    type = Type::stringValue;
+    this->value.stringValue = new std::string();
+    this->value.stringValue->assign(value);
+}
+Value::Value(const char* value)
+{
+    type = Type::stringValue;
+    this->value.stringValue = new std::string();
+    this->value.stringValue->assign(value);
+}
+
+Value::Value(const Value& other) : Value(other.type)
+{
+    if (type == Type::objectValue)
+        *this->value.objectValue = *other.value.objectValue;
+    else if (type == Type::arrayValue)
+        *this->value.arrayValue = *other.value.arrayValue;
+    else if (type == Type::stringValue)
+        this->value.stringValue->assign(*other.value.stringValue);
+    else
+        this->value = other.value;
+}
+
+void Value::operator=(const Value& other)
+{
+    if (type != other.type)
+    {
+        if (type == Type::stringValue)
+            delete value.stringValue;
+        if (type == Type::arrayValue)
+            delete value.arrayValue;
+        if (type == Type::objectValue)
+            delete value.objectValue;
+        this->type = other.type;
+        if (type == Type::stringValue)
+            value.stringValue = new std::string();
+        if (type == Type::arrayValue)
+            value.arrayValue = new std::vector<Value>();
+        if (type == Type::objectValue)
+            value.objectValue = new std::map<std::string, Value>();
+    }
+
+    if (type == Type::objectValue)
+        *this->value.objectValue = *other.value.objectValue;
+    else if (type == Type::arrayValue)
+        *this->value.arrayValue = *other.value.arrayValue;
+    else if (type == Type::stringValue)
+        this->value.stringValue->assign(*other.value.stringValue);
+    else
+        this->value = other.value;
+}
+
+Value::~Value()
+{
+    if (type == Type::stringValue)
+        delete value.stringValue;
+    else if (type == Type::arrayValue)
+        delete value.arrayValue;
+    else if (type == Type::objectValue)
+        delete value.objectValue;
+}
+
+size_t Value::size() const
+{
+    assert(type == Type::arrayValue || type == Type::objectValue);
+    if (type == Type::arrayValue)
+        return value.arrayValue->size();
+    else if (type == Type::objectValue)
+        return value.objectValue->size();
+    throw "Unsupported";
+}
+
+void Value::push_back(const Value& value)
+{
+    assert(type == Type::arrayValue || type == Type::nullValue);
+    if (type == Type::nullValue)
+    {
+        type = Type::arrayValue;
+        this->value.arrayValue = new std::vector<Value>();
+    }
+    this->value.arrayValue->push_back(value);
+}
+
+
+Value& Value::operator[](const std::string &key)
+{
+    assert(type == Type::objectValue);
+    return (*value.objectValue)[key];
+}
+Value& Value::operator[](const std::string &key) const
+{
+    assert(type == Type::objectValue);
+    return (*value.objectValue)[key];
+}
+
+Value& Value::operator[](const char* key)
+{
+    assert(type == Type::objectValue || type == Type::nullValue);
+    if (type == Type::nullValue)
+    {
+        type = Type::objectValue;
+        value.objectValue = new std::map<std::string, Value>();
+    }
+    return (*value.objectValue)[std::string(key)];
+}
+
+Value& Value::operator[](const char* key) const
+{
+    assert(type == Type::objectValue);
+    return (*value.objectValue)[std::string(key)];
+}
+
+Value& Value::operator[](size_t index)
+{
+    assert(type == Type::arrayValue);
+    return (*value.arrayValue)[index];
+}
+Value& Value::operator[](size_t index) const
+{
+    assert(type == Type::arrayValue);
+    return (*value.arrayValue)[index];
+}
+Value& Value::operator[](int index)
+{
+    assert(type == Type::arrayValue);
+    return (*value.arrayValue)[index];
+}
+Value& Value::operator[](int index) const
+{
+    assert(type == Type::arrayValue);
+    return (*value.arrayValue)[index];
+}
+
+void Value::erase(size_t index)
+{
+    throw "Cannot cast";
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Value::Iterator Value::end() const
+{
+    if (type == Type::objectValue)
+        return Iterator(value.objectValue->end());
+    else if (type == Type::arrayValue)
+        return Iterator(value.arrayValue->end());
+    throw "oops";
+}
+
+Value::Iterator Value::begin() const
+{
+    if (type == Type::objectValue)
+        return Iterator(value.objectValue->begin());
+    else if (type == Type::arrayValue)
+        return Iterator(value.arrayValue->begin());
+    throw "oops";
+}
+
+///iterator stuff
+
+Value Value::Iterator::operator*()
+{
+    if (type == Type::objectValue)
+        return this->objectIterator->second;
+    else  if (type == Type::arrayValue)
+        return *arrayIterator;
+    throw "Oops";
+}
+
+bool Value::Iterator::operator!=(const Iterator &other)
+{
+    if (type == Type::objectValue)
+        return this->objectIterator != other.objectIterator;
+    else  if (type == Type::arrayValue)
+        return this->arrayIterator != other.arrayIterator;
+    throw "Oops";
+}
+
+void Value::Iterator::operator++()
+{
+    if (type == Type::objectValue)
+        this->objectIterator++;
+    else  if (type == Type::arrayValue)
+        this->arrayIterator++;
+}
+void Value::Iterator::operator++(int)
+{
+    if (type == Type::objectValue)
+        this->objectIterator++;
+    else  if (type == Type::arrayValue)
+        this->arrayIterator++;
+}
+
+Value::Iterator::Iterator(const std::vector<Value>::iterator& arrayIterator)
+{
+    type = Type::arrayValue;
+    this->arrayIterator = arrayIterator;
+}
+
+Value::Iterator::Iterator(const std::map<std::string, Value>::iterator& objectIterator)
+{
+    type = Type::objectValue;
+    this->objectIterator = objectIterator;
+}
+
+std::string Value::Iterator::key()
+{
+    assert(type == Type::objectValue);
+    return this->objectIterator->first;
+}
+Value& Value::Iterator::value()
+{
+    assert(type == Type::objectValue);
+    return this->objectIterator->second;
+}
+
+
+
+
+
+
+
+static void ltrim(std::istream& stream);
+static void eatComment(std::istream& stream);
+static Value eatString(std::istream& stream);
+static Value eatObject(std::istream& stream);
+static Value eatArray(std::istream& stream);
+static Value eatNumeric(std::istream& stream, char firstChar);
+static Value eatBool(std::istream& stream);
+static Value eatNull(std::istream& stream);
+static Value eatValue(std::istream& stream);
+
+//reading
+static void ltrim(std::istream& stream)
+{
+    char c = stream.peek();
+    while (c == ' ' || c == '\t' || c == '\n' || c == '\r')
+    {
+        stream.get();
+        c = stream.peek();
+    }
+};
+
+
+static Value eatString(std::istream& stream)
+{
+    std::string value = "";
+    bool escaped = false;
+    while (!stream.eof())
+    {
+        char c = stream.get();
+        if (c == '\\' && !escaped)
+            escaped = !escaped;
+        else if (c == '\"' && !escaped)
+            return Value(value);
+        else
+        {
+            value += c;
+            escaped = false;
+        }
+    }
+    return Value(value);
+};
+
+
+
+
+static Value eatObject(std::istream& stream)
+{
+    Value obj(Type::objectValue);
+    while (!stream.eof())
+    {
+        ltrim(stream);
+        char token = stream.get();
+        if (token == '}')
+            break; //empty object
+        if (token == '/')
+        {
+            eatComment(stream);
+            token = stream.get();
+        }
+
+        assert(token == '"');
+        Value key = eatString(stream);
+        ltrim(stream);
+        token = stream.get();
+        assert(token == ':');
+        ltrim(stream);
+        Value val = eatValue(stream);
+        obj[key.asString()] = val;
+        ltrim(stream);
+
+        token = stream.get();
+        if (token == '}')
+            break;
+        assert(token == ',');
+    }
+    return obj;
+};
+static Value eatArray(std::istream& stream)
+{
+    Value obj(Type::arrayValue);
+    while (!stream.eof())
+    {
+        ltrim(stream);
+        if (stream.peek() == ']')
+        {
+            stream.get();
+            break;
+        }
+        obj.push_back(eatValue(stream));
+        ltrim(stream);
+        char token = stream.get();
+        if (token == '/')
+        {
+            eatComment(stream);
+            token = stream.get();
+        }
+        if (token == ']')
+            break;
+        assert(token == ',');
+    }
+    return obj;
+};
+static Value eatNumeric(std::istream& stream, char firstChar)
+{
+    std::string numeric(1, firstChar);
+    while (!stream.eof())
+    {
+        char token = stream.peek();
+        if ((token >= '0' && token <= '9') || token == '.' || token == '-')
+            numeric += stream.get();
+        else
+            break;
+    }
+    if (numeric.find('.') == std::string::npos)
+        return Value(atoi(numeric.c_str()));
+    else
+        return Value((float)atof(numeric.c_str()));
+};
+
+static Value eatBool(std::istream& stream)
+{
+    char token = stream.get();
+    if (token == 'a') //fAlse
+    {
+        stream.get(); //l
+        stream.get(); //s
+        stream.get(); //e
+        return false;
+    }
+    else if (token == 'r') //tRue
+    {
+        stream.get(); // u
+        stream.get(); // e
+        return true;
+    }
+    return Value(Type::nullValue);
+};
+static Value eatNull(std::istream& stream)
+{
+    return Value(Type::nullValue);
+};
+
+//precondition: / is already eaten
+static void eatComment(std::istream& stream)
+{
+    char token = stream.get();
+    assert(token == '/' || token == '*');
+    if (token == '*')
+    {
+        char last = token;
+        while ((last != '*' || token != '/') && !stream.eof())
+        {
+            last = token;
+            token = stream.get();
+        }
+    }
+    else if (token == '/')
+        while (token != '\n' && !stream.eof())
+            token = stream.get();
+    ltrim(stream);
+}
+
+
+static Value eatValue(std::istream& stream)
+{
+    ltrim(stream);
+    char token = stream.get();
+    if (token == '{')
+        return eatObject(stream);
+    if (token == '[')
+        return eatArray(stream);
+    if ((token >= '0' && token <= '9') || token == '.' || token == '-')
+        return eatNumeric(stream, token);
+    if (token == '"')
+        return eatString(stream);
+    if (token == 't' || token == 'f')
+        return eatBool(stream);
+    if (token == 'n')
+        return eatNull(stream);
+    if (token == '/')
+    {
+        eatComment(stream);
+        return eatValue(stream);
+    }
+    throw "Unable to parse json";
+};
+
+
+Value readJson(const std::string &data)
+{
+    std::stringstream stream;
+    stream << data;
+    printf("%s", "test");
+
+    return eatValue(stream);
+}
+
+Value readJson(std::istream &stream)
+{
+    return eatValue(stream);
+}
+
+
+
+std::ostream& indent(std::ostream& stream, int level)
+{
+    for (int i = 0; i < level; i++)
+        stream << '\t';
+    return stream;
+}
+
+std::ostream& Value::prettyPrint(std::ostream& stream, json::Value& printConfig, int level) const
+{
+    stream << std::fixed << std::setprecision(6);
+    switch (type)
+    {
+        case Type::intValue:
+            stream << value.intValue;
+            break;
+        case Type::floatValue:
+            assert(!isnan(value.floatValue));
+            //assert(isnormal(value.floatValue));
+            if (value.floatValue >= 0)
+                stream << " ";
+            stream << value.floatValue;
+            break;
+        case Type::boolValue:
+            stream << (value.boolValue ? "true" : "false");
+            break;
+        case Type::stringValue:
+            stream << "\"" << *value.stringValue << "\""; //TODO: escape \'s
+            break;
+        case Type::arrayValue:
+        {
+            stream << "[";
+            int wrap = 99999;
+            if (value.arrayValue->size() > 10)
+                wrap = 1;
+            if (value.arrayValue->at(0).isArray() || value.arrayValue->at(0).isObject())
+                wrap = 1;
+            else
+                wrap = 3;
+
+            std::string seperator = " ";
+
+            if (!printConfig.isNull() && printConfig.isMember("wrap"))
+                wrap = printConfig["wrap"];
+            if (!printConfig.isNull() && printConfig.isMember("seperator"))
+                seperator = printConfig["seperator"].asString();
+
+
+            int index = 0;
+
+            if ((long)size() > wrap)
+            {
+                stream << "\n";
+                indent(stream, level + 1);
+            }
+            for (auto v : *this)
+            {
+                if (index > 0)
+                {
+                    stream << "," << seperator;
+                    if (index % wrap == 0)
+                    {
+                        stream << "\n";
+                        indent(stream, level + 1);
+                    }
+                }
+
+                json::Value childPrintConfig = json::Value::null;
+                if (!printConfig.isNull())
+                {
+                    if (printConfig.isMember("elements"))
+                        childPrintConfig = printConfig["elements"];
+                    else if (printConfig.isMember("recursive") && printConfig["recursive"].asBool() == true)
+                        childPrintConfig = printConfig;
+                }
+
+                v.prettyPrint(stream, childPrintConfig, level + 1);
+                index++;
+            }
+            if ((long)size() > wrap)
+            {
+                stream << "\n";
+                indent(stream, level);
+            }
+            stream << "]";
+            break;
+        }
+        case Type::objectValue:
+        {
+            stream << "{\n";
+            int wrap = 99999;
+            if (value.arrayValue->size() > 10)
+                wrap = 1;
+            if (value.arrayValue->at(0).isArray() || value.arrayValue->at(0).isObject())
+                wrap = 1;
+            else
+                wrap = 3;
+
+            std::string seperator = " ";
+
+            if (!printConfig.isNull() && printConfig.isMember("wrap"))
+                wrap = printConfig["wrap"];
+            if (!printConfig.isNull() && printConfig.isMember("seperator"))
+                seperator = printConfig["seperator"].asString();
+
+
+            int index = 0;
+            indent(stream, level + 1);
+
+
+
+            //for (auto v : *value.objectValue)
+            auto printEl = [&](const std::pair<const std::string&, const Value&> v)
+            {
+                if (index > 0)
+                {
+                    stream << "," << seperator;
+                    if (index % wrap == 0)
+                    {
+                        stream << "\n";
+                        indent(stream, level + 1);
+                    }
+                }
+                stream << "\"" << v.first << "\" : ";
+                if (
+                        (v.second.isArray() || v.second.isObject()) &&
+                        (printConfig.isNull() ||
+                         (
+                                 printConfig.isMember(v.first) &&
+                                 printConfig[v.first].isObject() &&
+                                 printConfig[v.first].isMember("wrap") &&
+                                 printConfig[v.first]["wrap"].asInt() < (int)v.second.size())
+                        )
+                        )
+                {
+                    stream << "\n";
+                    indent(stream, level + 1);
+                }
+
+                json::Value childPrintConfig = json::Value::null;
+                if (!printConfig.isNull())
+                {
+                    if (printConfig.isMember(v.first))
+                        childPrintConfig = printConfig[v.first];
+                    else if (printConfig.isMember("recursive") && printConfig["recursive"].asBool() == true)
+                        childPrintConfig = printConfig;
+                }
+
+                v.second.prettyPrint(stream, childPrintConfig, level + 1);;
+                index++;
+            };
+
+
+
+            std::set<std::string> printed;
+            if (!printConfig.isNull())
+            {
+                if (printConfig.isMember("sort"))
+                {
+                    for (std::string el : printConfig["sort"])
+                    {
+                        if (isMember(el))
+                        {
+                            printEl(std::pair<const std::string&, const Value&>(el, (*value.objectValue)[el]));
+                            printed.insert(el);
+                        }
+                    }
+                }
+            }
+
+            for (auto v : *value.objectValue)
+                if (printed.find(v.first) == printed.end())
+                    printEl(v);
+
+            stream << "\n";
+            indent(stream, level);
+            stream << "}";
+            break;
+        }
+        case Type::nullValue:
+            stream << "null";
+            break;
+    }
+    return stream;
+}
+
+
+std::ostream & operator<<(std::ostream &stream, const Value& value)
+{
+    stream << std::fixed<< std::setprecision(6);
+    switch (value.type)
+    {
+        case Type::intValue:
+            stream << value.value.intValue;
+            break;
+        case Type::floatValue:
+            assert(!isnan(value.value.floatValue));
+            //assert(isnormal(value.value.floatValue));
+            stream << value.value.floatValue;
+            break;
+        case Type::boolValue:
+            stream << (value.value.boolValue ? "true" : "false");
+            break;
+        case Type::stringValue:
+            stream << "\"" << *value.value.stringValue << "\""; //TODO: escape \'s
+            break;
+        case Type::arrayValue:
+        {
+            stream << "[";
+            bool first = true;
+            for (auto v : value)
+            {
+                if (!first)
+                    stream << ", ";
+                stream << v;
+                first = false;
+            }
+            stream << "]";
+            break;
+        }
+        case Type::objectValue:
+        {
+            stream << "{";
+            bool first = true;
+            for (auto v : *value.value.objectValue)
+            {
+                if (!first)
+                    stream << ", ";
+                stream << "\"" << v.first << "\" : " << v.second << std::endl;
+                first = false;
+            }
+            stream << "}";
+            break;
+        }
+        case Type::nullValue:
+            stream << "null";
+            break;
+    }
+    return stream;
+}
+}

json.h

@@ -0,0 +1,124 @@
+#pragma once
+
+#include <string>
+#include <map>
+#include <vector>
+#include <assert.h>
+
+namespace json
+{
+	enum class Type
+	{
+		intValue,
+		floatValue,
+		boolValue,
+		stringValue,
+		arrayValue,
+		objectValue,
+		nullValue
+	};
+
+	class Value
+	{
+	public:
+		Type type;
+		union ValueHolder
+		{
+			int								intValue;
+			float							floatValue;
+			bool							boolValue;
+			std::string*					stringValue;
+			std::vector<Value>*				arrayValue;
+			std::map<std::string, Value>*	objectValue;
+		} value;
+
+		static Value null;
+
+		Value();
+		Value(Type type);
+		Value(int value);
+		Value(float value);
+		Value(bool value);
+		Value(const std::string &value);
+		Value(const char* value);
+		Value(const Value& other);
+		virtual ~Value();
+
+		void operator = (const Value& other);
+
+
+
+
+		inline operator int() const						{ return asInt(); }
+		inline operator float()	const					{ return asFloat(); }
+		inline operator bool() const					{ return asBool(); }
+		inline operator const std::string&() const		{ return asString(); }
+
+
+		inline int asInt() const					{ assert(type == Type::intValue); return value.intValue; }
+		inline float asFloat() const				{ assert(type == Type::floatValue || type == Type::intValue); return type == Type::floatValue ? value.floatValue : value.intValue; }
+		inline bool asBool() const					{ assert(type == Type::boolValue); return value.boolValue; }
+		inline const std::string& asString() const	{ assert(type == Type::stringValue); return *value.stringValue; }
+		inline bool isNull() const					{ return type == Type::nullValue; }
+		inline bool isString() const				{ return type == Type::stringValue; }
+		inline bool isInt() const					{ return type == Type::intValue; }
+		inline bool isBool() const					{ return type == Type::boolValue; }
+		inline bool isFloat() const					{ return type == Type::floatValue; }
+		inline bool isObject() const				{ return type == Type::objectValue; }
+		inline bool isArray() const					{ return type == Type::arrayValue;  }
+		inline bool isMember(const std::string &name) const				{ assert(type == Type::objectValue); return value.objectValue->find(name) != value.objectValue->end(); }
+		//array/object
+		virtual size_t size() const;
+		//array
+		virtual void push_back(const Value& value);
+		virtual void erase(size_t index);
+		virtual Value& operator [] (size_t index);
+		virtual Value& operator [] (int index);
+		virtual Value& operator [] (size_t index) const;
+		virtual Value& operator [] (int index) const;
+
+		virtual Value& operator [] (const std::string &key);
+		virtual Value& operator [] (const char* key);
+		virtual Value& operator [] (const std::string &key) const;
+		virtual Value& operator [] (const char* key) const;
+
+		virtual bool operator == (const std::string &other) { return asString() == other; }
+		virtual bool operator == (const int other) { return asInt() == other; }
+		virtual bool operator == (const float other) { return asFloat() == other; }
+
+
+		std::ostream& prettyPrint(std::ostream& stream, json::Value& printConfig = null, int level = 0) const;
+
+		class Iterator;
+		Iterator begin() const;
+		Iterator end() const;
+	};
+
+	class Value::Iterator
+	{
+	private:
+		Type type;
+		std::map<std::string, Value>::iterator objectIterator;
+		std::vector<Value>::iterator arrayIterator;
+	public:
+		Iterator(const std::map<std::string, Value>::iterator& objectIterator);
+		Iterator(const std::vector<Value>::iterator& arrayIterator);
+
+		void operator ++();
+		void operator ++(int);
+		bool operator != (const Iterator &other);
+		Value operator*();
+
+		std::string key();
+		Value& value();
+
+	};
+
+
+
+	Value readJson(const std::string &data);
+	Value readJson(std::istream &stream);
+	std::ostream &operator << (std::ostream &stream, const Value& value);	//serializes json data
+
+
+}

lib/serial/include/impl/unix.h

@@ -0,0 +1,221 @@
+/*!
+ * \file serial/impl/unix.h
+ * \author  William Woodall <wjwwood@gmail.com>
+ * \author  John Harrison <ash@greaterthaninfinity.com>
+ * \version 0.1
+ *
+ * \section LICENSE
+ *
+ * The MIT License
+ *
+ * Copyright (c) 2012 William Woodall, John Harrison
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * \section DESCRIPTION
+ *
+ * This provides a unix based pimpl for the Serial class. This implementation is
+ * based off termios.h and uses select for multiplexing the IO ports.
+ *
+ */
+
+#if !defined(_WIN32)
+
+#ifndef SERIAL_IMPL_UNIX_H
+#define SERIAL_IMPL_UNIX_H
+
+
+#include <pthread.h>
+#include "../serial.h"
+
+namespace serial {
+
+using std::size_t;
+using std::string;
+using std::invalid_argument;
+
+using serial::SerialException;
+using serial::IOException;
+
+class MillisecondTimer {
+public:
+  MillisecondTimer(const uint32_t millis);         
+  int64_t remaining();
+
+private:
+  static timespec timespec_now();
+  timespec expiry;
+};
+
+class serial::Serial::SerialImpl {
+public:
+  SerialImpl (const string &port,
+              unsigned long baudrate,
+              bytesize_t bytesize,
+              parity_t parity,
+              stopbits_t stopbits,
+              flowcontrol_t flowcontrol);
+
+  virtual ~SerialImpl ();
+
+  void
+  open ();
+
+  void
+  close ();
+
+  bool
+  isOpen () const;
+
+  size_t
+  available ();
+
+  bool
+  waitReadable (uint32_t timeout);
+
+  void
+  waitByteTimes (size_t count);
+
+  size_t
+  read (uint8_t *buf, size_t size = 1);
+
+  size_t
+  write (const uint8_t *data, size_t length);
+
+  void
+  flush ();
+
+  void
+  flushInput ();
+
+  void
+  flushOutput ();
+
+  void
+  sendBreak (int duration);
+
+  void
+  setBreak (bool level);
+
+  void
+  setRTS (bool level);
+
+  void
+  setDTR (bool level);
+
+  bool
+  waitForChange ();
+
+  bool
+  getCTS ();
+
+  bool
+  getDSR ();
+
+  bool
+  getRI ();
+
+  bool
+  getCD ();
+
+  void
+  setPort (const string &port);
+
+  string
+  getPort () const;
+
+  void
+  setTimeout (Timeout &timeout);
+
+  Timeout
+  getTimeout () const;
+
+  void
+  setBaudrate (unsigned long baudrate);
+
+  unsigned long
+  getBaudrate () const;
+
+  void
+  setBytesize (bytesize_t bytesize);
+
+  bytesize_t
+  getBytesize () const;
+
+  void
+  setParity (parity_t parity);
+
+  parity_t
+  getParity () const;
+
+  void
+  setStopbits (stopbits_t stopbits);
+
+  stopbits_t
+  getStopbits () const;
+
+  void
+  setFlowcontrol (flowcontrol_t flowcontrol);
+
+  flowcontrol_t
+  getFlowcontrol () const;
+
+  void
+  readLock ();
+
+  void
+  readUnlock ();
+
+  void
+  writeLock ();
+
+  void
+  writeUnlock ();
+
+protected:
+  void reconfigurePort ();
+
+private:
+  string port_;               // Path to the file descriptor
+  int fd_;                    // The current file descriptor
+
+  bool is_open_;
+  bool xonxoff_;
+  bool rtscts_;
+
+  Timeout timeout_;           // Timeout for read operations
+  unsigned long baudrate_;    // Baudrate
+  uint32_t byte_time_ns_;     // Nanoseconds to transmit/receive a single byte
+
+  parity_t parity_;           // Parity
+  bytesize_t bytesize_;       // Size of the bytes
+  stopbits_t stopbits_;       // Stop Bits
+  flowcontrol_t flowcontrol_; // Flow Control
+
+  // Mutex used to lock the read functions
+  pthread_mutex_t read_mutex;
+  // Mutex used to lock the write functions
+  pthread_mutex_t write_mutex;
+};
+
+}
+
+#endif // SERIAL_IMPL_UNIX_H
+
+#endif // !defined(_WIN32)

lib/serial/include/impl/win.h

@@ -0,0 +1,207 @@
+/*!
+ * \file serial/impl/windows.h
+ * \author  William Woodall <wjwwood@gmail.com>
+ * \author  John Harrison <ash@greaterthaninfinity.com>
+ * \version 0.1
+ *
+ * \section LICENSE
+ *
+ * The MIT License
+ *
+ * Copyright (c) 2012 William Woodall, John Harrison
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * \section DESCRIPTION
+ *
+ * This provides a windows implementation of the Serial class interface.
+ *
+ */
+
+#if defined(_WIN32)
+
+#ifndef SERIAL_IMPL_WINDOWS_H
+#define SERIAL_IMPL_WINDOWS_H
+
+#include "include/serial.h"
+
+#include "windows.h"
+
+namespace serial {
+
+using std::string;
+using std::wstring;
+using std::invalid_argument;
+
+using serial::SerialException;
+using serial::IOException;
+
+class serial::Serial::SerialImpl {
+public:
+  SerialImpl (const string &port,
+              unsigned long baudrate,
+              bytesize_t bytesize,
+              parity_t parity,
+              stopbits_t stopbits,
+              flowcontrol_t flowcontrol);
+
+  virtual ~SerialImpl ();
+
+  void
+  open ();
+
+  void
+  close ();
+
+  bool
+  isOpen () const;
+
+  size_t
+  available ();
+  
+  bool
+  waitReadable (uint32_t timeout);
+
+  void
+  waitByteTimes (size_t count);
+
+  size_t
+  read (uint8_t *buf, size_t size = 1);
+
+  size_t
+  write (const uint8_t *data, size_t length);
+
+  void
+  flush ();
+
+  void
+  flushInput ();
+
+  void
+  flushOutput ();
+
+  void
+  sendBreak (int duration);
+
+  void
+  setBreak (bool level);
+
+  void
+  setRTS (bool level);
+
+  void
+  setDTR (bool level);
+
+  bool
+  waitForChange ();
+
+  bool
+  getCTS ();
+
+  bool
+  getDSR ();
+
+  bool
+  getRI ();
+
+  bool
+  getCD ();
+
+  void
+  setPort (const string &port);
+
+  string
+  getPort () const;
+
+  void
+  setTimeout (Timeout &timeout);
+
+  Timeout
+  getTimeout () const;
+
+  void
+  setBaudrate (unsigned long baudrate);
+
+  unsigned long
+  getBaudrate () const;
+
+  void
+  setBytesize (bytesize_t bytesize);
+
+  bytesize_t
+  getBytesize () const;
+
+  void
+  setParity (parity_t parity);
+
+  parity_t
+  getParity () const;
+
+  void
+  setStopbits (stopbits_t stopbits);
+
+  stopbits_t
+  getStopbits () const;
+
+  void
+  setFlowcontrol (flowcontrol_t flowcontrol);
+
+  flowcontrol_t
+  getFlowcontrol () const;
+
+  void
+  readLock ();
+
+  void
+  readUnlock ();
+
+  void
+  writeLock ();
+
+  void
+  writeUnlock ();
+
+protected:
+  void reconfigurePort ();
+
+private:
+  wstring port_;               // Path to the file descriptor
+  HANDLE fd_;
+
+  bool is_open_;
+
+  Timeout timeout_;           // Timeout for read operations
+  unsigned long baudrate_;    // Baudrate
+
+  parity_t parity_;           // Parity
+  bytesize_t bytesize_;       // Size of the bytes
+  stopbits_t stopbits_;       // Stop Bits
+  flowcontrol_t flowcontrol_; // Flow Control
+
+  // Mutex used to lock the read functions
+  HANDLE read_mutex;
+  // Mutex used to lock the write functions
+  HANDLE write_mutex;
+};
+
+}
+
+#endif // SERIAL_IMPL_WINDOWS_H
+
+#endif // if defined(_WIN32)

lib/serial/include/serial.h

@@ -0,0 +1,772 @@
+/*!
+ * \file serial/serial.h
+ * \author  William Woodall <wjwwood@gmail.com>
+ * \author  John Harrison   <ash.gti@gmail.com>
+ * \version 0.1
+ *
+ * \section LICENSE
+ *
+ * The MIT License
+ *
+ * Copyright (c) 2012 William Woodall
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * \section DESCRIPTION
+ *
+ * This provides a cross platform interface for interacting with Serial Ports.
+ */
+
+#ifndef SERIAL_H
+#define SERIAL_H
+
+#include <limits>
+#include <vector>
+#include <string>
+#include <cstring>
+#include <sstream>
+#include <exception>
+#include <stdexcept>
+
+#define THROW(exceptionClass, message) throw exceptionClass(__FILE__, \
+__LINE__, (message) )
+
+namespace serial {
+
+/*!
+ * Enumeration defines the possible bytesizes for the serial port.
+ */
+    typedef enum {
+        fivebits = 5,
+        sixbits = 6,
+        sevenbits = 7,
+        eightbits = 8
+    } bytesize_t;
+
+/*!
+ * Enumeration defines the possible parity types for the serial port.
+ */
+    typedef enum {
+        parity_none = 0,
+        parity_odd = 1,
+        parity_even = 2,
+        parity_mark = 3,
+        parity_space = 4
+    } parity_t;
+
+/*!
+ * Enumeration defines the possible stopbit types for the serial port.
+ */
+    typedef enum {
+        stopbits_one = 1,
+        stopbits_two = 2,
+        stopbits_one_point_five
+    } stopbits_t;
+
+/*!
+ * Enumeration defines the possible flowcontrol types for the serial port.
+ */
+    typedef enum {
+        flowcontrol_none = 0,
+        flowcontrol_software,
+        flowcontrol_hardware
+    } flowcontrol_t;
+
+/*!
+ * Structure for setting the timeout of the serial port, times are
+ * in milliseconds.
+ *
+ * In order to disable the interbyte timeout, set it to Timeout::max().
+ */
+    struct Timeout {
+#ifdef max
+# undef max
+#endif
+        static uint32_t max() {return std::numeric_limits<uint32_t>::max();}
+        /*!
+         * Convenience function to generate Timeout structs using a
+         * single absolute timeout.
+         *
+         * \param timeout A long that defines the time in milliseconds until a
+         * timeout occurs after a call to read or write is made.
+         *
+         * \return Timeout struct that represents this simple timeout provided.
+         */
+        static Timeout simpleTimeout(uint32_t timeout) {
+          return Timeout(max(), timeout, 0, timeout, 0);
+        }
+
+        /*! Number of milliseconds between bytes received to timeout on. */
+        uint32_t inter_byte_timeout;
+        /*! A constant number of milliseconds to wait after calling read. */
+        uint32_t read_timeout_constant;
+        /*! A multiplier against the number of requested bytes to wait after
+         *  calling read.
+         */
+        uint32_t read_timeout_multiplier;
+        /*! A constant number of milliseconds to wait after calling write. */
+        uint32_t write_timeout_constant;
+        /*! A multiplier against the number of requested bytes to wait after
+         *  calling write.
+         */
+        uint32_t write_timeout_multiplier;
+
+        explicit Timeout (uint32_t inter_byte_timeout_=0,
+                          uint32_t read_timeout_constant_=0,
+                          uint32_t read_timeout_multiplier_=0,
+                          uint32_t write_timeout_constant_=0,
+                          uint32_t write_timeout_multiplier_=0)
+                : inter_byte_timeout(inter_byte_timeout_),
+                  read_timeout_constant(read_timeout_constant_),
+                  read_timeout_multiplier(read_timeout_multiplier_),
+                  write_timeout_constant(write_timeout_constant_),
+                  write_timeout_multiplier(write_timeout_multiplier_)
+        {}
+    };
+
+/*!
+ * Class that provides a portable serial port interface.
+ */
+    class Serial {
+    public:
+        /*!
+         * Creates a Serial object and opens the port if a port is specified,
+         * otherwise it remains closed until serial::Serial::open is called.
+         *
+         * \param port A std::string containing the address of the serial port,
+         *        which would be something like 'COM1' on Windows and '/dev/ttyS0'
+         *        on Linux.
+         *
+         * \param baudrate An unsigned 32-bit integer that represents the baudrate
+         *
+         * \param timeout A serial::Timeout struct that defines the timeout
+         * conditions for the serial port. \see serial::Timeout
+         *
+         * \param bytesize Size of each byte in the serial transmission of data,
+         * default is eightbits, possible values are: fivebits, sixbits, sevenbits,
+         * eightbits
+         *
+         * \param parity Method of parity, default is parity_none, possible values
+         * are: parity_none, parity_odd, parity_even
+         *
+         * \param stopbits Number of stop bits used, default is stopbits_one,
+         * possible values are: stopbits_one, stopbits_one_point_five, stopbits_two
+         *
+         * \param flowcontrol Type of flowcontrol used, default is
+         * flowcontrol_none, possible values are: flowcontrol_none,
+         * flowcontrol_software, flowcontrol_hardware
+         *
+         * \throw serial::PortNotOpenedException
+         * \throw serial::IOException
+         * \throw std::invalid_argument
+         */
+        Serial (const std::string &port = "",
+                uint32_t baudrate = 9600,
+                Timeout timeout = Timeout(),
+                bytesize_t bytesize = eightbits,
+                parity_t parity = parity_none,
+                stopbits_t stopbits = stopbits_one,
+                flowcontrol_t flowcontrol = flowcontrol_none);
+
+        /*! Destructor */
+        virtual ~Serial ();
+
+        /*!
+         * Opens the serial port as long as the port is set and the port isn't
+         * already open.
+         *
+         * If the port is provided to the constructor then an explicit call to open
+         * is not needed.
+         *
+         * \see Serial::Serial
+         *
+         * \throw std::invalid_argument
+         * \throw serial::SerialException
+         * \throw serial::IOException
+         */
+        void
+        open ();
+
+        /*! Gets the open status of the serial port.
+         *
+         * \return Returns true if the port is open, false otherwise.
+         */
+        bool
+        isOpen () const;
+
+        /*! Closes the serial port. */
+        void
+        close ();
+
+        /*! Return the number of characters in the buffer. */
+        size_t
+        available ();
+
+        /*! Block until there is serial data to read or read_timeout_constant
+         * number of milliseconds have elapsed. The return value is true when
+         * the function exits with the port in a readable state, false otherwise
+         * (due to timeout or select interruption). */
+        bool
+        waitReadable ();
+
+        /*! Block for a period of time corresponding to the transmission time of
+         * count characters at present serial settings. This may be used in con-
+         * junction with waitReadable to read larger blocks of data from the
+         * port. */
+        void
+        waitByteTimes (size_t count);
+
+        /*! Read a given amount of bytes from the serial port into a given buffer.
+         *
+         * The read function will return in one of three cases:
+         *  * The number of requested bytes was read.
+         *    * In this case the number of bytes requested will match the size_t
+         *      returned by read.
+         *  * A timeout occurred, in this case the number of bytes read will not
+         *    match the amount requested, but no exception will be thrown.  One of
+         *    two possible timeouts occurred:
+         *    * The inter byte timeout expired, this means that number of
+         *      milliseconds elapsed between receiving bytes from the serial port
+         *      exceeded the inter byte timeout.
+         *    * The total timeout expired, which is calculated by multiplying the
+         *      read timeout multiplier by the number of requested bytes and then
+         *      added to the read timeout constant.  If that total number of
+         *      milliseconds elapses after the initial call to read a timeout will
+         *      occur.
+         *  * An exception occurred, in this case an actual exception will be thrown.
+         *
+         * \param buffer An uint8_t array of at least the requested size.
+         * \param size A size_t defining how many bytes to be read.
+         *
+         * \return A size_t representing the number of bytes read as a result of the
+         *         call to read.
+         *
+         * \throw serial::PortNotOpenedException
+         * \throw serial::SerialException
+         */
+        size_t
+        read (uint8_t *buffer, size_t size);
+
+        /*! Read a given amount of bytes from the serial port into a give buffer.
+         *
+         * \param buffer A reference to a std::vector of uint8_t.
+         * \param size A size_t defining how many bytes to be read.
+         *
+         * \return A size_t representing the number of bytes read as a result of the
+         *         call to read.
+         *
+         * \throw serial::PortNotOpenedException
+         * \throw serial::SerialException
+         */
+        size_t
+        read (std::vector<uint8_t> &buffer, size_t size = 1);
+
+        /*! Read a given amount of bytes from the serial port into a give buffer.
+         *
+         * \param buffer A reference to a std::string.
+         * \param size A size_t defining how many bytes to be read.
+         *
+         * \return A size_t representing the number of bytes read as a result of the
+         *         call to read.
+         *
+         * \throw serial::PortNotOpenedException
+         * \throw serial::SerialException
+         */
+        size_t
+        read (std::string &buffer, size_t size = 1);
+
+        /*! Read a given amount of bytes from the serial port and return a string
+         *  containing the data.
+         *
+         * \param size A size_t defining how many bytes to be read.
+         *
+         * \return A std::string containing the data read from the port.
+         *
+         * \throw serial::PortNotOpenedException
+         * \throw serial::SerialException
+         */
+        std::string
+        read (size_t size = 1);
+
+        /*! Reads in a line or until a given delimiter has been processed.
+         *
+         * Reads from the serial port until a single line has been read.
+         *
+         * \param buffer A std::string reference used to store the data.
+         * \param size A maximum length of a line, defaults to 65536 (2^16)
+         * \param eol A string to match against for the EOL.
+         *
+         * \return A size_t representing the number of bytes read.
+         *
+         * \throw serial::PortNotOpenedException
+         * \throw serial::SerialException
+         */
+        size_t
+        readline (std::string &buffer, size_t size = 65536, std::string eol = "\n");
+
+        /*! Reads in a line or until a given delimiter has been processed.
+         *
+         * Reads from the serial port until a single line has been read.
+         *
+         * \param size A maximum length of a line, defaults to 65536 (2^16)
+         * \param eol A string to match against for the EOL.
+         *
+         * \return A std::string containing the line.
+         *
+         * \throw serial::PortNotOpenedException
+         * \throw serial::SerialException
+         */
+        std::string
+        readline (size_t size = 65536, std::string eol = "\n");
+
+        /*! Reads in multiple lines until the serial port times out.
+         *
+         * This requires a timeout > 0 before it can be run. It will read until a
+         * timeout occurs and return a list of strings.
+         *
+         * \param size A maximum length of combined lines, defaults to 65536 (2^16)
+         *
+         * \param eol A string to match against for the EOL.
+         *
+         * \return A vector<string> containing the lines.
+         *
+         * \throw serial::PortNotOpenedException
+         * \throw serial::SerialException
+         */
+        std::vector<std::string>
+        readlines (size_t size = 65536, std::string eol = "\n");
+
+        /*! Write a string to the serial port.
+         *
+         * \param data A const reference containing the data to be written
+         * to the serial port.
+         *
+         * \param size A size_t that indicates how many bytes should be written from
+         * the given data buffer.
+         *
+         * \return A size_t representing the number of bytes actually written to
+         * the serial port.
+         *
+         * \throw serial::PortNotOpenedException
+         * \throw serial::SerialException
+         * \throw serial::IOException
+         */
+        size_t
+        write (const uint8_t *data, size_t size);
+
+        /*! Write a string to the serial port.
+         *
+         * \param data A const reference containing the data to be written
+         * to the serial port.
+         *
+         * \return A size_t representing the number of bytes actually written to
+         * the serial port.
+         *
+         * \throw serial::PortNotOpenedException
+         * \throw serial::SerialException
+         * \throw serial::IOException
+         */
+        size_t
+        write (const std::vector<uint8_t> &data);
+
+        /*! Write a string to the serial port.
+         *
+         * \param data A const reference containing the data to be written
+         * to the serial port.
+         *
+         * \return A size_t representing the number of bytes actually written to
+         * the serial port.
+         *
+         * \throw serial::PortNotOpenedException
+         * \throw serial::SerialException
+         * \throw serial::IOException
+         */
+        size_t
+        write (const std::string &data);
+
+        /*! Sets the serial port identifier.
+         *
+         * \param port A const std::string reference containing the address of the
+         * serial port, which would be something like 'COM1' on Windows and
+         * '/dev/ttyS0' on Linux.
+         *
+         * \throw std::invalid_argument
+         */
+        void
+        setPort (const std::string &port);
+
+        /*! Gets the serial port identifier.
+         *
+         * \see Serial::setPort
+         *
+         * \throw std::invalid_argument
+         */
+        std::string
+        getPort () const;
+
+        /*! Sets the timeout for reads and writes using the Timeout struct.
+         *
+         * There are two timeout conditions described here:
+         *  * The inter byte timeout:
+         *    * The inter_byte_timeout component of serial::Timeout defines the
+         *      maximum amount of time, in milliseconds, between receiving bytes on
+         *      the serial port that can pass before a timeout occurs.  Setting this
+         *      to zero will prevent inter byte timeouts from occurring.
+         *  * Total time timeout:
+         *    * The constant and multiplier component of this timeout condition,
+         *      for both read and write, are defined in serial::Timeout.  This
+         *      timeout occurs if the total time since the read or write call was
+         *      made exceeds the specified time in milliseconds.
+         *    * The limit is defined by multiplying the multiplier component by the
+         *      number of requested bytes and adding that product to the constant
+         *      component.  In this way if you want a read call, for example, to
+         *      timeout after exactly one second regardless of the number of bytes
+         *      you asked for then set the read_timeout_constant component of
+         *      serial::Timeout to 1000 and the read_timeout_multiplier to zero.
+         *      This timeout condition can be used in conjunction with the inter
+         *      byte timeout condition with out any problems, timeout will simply
+         *      occur when one of the two timeout conditions is met.  This allows
+         *      users to have maximum control over the trade-off between
+         *      responsiveness and efficiency.
+         *
+         * Read and write functions will return in one of three cases.  When the
+         * reading or writing is complete, when a timeout occurs, or when an
+         * exception occurs.
+         *
+         * \param timeout A serial::Timeout struct containing the inter byte
+         * timeout, and the read and write timeout constants and multipliers.
+         *
+         * \see serial::Timeout
+         */
+        void
+        setTimeout (Timeout &timeout);
+
+        /*! Sets the timeout for reads and writes. */
+        void
+        setTimeout (uint32_t inter_byte_timeout, uint32_t read_timeout_constant,
+                    uint32_t read_timeout_multiplier, uint32_t write_timeout_constant,
+                    uint32_t write_timeout_multiplier)
+        {
+          Timeout timeout(inter_byte_timeout, read_timeout_constant,
+                          read_timeout_multiplier, write_timeout_constant,
+                          write_timeout_multiplier);
+          return setTimeout(timeout);
+        }
+
+        /*! Gets the timeout for reads in seconds.
+         *
+         * \return A Timeout struct containing the inter_byte_timeout, and read
+         * and write timeout constants and multipliers.
+         *
+         * \see Serial::setTimeout
+         */
+        Timeout
+        getTimeout () const;
+
+        /*! Sets the baudrate for the serial port.
+         *
+         * Possible baudrates depends on the system but some safe baudrates include:
+         * 110, 300, 600, 1200, 2400, 4800, 9600, 14400, 19200, 28800, 38400, 56000,
+         * 57600, 115200
+         * Some other baudrates that are supported by some comports:
+         * 128000, 153600, 230400, 256000, 460800, 921600
+         *
+         * \param baudrate An integer that sets the baud rate for the serial port.
+         *
+         * \throw std::invalid_argument
+         */
+        void
+        setBaudrate (uint32_t baudrate);
+
+        /*! Gets the baudrate for the serial port.
+         *
+         * \return An integer that sets the baud rate for the serial port.
+         *
+         * \see Serial::setBaudrate
+         *
+         * \throw std::invalid_argument
+         */
+        uint32_t
+        getBaudrate () const;
+
+        /*! Sets the bytesize for the serial port.
+         *
+         * \param bytesize Size of each byte in the serial transmission of data,
+         * default is eightbits, possible values are: fivebits, sixbits, sevenbits,
+         * eightbits
+         *
+         * \throw std::invalid_argument
+         */
+        void
+        setBytesize (bytesize_t bytesize);
+
+        /*! Gets the bytesize for the serial port.
+         *
+         * \see Serial::setBytesize
+         *
+         * \throw std::invalid_argument
+         */
+        bytesize_t
+        getBytesize () const;
+
+        /*! Sets the parity for the serial port.
+         *
+         * \param parity Method of parity, default is parity_none, possible values
+         * are: parity_none, parity_odd, parity_even
+         *
+         * \throw std::invalid_argument
+         */
+        void
+        setParity (parity_t parity);
+
+        /*! Gets the parity for the serial port.
+         *
+         * \see Serial::setParity
+         *
+         * \throw std::invalid_argument
+         */
+        parity_t
+        getParity () const;
+
+        /*! Sets the stopbits for the serial port.
+         *
+         * \param stopbits Number of stop bits used, default is stopbits_one,
+         * possible values are: stopbits_one, stopbits_one_point_five, stopbits_two
+         *
+         * \throw std::invalid_argument
+         */
+        void
+        setStopbits (stopbits_t stopbits);
+
+        /*! Gets the stopbits for the serial port.
+         *
+         * \see Serial::setStopbits
+         *
+         * \throw std::invalid_argument
+         */
+        stopbits_t
+        getStopbits () const;
+
+        /*! Sets the flow control for the serial port.
+         *
+         * \param flowcontrol Type of flowcontrol used, default is flowcontrol_none,
+         * possible values are: flowcontrol_none, flowcontrol_software,
+         * flowcontrol_hardware
+         *
+         * \throw std::invalid_argument
+         */
+        void
+        setFlowcontrol (flowcontrol_t flowcontrol);
+
+        /*! Gets the flow control for the serial port.
+         *
+         * \see Serial::setFlowcontrol
+         *
+         * \throw std::invalid_argument
+         */
+        flowcontrol_t
+        getFlowcontrol () const;
+
+        /*! Flush the input and output buffers */
+        void
+        flush ();
+
+        /*! Flush only the input buffer */
+        void
+        flushInput ();
+
+        /*! Flush only the output buffer */
+        void
+        flushOutput ();
+
+        /*! Sends the RS-232 break signal.  See tcsendbreak(3). */
+        void
+        sendBreak (int duration);
+
+        /*! Set the break condition to a given level.  Defaults to true. */
+        void
+        setBreak (bool level = true);
+
+        /*! Set the RTS handshaking line to the given level.  Defaults to true. */
+        void
+        setRTS (bool level = true);
+
+        /*! Set the DTR handshaking line to the given level.  Defaults to true. */
+        void
+        setDTR (bool level = true);
+
+        /*!
+         * Blocks until CTS, DSR, RI, CD changes or something interrupts it.
+         *
+         * Can throw an exception if an error occurs while waiting.
+         * You can check the status of CTS, DSR, RI, and CD once this returns.
+         * Uses TIOCMIWAIT via ioctl if available (mostly only on Linux) with a
+         * resolution of less than +-1ms and as good as +-0.2ms.  Otherwise a
+         * polling method is used which can give +-2ms.
+         *
+         * \return Returns true if one of the lines changed, false if something else
+         * occurred.
+         *
+         * \throw SerialException
+         */
+        bool
+        waitForChange ();
+
+        /*! Returns the current status of the CTS line. */
+        bool
+        getCTS ();
+
+        /*! Returns the current status of the DSR line. */
+        bool
+        getDSR ();
+
+        /*! Returns the current status of the RI line. */
+        bool
+        getRI ();
+
+        /*! Returns the current status of the CD line. */
+        bool
+        getCD ();
+
+    private:
+        // Disable copy constructors
+        Serial(const Serial&);
+        Serial& operator=(const Serial&);
+
+        // Pimpl idiom, d_pointer
+        class SerialImpl;
+        SerialImpl *pimpl_;
+
+        // Scoped Lock Classes
+        class ScopedReadLock;
+        class ScopedWriteLock;
+
+        // Read common function
+        size_t
+        read_ (uint8_t *buffer, size_t size);
+        // Write common function
+        size_t
+        write_ (const uint8_t *data, size_t length);
+
+    };
+
+    class SerialException : public std::exception
+    {
+        // Disable copy constructors
+        SerialException& operator=(const SerialException&);
+        std::string e_what_;
+    public:
+        SerialException (const char *description) {
+          std::stringstream ss;
+          ss << "SerialException " << description << " failed.";
+          e_what_ = ss.str();
+        }
+        SerialException (const SerialException& other) : e_what_(other.e_what_) {}
+        virtual ~SerialException() throw() {}
+        virtual const char* what () const throw () {
+          return e_what_.c_str();
+        }
+    };
+
+    class IOException : public std::exception
+    {
+        // Disable copy constructors
+        IOException& operator=(const IOException&);
+        std::string file_;
+        int line_;
+        std::string e_what_;
+        int errno_;
+    public:
+        explicit IOException (std::string file, int line, int errnum)
+                : file_(file), line_(line), errno_(errnum) {
+          std::stringstream ss;
+#if defined(_WIN32) && !defined(__MINGW32__)
+          char error_str [1024];
+      strerror_s(error_str, 1024, errnum);
+#else
+          char * error_str = strerror(errnum);
+#endif
+          ss << "IO Exception (" << errno_ << "): " << error_str;
+          ss << ", file " << file_ << ", line " << line_ << ".";
+          e_what_ = ss.str();
+        }
+        explicit IOException (std::string file, int line, const char * description)
+                : file_(file), line_(line), errno_(0) {
+          std::stringstream ss;
+          ss << "IO Exception: " << description;
+          ss << ", file " << file_ << ", line " << line_ << ".";
+          e_what_ = ss.str();
+        }
+        virtual ~IOException() throw() {}
+        IOException (const IOException& other) : line_(other.line_), e_what_(other.e_what_), errno_(other.errno_) {}
+
+        int getErrorNumber () { return errno_; }
+
+        virtual const char* what () const throw () {
+          return e_what_.c_str();
+        }
+    };
+
+    class PortNotOpenedException : public std::exception
+    {
+        // Disable copy constructors
+        const PortNotOpenedException& operator=(PortNotOpenedException);
+        std::string e_what_;
+    public:
+        PortNotOpenedException (const char * description)  {
+          std::stringstream ss;
+          ss << "PortNotOpenedException " << description << " failed.";
+          e_what_ = ss.str();
+        }
+        PortNotOpenedException (const PortNotOpenedException& other) : e_what_(other.e_what_) {}
+        virtual ~PortNotOpenedException() throw() {}
+        virtual const char* what () const throw () {
+          return e_what_.c_str();
+        }
+    };
+
+/*!
+ * Structure that describes a serial device.
+ */
+    struct PortInfo {
+
+        /*! Address of the serial port (this can be passed to the constructor of Serial). */
+        std::string port;
+
+        /*! Human readable description of serial device if available. */
+        std::string description;
+
+        /*! Hardware ID (e.g. VID:PID of USB serial devices) or "n/a" if not available. */
+        std::string hardware_id;
+
+    };
+
+/* Lists the serial ports available on the system
+ *
+ * Returns a vector of available serial ports, each represented
+ * by a serial::PortInfo data structure:
+ *
+ * \return vector of serial::PortInfo.
+ */
+    std::vector<PortInfo>
+    list_ports();
+
+} // namespace serial
+
+#endif

lib/serial/include/v8stdint.h

@@ -0,0 +1,57 @@
+// This header is from the v8 google project:
+// http://code.google.com/p/v8/source/browse/trunk/include/v8stdint.h
+
+// Copyright 2012 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+//       copyright notice, this list of conditions and the following
+//       disclaimer in the documentation and/or other materials provided
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Load definitions of standard types.
+
+#ifndef V8STDINT_H_
+#define V8STDINT_H_
+
+#include <stddef.h>
+#include <stdio.h>
+
+#if defined(_WIN32) && !defined(__MINGW32__)
+
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef short int16_t;  // NOLINT
+typedef unsigned short uint16_t;  // NOLINT
+typedef int int32_t;
+typedef unsigned int uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+// intptr_t and friends are defined in crtdefs.h through stdio.h.
+
+#else
+
+#include <stdint.h>
+
+#endif
+
+#endif  // V8STDINT_H_

lib/serial/src/impl/list_ports/list_ports_linux.cc

@@ -0,0 +1,335 @@
+#if defined(__linux__)
+
+/*
+ * Copyright (c) 2014 Craig Lilley <cralilley@gmail.com>
+ * This software is made available under the terms of the MIT licence.
+ * A copy of the licence can be obtained from:
+ * http://opensource.org/licenses/MIT
+ */
+
+#include <vector>
+#include <string>
+#include <sstream>
+#include <stdexcept>
+#include <iostream>
+#include <fstream>
+#include <cstdio>
+#include <cstdarg>
+#include <cstdlib>
+
+#include <glob.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include "../../../include/serial.h"
+
+
+using serial::PortInfo;
+using std::istringstream;
+using std::ifstream;
+using std::getline;
+using std::vector;
+using std::string;
+using std::cout;
+using std::endl;
+
+static vector<string> glob(const vector<string>& patterns);
+static string basename(const string& path);
+static string dirname(const string& path);
+static bool path_exists(const string& path);
+static string realpath(const string& path);
+static string usb_sysfs_friendly_name(const string& sys_usb_path);
+static vector<string> get_sysfs_info(const string& device_path);
+static string read_line(const string& file);
+static string usb_sysfs_hw_string(const string& sysfs_path);
+static string format(const char* format, ...);
+
+vector<string>
+glob(const vector<string>& patterns)
+{
+    vector<string> paths_found;
+
+	if(patterns.size() == 0)
+	    return paths_found;
+
+    glob_t glob_results;
+
+    int glob_retval = glob(patterns[0].c_str(), 0, NULL, &glob_results);
+
+    vector<string>::const_iterator iter = patterns.begin();
+
+    while(++iter != patterns.end())
+    {
+        glob_retval = glob(iter->c_str(), GLOB_APPEND, NULL, &glob_results);
+    }
+
+    for(int path_index = 0; path_index < glob_results.gl_pathc; path_index++)
+    {
+        paths_found.push_back(glob_results.gl_pathv[path_index]);
+    }
+
+    globfree(&glob_results);
+
+    return paths_found;
+}
+
+string
+basename(const string& path)
+{
+    size_t pos = path.rfind("/");
+
+    if(pos == std::string::npos)
+        return path;
+
+    return string(path, pos+1, string::npos);
+}
+
+string
+dirname(const string& path)
+{
+    size_t pos = path.rfind("/");
+
+    if(pos == std::string::npos)
+        return path;
+    else if(pos == 0)
+        return "/";
+
+    return string(path, 0, pos);
+}
+
+bool
+path_exists(const string& path)
+{
+    struct stat sb;
+
+    if( stat(path.c_str(), &sb ) == 0 )
+        return true;
+
+    return false;
+}
+
+string
+realpath(const string& path)
+{
+    char* real_path = realpath(path.c_str(), NULL);
+
+    string result;
+
+    if(real_path != NULL)
+    {
+        result = real_path;
+
+        free(real_path);
+    }
+
+    return result;
+}
+
+string
+usb_sysfs_friendly_name(const string& sys_usb_path)
+{
+    unsigned int device_number = 0;
+
+    istringstream( read_line(sys_usb_path + "/devnum") ) >> device_number;
+
+    string manufacturer = read_line( sys_usb_path + "/manufacturer" );
+
+    string product = read_line( sys_usb_path + "/product" );
+
+    string serial = read_line( sys_usb_path + "/serial" );
+
+    if( manufacturer.empty() && product.empty() && serial.empty() )
+        return "";
+
+    return format("%s %s %s", manufacturer.c_str(), product.c_str(), serial.c_str() );
+}
+
+vector<string>
+get_sysfs_info(const string& device_path)
+{
+    string device_name = basename( device_path );
+
+    string friendly_name;
+
+    string hardware_id;
+
+    string sys_device_path = format( "/sys/class/tty/%s/device", device_name.c_str() );
+
+    if( device_name.compare(0,6,"ttyUSB") == 0 )
+    {
+        sys_device_path = dirname( dirname( realpath( sys_device_path ) ) );
+
+        if( path_exists( sys_device_path ) )
+        {
+            friendly_name = usb_sysfs_friendly_name( sys_device_path );
+
+            hardware_id = usb_sysfs_hw_string( sys_device_path );
+        }
+    }
+    else if( device_name.compare(0,6,"ttyACM") == 0 )
+    {
+        sys_device_path = dirname( realpath( sys_device_path ) );
+
+        if( path_exists( sys_device_path ) )
+        {
+            friendly_name = usb_sysfs_friendly_name( sys_device_path );
+
+            hardware_id = usb_sysfs_hw_string( sys_device_path );
+        }
+    }
+    else
+    {
+        // Try to read ID string of PCI device
+
+        string sys_id_path = sys_device_path + "/id";
+
+        if( path_exists( sys_id_path ) )
+            hardware_id = read_line( sys_id_path );
+    }
+
+    if( friendly_name.empty() )
+        friendly_name = device_name;
+
+    if( hardware_id.empty() )
+        hardware_id = "n/a";
+
+    vector<string> result;
+    result.push_back(friendly_name);
+    result.push_back(hardware_id);
+
+    return result;
+}
+
+string
+read_line(const string& file)
+{
+    ifstream ifs(file.c_str(), ifstream::in);
+
+    string line;
+
+    if(ifs)
+    {
+        getline(ifs, line);
+    }
+
+    return line;
+}
+
+string
+format(const char* format, ...)
+{
+    va_list ap;
+
+    size_t buffer_size_bytes = 256;
+
+    string result;
+
+    char* buffer = (char*)malloc(buffer_size_bytes);
+
+    if( buffer == NULL )
+        return result;
+
+    bool done = false;
+
+    unsigned int loop_count = 0;
+
+    while(!done)
+    {
+        va_start(ap, format);
+
+        int return_value = vsnprintf(buffer, buffer_size_bytes, format, ap);
+
+        if( return_value < 0 )
+        {
+            done = true;
+        }
+        else if( return_value >= buffer_size_bytes )
+        {
+            // Realloc and try again.
+
+            buffer_size_bytes = return_value + 1;
+
+            char* new_buffer_ptr = (char*)realloc(buffer, buffer_size_bytes);
+
+            if( new_buffer_ptr == NULL )
+            {
+                done = true;
+            }
+            else
+            {
+                buffer = new_buffer_ptr;
+            }
+        }
+        else
+        {
+            result = buffer;
+            done = true;
+        }
+
+        va_end(ap);
+
+        if( ++loop_count > 5 )
+            done = true;
+    }
+
+    free(buffer);
+
+    return result;
+}
+
+string
+usb_sysfs_hw_string(const string& sysfs_path)
+{
+    string serial_number = read_line( sysfs_path + "/serial" );
+
+    if( serial_number.length() > 0 )
+    {
+        serial_number = format( "SNR=%s", serial_number.c_str() );
+    }
+
+    string vid = read_line( sysfs_path + "/idVendor" );
+
+    string pid = read_line( sysfs_path + "/idProduct" );
+
+    return format("USB VID:PID=%s:%s %s", vid.c_str(), pid.c_str(), serial_number.c_str() );
+}
+
+vector<PortInfo>
+serial::list_ports()
+{
+    vector<PortInfo> results;
+
+    vector<string> search_globs;
+    search_globs.push_back("/dev/ttyACM*");
+    search_globs.push_back("/dev/ttyS*");
+    search_globs.push_back("/dev/ttyUSB*");
+    search_globs.push_back("/dev/tty.*");
+    search_globs.push_back("/dev/cu.*");
+
+    vector<string> devices_found = glob( search_globs );
+
+    vector<string>::iterator iter = devices_found.begin();
+
+    while( iter != devices_found.end() )
+    {
+        string device = *iter++;
+
+        vector<string> sysfs_info = get_sysfs_info( device );
+
+        string friendly_name = sysfs_info[0];
+
+        string hardware_id = sysfs_info[1];
+
+        PortInfo device_entry;
+        device_entry.port = device;
+        device_entry.description = friendly_name;
+        device_entry.hardware_id = hardware_id;
+
+        results.push_back( device_entry );
+
+    }
+
+    return results;
+}
+
+#endif // defined(__linux__)