Faerbit
|
a8b6463674
|
Changing how the intensity is calculated.
|
2014-11-19 00:59:33 +01:00 |
|
Faerbit
|
9576a40af6
|
Moving far plane a bit further.
|
2014-11-19 00:59:02 +01:00 |
|
Faerbit
|
8968750015
|
Clamping diffuse color for more realistic lighting.
|
2014-11-19 00:46:51 +01:00 |
|
Faerbit
|
715301552a
|
Removing angular(Velocity) from object class as it is not needed there.
|
2014-11-18 19:57:58 +01:00 |
|
Faerbit
|
2638b43b44
|
Resized large textures to one third of their size.
|
2014-11-18 19:39:44 +01:00 |
|
Steffen Fündgens
|
5a92765518
|
changed terrain normals to consider 8 vertices, looks the same
|
2014-11-18 13:09:55 +01:00 |
|
Faerbit
|
6a8182ab8d
|
Reexported objects and enabled smooth shading.
|
2014-11-17 22:03:28 +01:00 |
|
Jasper
|
c54d6cf874
|
Merge branch 'master' of renault.informatik.rwth-aachen.de:/data/git-repository/students/swpp-ws-14-15/swpp-ws-14-15-c
Conflicts:
terrain.cc
terrain.hh
|
2014-11-17 18:59:00 +01:00 |
|
Jasper
|
95627d31ae
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 18:54:44 +01:00 |
|
Jasper
|
10f51db60f
|
fixed terrain offset
|
2014-11-17 18:54:19 +01:00 |
|
Fabian Klemp
|
8a9d026aa5
|
Removing useless stuff.
|
2014-11-17 18:40:54 +01:00 |
|
sfroitzheim
|
c403814cd6
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 18:31:48 +01:00 |
|
sfroitzheim
|
c58e4d01b1
|
Changing marble model.
|
2014-11-17 18:31:22 +01:00 |
|
Fabian Klemp
|
9611c9ef08
|
Changing sand texture to a seamless sand texture.
|
2014-11-17 18:18:57 +01:00 |
|
Fabian Klemp
|
5533d4e4ba
|
Removing update of the light at the center of the marble.
|
2014-11-17 18:18:15 +01:00 |
|
Fabian Klemp
|
9fc515ec24
|
Removing light at the center of the marble.
|
2014-11-17 18:16:27 +01:00 |
|
Fabian Klemp
|
ca3928e232
|
Added directional lighting.
|
2014-11-17 17:51:15 +01:00 |
|
Fabian Klemp
|
39b1ee85b0
|
Added emtpy constructor.
|
2014-11-17 17:50:06 +01:00 |
|
Fabian Klemp
|
94b12ae614
|
Removed rotation paramter from Light constructor as it is not used.
|
2014-11-17 16:54:17 +01:00 |
|
Fabian Klemp
|
6f89c406f1
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 16:31:04 +01:00 |
|
Fabian Klemp
|
d11a2820d6
|
Changing a few spawning values.
|
2014-11-17 16:31:01 +01:00 |
|
Jasper
|
d4e38b7a41
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 16:29:10 +01:00 |
|
Jasper
|
dbce8c229f
|
getting the sizes juuuuuuuust right
|
2014-11-17 16:28:31 +01:00 |
|
Fabian Klemp
|
c22ae2c244
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 16:16:13 +01:00 |
|
Fabian Klemp
|
3086f98ecd
|
Added alpha shading.
|
2014-11-17 16:15:56 +01:00 |
|
Jasper
|
bcb594c4cf
|
ich bin dumb
|
2014-11-17 16:14:01 +01:00 |
|
Jasper
|
429223a08e
|
merged level.cc
|
2014-11-17 16:11:39 +01:00 |
|
Jasper
|
abe9513aa3
|
further improving physics and interaction
|
2014-11-17 16:07:40 +01:00 |
|
sfroitzheim
|
8f64f75b67
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 15:44:31 +01:00 |
|
Fabian Klemp
|
29f24d6f05
|
Adding column and block ruins.
|
2014-11-17 15:29:38 +01:00 |
|
Fabian Klemp
|
f6b2bd776a
|
Added light in the middle of the marble.
|
2014-11-17 15:19:36 +01:00 |
|
Fabian Klemp
|
6f7486b3f8
|
Fixed normals.
|
2014-11-17 15:19:19 +01:00 |
|
Fabian Klemp
|
4dc7897f8c
|
Removed middle Ring.
|
2014-11-17 15:04:59 +01:00 |
|
Fabian Klemp
|
48691338ba
|
Basic Marble Model with Textures added.
|
2014-11-17 14:38:35 +01:00 |
|
Fabian Klemp
|
0b7f8e95d3
|
Adding torch.
|
2014-11-17 14:23:23 +01:00 |
|
Jasper
|
a77ed38625
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 13:36:35 +01:00 |
|
Steffen Fündgens
|
0c4184477b
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 13:36:09 +01:00 |
|
Steffen Fündgens
|
29f4cf6279
|
Reorganizing file structure.
|
2014-11-17 13:36:05 +01:00 |
|
Fabian Klemp
|
0a0dcd90f8
|
Merge branch 'master' of github.com:Faerbit/swp
Conflicts:
camera.cc
graphics.cc
|
2014-11-17 13:31:01 +01:00 |
|
Fabian Klemp
|
a19039426c
|
Camera now returns a viewing vector.
|
2014-11-17 13:29:41 +01:00 |
|
Fabian Klemp
|
38b6d33aec
|
Changing getCamera to pointers.
|
2014-11-17 13:28:42 +01:00 |
|
Jasper
|
288d509316
|
Changed rollForward to accept vector going from camera to bball
|
2014-11-17 13:21:27 +01:00 |
|
Jasper
|
2558311844
|
fixed conflict
|
2014-11-17 13:17:28 +01:00 |
|
Jasper
|
24a812ed07
|
spelling fix
|
2014-11-17 13:14:48 +01:00 |
|
Jasper
|
e579fe1d75
|
added wasd recognition, prepared roll forward to accept vec3 pos instead of mat3 rot
|
2014-11-17 13:12:51 +01:00 |
|
Jasper
|
cac4672c7c
|
Implimented a basic version of Physics into level with a ball colliding with a static plain.
|
2014-11-17 12:57:16 +01:00 |
|
Steffen Fündgens
|
c0a730f58a
|
Merge branch 'terrain-test'
Conflicts:
level.cc
terrain.cc
|
2014-11-17 12:56:10 +01:00 |
|
Steffen Fündgens
|
caccff5c33
|
Removing editor backup files.
|
2014-11-17 12:53:38 +01:00 |
|
Steffen Fündgens
|
64fbceeef8
|
Rewriting terrain loading with lodepng and fixing a few bugs.
|
2014-11-17 12:51:30 +01:00 |
|
Steffen Fündgens
|
b27e7062f3
|
Changing a few position parameters.
|
2014-11-17 12:50:05 +01:00 |
|