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 |
|
Faerbit
|
b74534c62a
|
Only take calculate light contribution with meaningful contributions.
|
2014-11-04 12:24:19 +01:00 |
|
Steffen Fündgens
|
5d2acc0e53
|
Fixed a bug in loading the heightmap and added comments
|
2014-11-04 12:08:47 +01:00 |
|
Faerbit
|
589e0df6ea
|
Shader now respects distance between light source and fragment.
|
2014-11-04 00:47:35 +01:00 |
|
Faerbit
|
ae949e814f
|
Changed lighting parameters to make the scene more interesting.
|
2014-11-04 00:46:49 +01:00 |
|
Faerbit
|
0f64538d1e
|
Removed outdated commentary.
|
2014-11-04 00:45:59 +01:00 |
|
Faerbit
|
e4ba456345
|
Another update to the Readme.md.
|
2014-11-03 23:56:34 +01:00 |
|
Faerbit
|
022317b4ad
|
Updated Readme.md.
|
2014-11-03 23:56:05 +01:00 |
|
Faerbit
|
afbf41ea0d
|
Shading now respects colours.
|
2014-11-03 23:54:35 +01:00 |
|
Faerbit
|
129866d0d7
|
Adding two getters.
|
2014-11-03 23:28:06 +01:00 |
|
Steffen Fündgens
|
925eb62831
|
implemented loading of the heightmap from a png to unsigned int**
|
2014-11-03 17:19:22 +01:00 |
|
Fabian Klemp
|
b68a2bb079
|
Renamed shaders.
|
2014-10-31 13:06:14 +01:00 |
|
Fabian Klemp
|
769514af88
|
Got phong shading working.
|
2014-10-31 12:56:09 +01:00 |
|
Faerbit
|
c505553439
|
First attempt at Phong shading. Build broken.
|
2014-10-31 10:38:57 +01:00 |
|
Faerbit
|
911c8ebfcc
|
Made Entity inheritence public.
|
2014-10-31 10:38:06 +01:00 |
|
Faerbit
|
a88490b622
|
Implemented getter.
|
2014-10-31 10:36:23 +01:00 |
|
Faerbit
|
8f6ab075b5
|
Implemented two getters.
|
2014-10-30 23:59:03 +01:00 |
|
Faerbit
|
5c4b125e4d
|
Restructured some elements from the graphis into the level. Now using a vector for all objects.
|
2014-10-30 23:54:19 +01:00 |
|
Faerbit
|
62d8a83ddb
|
Implemented empty Terrain constructor(compiler was complaining.
|
2014-10-30 23:32:52 +01:00 |
|
Faerbit
|
2ea0f52d5e
|
Implemented Light Constructor.
|
2014-10-30 23:32:21 +01:00 |
|
Faerbit
|
22e734593e
|
Implemented Entity constructor.
|
2014-10-30 23:30:56 +01:00 |
|
Fabian Klemp
|
54108868d7
|
Fixing typo and wrong path in build script.
|
2014-10-26 01:05:21 +02:00 |
|
Fabian Klemp
|
7490a3d805
|
Merge branch 'master' of renault.informatik.rwth-aachen.de:/data/git-repository/students/swpp-ws-14-15/swpp-ws-14-15-c
|
2014-10-26 01:03:02 +02:00 |
|
Faerbit
|
2ae938a557
|
Deleting bullet demos: 1) We don't need them. 2) They prolong the compilation process. 3) They produce weird errors on linking with the libs.
|
2014-10-26 01:02:43 +02:00 |
|
Faerbit
|
e8fe6286a4
|
Fixing bullet lib paths.
|
2014-10-26 01:01:24 +02:00 |
|
Fabian Klemp
|
f96d5dd8a2
|
Adding build script.
|
2014-10-24 12:02:24 +02:00 |
|
Fabian Klemp
|
af9a2591a8
|
Adding Bullet physics.
|
2014-10-24 11:57:06 +02:00 |
|
Fabian Klemp
|
aeb6218d2d
|
Renaming.
|
2014-10-24 11:49:46 +02:00 |
|
Jasper Manousek
|
c9eb7612d7
|
Adding Bullet Library
|
2014-10-24 11:42:47 +02:00 |
|
Fabian Klemp
|
752ee67481
|
Rewrote graphics to use new classes.
|
2014-10-24 10:57:28 +02:00 |
|
Fabian Klemp
|
11229430cb
|
Added empty constructors to be able to define objects without instanciating them.
|
2014-10-24 10:48:45 +02:00 |
|