Steffen Fündgens
|
3e68299ed9
|
added texture for the terrain
|
2014-11-14 17:37:11 +01:00 |
|
Steffen Fündgens
|
4ef7a2597b
|
added a normal and texture coordinate to the terrain, rendering moved to level
|
2014-11-14 17:36:30 +01:00 |
|
Steffen Fündgens
|
3343369732
|
Added constructor with SharedVertexArrayObject argument
|
2014-11-14 17:34:50 +01:00 |
|
Fabian Klemp
|
8bdfda2e00
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-14 16:48:05 +01:00 |
|
Fabian Klemp
|
7b331edff9
|
Reorganized code quite a bit. Resizing is deactivated currently.
|
2014-11-14 16:47:47 +01:00 |
|
Jasper
|
3eb406efd1
|
Added addPlayer analog to addSphere and added a check to make sure incice stay synchronized (possibly dangerous but needs to be tested)
|
2014-11-14 16:23:14 +01:00 |
|
Jasper
|
6c0c973305
|
added Roll forward methode, needs testing to be sure.
|
2014-11-14 15:48:50 +01:00 |
|
Jasper
|
d5198ff4f5
|
Added getRotation in physics to give rotation of object back as 4x4Matrix
|
2014-11-14 15:15:29 +01:00 |
|
sfroitzheim
|
5c776e56f0
|
basic marble model with (imperfect) texture
|
2014-11-14 15:12:13 +01:00 |
|
Jasper
|
0d9300193c
|
Merge
|
2014-11-14 14:31:32 +01:00 |
|
Jasper
|
ba8be9e10d
|
aaah
|
2014-11-14 14:23:10 +01:00 |
|
Jasper
|
58cc753aec
|
terrain added
|
2014-11-14 14:17:04 +01:00 |
|
Faerbit
|
4231866d40
|
Adapting graphics to new camera model.
|
2014-11-13 18:17:58 +01:00 |
|
Faerbit
|
1050e6072f
|
Adapted level to new camera implementation.
|
2014-11-13 17:19:56 +01:00 |
|
Faerbit
|
497a0b060c
|
Added simple camera class.
|
2014-11-13 17:17:46 +01:00 |
|
Faerbit
|
2ddf01ede2
|
Removing hard coded values from graphics and moving it into the properties of object and model.
|
2014-11-13 01:22:33 +01:00 |
|
Faerbit
|
16f4890458
|
Added a update function to the level which rotates the bunny.
|
2014-11-13 00:40:28 +01:00 |
|
Faerbit
|
f5a1864472
|
Added Getters and Setters.
|
2014-11-13 00:37:27 +01:00 |
|
Steffen Fündgens
|
9cb7278eb3
|
scaled heightmap height to [0,1] tried to give the heightmap a clor
|
2014-11-11 13:27:11 +01:00 |
|
Steffen Fündgens
|
c68119d7d0
|
Merge branch 'master' of https://github.com/Faerbit/swp
didnt pull while debugging terrain.cc
|
2014-11-11 12:27:15 +01:00 |
|
Steffen Fündgens
|
8eec5fa49e
|
debuged the load function in terrain.cc loading and rendering kind of works (no texture)
|
2014-11-11 12:22:47 +01:00 |
|
Jasper
|
5424e469ca
|
Changing linking order of Bullet libs.
|
2014-11-10 17:35:51 +01:00 |
|
Fabian Klemp
|
70ebfd2b65
|
Fixed cmake include path for bullet.
|
2014-11-10 16:38:23 +01:00 |
|
Faerbit
|
c38629823d
|
Removed own Shader wrapper, because it does nothing useful.
|
2014-11-08 02:45:32 +01:00 |
|
Faerbit
|
0754ad09db
|
Ignoring another compiler warning.
|
2014-11-08 02:36:30 +01:00 |
|
Faerbit
|
d57d3de417
|
Ignoring specific compiler warning to clean up compiler log.
|
2014-11-08 02:26:51 +01:00 |
|
Faerbit
|
34d925cdfe
|
Moving material paramters from graphics to material class.
|
2014-11-08 01:44:24 +01:00 |
|
Faerbit
|
21b144a72b
|
Changing all occurences from texture to material.
|
2014-11-08 01:17:23 +01:00 |
|
Faerbit
|
31447458aa
|
Removing unnecessary includes.
|
2014-11-08 01:15:50 +01:00 |
|
Faerbit
|
fdf0201f4d
|
Changing a few lighting parameters.
|
2014-11-08 01:15:09 +01:00 |
|
Faerbit
|
4c27ef0ae8
|
Extending texture to Material.
|
2014-11-08 00:42:58 +01:00 |
|
Faerbit
|
9caad22156
|
Removing newMain.cc.
|
2014-11-08 00:29:38 +01:00 |
|
Faerbit
|
6c329b1240
|
Revert "created new Main class called 'newMain' with Jasper"
This reverts commit 454a004c8f.
|
2014-11-08 00:28:53 +01:00 |
|
Steffen Fündgens
|
34b39dfff1
|
made the newMain class into a comment so the programm still runs...
|
2014-11-07 16:56:57 +01:00 |
|
Steffen Fündgens
|
acf537e026
|
tried to call the load functions, no success this far
|
2014-11-07 16:55:56 +01:00 |
|
Steffen Fündgens
|
454a004c8f
|
created new Main class called 'newMain' with Jasper
|
2014-11-07 16:49:39 +01:00 |
|
Steffen Fündgens
|
c030799799
|
added 'Levels' folder to point filePaths at
|
2014-11-07 16:48:29 +01:00 |
|
Steffen Fündgens
|
0ce6a0cfdc
|
made a copy of shader called ourShader because Shader is ambigious
|
2014-11-07 16:47:11 +01:00 |
|
Steffen Fündgens
|
33b6e10b32
|
added skeletal constructor to physics.hh
|
2014-11-07 16:44:12 +01:00 |
|
Steffen Fündgens
|
85c7bc8cb5
|
changed VertexArrayObject to SharedVertexArrayObject + Bugfixes
|
2014-11-07 14:06:40 +01:00 |
|
Steffen Fündgens
|
2d1328b96b
|
fixed terrain class and removed load from texture
|
2014-11-07 13:11:06 +01:00 |
|
Faerbit
|
8dca1705fb
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-07 11:37:34 +01:00 |
|
Faerbit
|
49acfc4d97
|
Adding specular part to lighting model.
|
2014-11-07 11:37:26 +01:00 |
|
Steffen Fündgens
|
44d829e564
|
added most of the functionallity to make a triangle strip from the heightmap
|
2014-11-06 19:21:24 +01:00 |
|
Steffen Fündgens
|
8697bf000c
|
added load function to texture
|
2014-11-06 19:20:13 +01:00 |
|
Faerbit
|
9926ad9252
|
Proper indentation.
|
2014-11-05 12:50:25 +01:00 |
|
Faerbit
|
2be57a8c33
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-05 12:48:31 +01:00 |
|
Faerbit
|
0e90159b52
|
Added clean parameter to build script.
|
2014-11-05 12:46:36 +01:00 |
|
Steffen Fündgens
|
fa65d01b8b
|
implemented reading the heightmap from png
|
2014-11-04 19:40:35 +01:00 |
|
Faerbit
|
e6912b41ee
|
Made build script adapt to number of cores available.
|
2014-11-04 12:56:13 +01:00 |
|