Merge branch 'master' of github.com:Faerbit/swp

This commit is contained in:
Faerbit 2014-12-15 14:57:50 +01:00
commit 91567fca78
8 changed files with 522 additions and 632 deletions

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,54 @@
# Blender v2.72 (sub 0) OBJ File: 'SimpleWall.blend'
# www.blender.org
o Wall_Cube.001
v 0.537791 -3.045326 3.045326
v 0.537791 -3.045326 -3.045326
v -0.537791 -3.045326 -3.045326
v -0.537791 -3.045326 3.045326
v 0.537791 3.045326 3.045326
v 0.537791 3.045326 -3.045326
v -0.537791 3.045326 -3.045326
v -0.537791 3.045326 3.045326
vt 1.002363 0.998329
vt 1.002363 -0.001671
vt 0.005637 -0.001671
vt 0.394169 0.995358
vt 0.394169 -0.004642
vt 0.605831 -0.004642
vt -0.003002 0.995358
vt -0.003002 -0.004642
vt 0.996752 -0.004642
vt 0.605361 0.992386
vt 0.605361 -0.007614
vt 0.392389 -0.007614
vt 0.001396 0.906027
vt 0.001923 0.094175
vt 0.998604 0.093973
vt 1.000000 0.097080
vt 1.000000 0.902920
vt 0.000000 0.902920
vt 0.005637 0.998329
vt 0.605831 0.995358
vt 0.996752 0.995358
vt 0.392389 0.992386
vt 0.998077 0.905824
vt 0.000000 0.097080
vn -1.000000 0.000000 0.000000
vn 0.000000 0.000000 1.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 0.000000 -1.000000
vn 0.000000 1.000000 0.000000
vn 0.000000 -1.000000 0.000000
s off
f 6/1/1 2/2/1 1/3/1
f 7/4/2 3/5/2 2/6/2
f 8/7/3 4/8/3 3/9/3
f 5/10/4 1/11/4 4/12/4
f 2/13/5 3/14/5 4/15/5
f 7/16/6 6/17/6 5/18/6
f 5/19/1 6/1/1 1/3/1
f 6/20/2 7/4/2 2/6/2
f 7/21/3 8/7/3 3/9/3
f 8/22/4 5/10/4 4/12/4
f 1/23/5 2/13/5 4/15/5
f 8/24/6 7/16/6 5/18/6

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 9.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 MiB

11
trigger.cc Normal file
View File

@ -0,0 +1,11 @@
#include "trigger.hh"
Trigger::Trigger(std::vector<float> position, float distance, bool isBigger, int objectIndex, int functionPointer) {
}
Trigger::Trigger(){
}
Trigger::~Trigger(){
}

15
trigger.hh Normal file
View File

@ -0,0 +1,15 @@
#ifndef TRIGGER_HH_INCLUDED
#define TRIGGER_HH_INCLUDED
#include <vector>
class Trigger {
public:
Trigger(std::vector<float> position, float distance, bool isBigger, int objectIndex, int functionPointer);
Trigger();
~Trigger();
private:
};
#endif