Faerbit
|
3b769c220e
|
Resized large textures to one third of their size.
|
2014-11-18 19:39:44 +01:00 |
|
Faerbit
|
1e0157aa2a
|
Reexported objects and enabled smooth shading.
|
2014-11-17 22:03:28 +01:00 |
|
sfroitzheim
|
a8e255e94d
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 18:31:48 +01:00 |
|
sfroitzheim
|
4b6d6f1a6d
|
Changing marble model.
|
2014-11-17 18:31:22 +01:00 |
|
Fabian Klemp
|
173a188467
|
Changing sand texture to a seamless sand texture.
|
2014-11-17 18:18:57 +01:00 |
|
Fabian Klemp
|
5966de6701
|
Removing update of the light at the center of the marble.
|
2014-11-17 18:18:15 +01:00 |
|
Fabian Klemp
|
e34e1ad04d
|
Removing light at the center of the marble.
|
2014-11-17 18:16:27 +01:00 |
|
Fabian Klemp
|
c87d62cae9
|
Added directional lighting.
|
2014-11-17 17:51:15 +01:00 |
|
Fabian Klemp
|
048ab1ceaf
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 16:31:04 +01:00 |
|
Fabian Klemp
|
64f030765f
|
Changing a few spawning values.
|
2014-11-17 16:31:01 +01:00 |
|
Jasper
|
6c32a0c35a
|
getting the sizes juuuuuuuust right
|
2014-11-17 16:28:31 +01:00 |
|
Jasper
|
362b4f0230
|
ich bin dumb
|
2014-11-17 16:14:01 +01:00 |
|
Jasper
|
678c6cf85f
|
merged level.cc
|
2014-11-17 16:11:39 +01:00 |
|
Jasper
|
1e7c7989de
|
further improving physics and interaction
|
2014-11-17 16:07:40 +01:00 |
|
Fabian Klemp
|
682a25a7ee
|
Adding column and block ruins.
|
2014-11-17 15:29:38 +01:00 |
|
Fabian Klemp
|
ba5df84895
|
Added light in the middle of the marble.
|
2014-11-17 15:19:36 +01:00 |
|
Fabian Klemp
|
8d082e203b
|
Basic Marble Model with Textures added.
|
2014-11-17 14:38:35 +01:00 |
|
Fabian Klemp
|
1b876b4c35
|
Adding torch.
|
2014-11-17 14:23:23 +01:00 |
|
Jasper
|
2558311844
|
fixed conflict
|
2014-11-17 13:17:28 +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
|
b27e7062f3
|
Changing a few position parameters.
|
2014-11-17 12:50:05 +01:00 |
|
Steffen Fündgens
|
51359d065f
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 11:25:49 +01:00 |
|
Faerbit
|
3485299717
|
Changing getCamera to pointers.
|
2014-11-15 14:54:44 +01:00 |
|
Faerbit
|
53ca8caf56
|
Adding simple test sphere.
|
2014-11-15 14:19:34 +01:00 |
|
Faerbit
|
5ca77ae3cc
|
Constructed a simple quad for debugging terrain generation.
|
2014-11-15 13:46:20 +01:00 |
|
Faerbit
|
3625cd31d7
|
Stop x rotation at the top and at the bottom to prevent flipping.
|
2014-11-14 22:55:29 +01:00 |
|
Faerbit
|
a5e5087ebd
|
Changed default camera angle. Slowed camera movement.
|
2014-11-14 21:38:26 +01:00 |
|
Fabian Klemp
|
176f7e8176
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-14 18:33:52 +01:00 |
|
Fabian Klemp
|
04234b1f1c
|
Made mouse control camera. (Stupid init of camera...)
|
2014-11-14 18:33:42 +01:00 |
|
Fabian Klemp
|
93363d1391
|
Changed constructor call of camera.
|
2014-11-14 18:32:16 +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 |
|
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
|
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 |
|
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 |
|
Faerbit
|
c38629823d
|
Removed own Shader wrapper, because it does nothing useful.
|
2014-11-08 02:45:32 +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
|
fdf0201f4d
|
Changing a few lighting parameters.
|
2014-11-08 01:15:09 +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
|
33b6e10b32
|
added skeletal constructor to physics.hh
|
2014-11-07 16:44:12 +01:00 |
|
Faerbit
|
ae949e814f
|
Changed lighting parameters to make the scene more interesting.
|
2014-11-04 00:46:49 +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
|
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 |
|