Commit Graph

31 Commits

Author SHA1 Message Date
Théophile Bastian 3bf61a7409 Enhance slightly the scene (floor + background) 2018-02-14 11:43:49 +01:00
Rémi Oudin 818aaf01a9 Finished rebase 2018-02-14 11:41:24 +01:00
Rémi Oudin 6823552ee7 Error after rebase 2018-02-13 22:56:44 +01:00
Rémi Oudin f6f789cc2e Utility function 2018-02-13 22:55:12 +01:00
Rémi Oudin 75fc077007 No more glitch. 2018-02-13 22:54:41 +01:00
Rémi Oudin 083bc3c654 Many many changes 2018-02-13 22:54:41 +01:00
Rémi Oudin 15ee31c30e Integration of the grounds 2018-02-13 22:51:51 +01:00
Rémi Oudin 0db091f76e Min_height evolves in time. 2018-02-13 22:45:29 +01:00
Rémi Oudin c0a793bc97 Reduction of speed on the ground 2018-02-13 22:20:58 +01:00
Rémi Oudin dc213cdeeb Fix bouncing when staying on the ground.
Now, there is still a min_p that is respected.
2018-02-13 16:42:24 +01:00
Rémi Oudin ebf3f7a267 Remove debug lines 2018-02-13 12:47:55 +01:00
Rémi Oudin f4b1299d3e Avoid entering the block if we already stopped bouncing 2018-02-13 12:47:33 +01:00
Rémi Oudin afc7b4a3b9 reduction of speed on x and z axis 2018-02-13 12:46:47 +01:00
Rémi Oudin 188d43cb50 Better animation
Bounces are slower, final position is the ball undeformed.
Also, moves continuously when it keep staying on the ground.
2018-02-13 10:51:07 +01:00
Rémi Oudin e3d913fd61 Bouncing nearly works' 2018-02-13 01:02:58 +01:00
Théophile Bastian 2f5c423cc7 Fix supposedly bad initialisation
@Guinness is this correct?
2018-02-12 18:45:53 +01:00
Théophile Bastian df865a3b48 Merge branch 'master' into bounce 2018-02-12 18:45:35 +01:00
Théophile Bastian a1cc442885 First observed bounce 2018-02-12 18:40:05 +01:00
Rémi Oudin 9c37ead65d Merge new version with Perlin Noise 2018-02-12 18:32:58 +01:00
Rémi Oudin 26cac772d7 Y axis is vertical for OpenGL 2018-02-12 18:18:28 +01:00
Rémi Oudin f2f6e9cb76 Handling of bounces for perlin noise surfaces 2018-02-12 17:41:12 +01:00
Rémi Oudin 1ee6875b5a Bounding box for spheroid, based on initial values. 2018-02-12 14:31:08 +01:00
Rémi Oudin c2cd75a61c Add movement on y-axis 2018-02-12 13:54:39 +01:00
Rémi Oudin 19cb1eb343 min_height for bounce as a parameter 2018-02-12 12:06:44 +01:00
Rémi Oudin e80becdaee A ball has a min heihgt (for deformation) 2018-02-12 11:38:46 +01:00
Rémi Oudin 61933b9b78 A height shouldn't be negative. 2018-02-12 10:48:26 +01:00
Rémi Oudin dfbaa80e03 Debug of the physical model 2018-02-12 10:21:49 +01:00
Rémi Oudin 006d2de34a Stream operator for Ball 2018-02-12 01:11:23 +01:00
Rémi Oudin 80f0e96acf Horizontal bounces. 2018-02-11 22:42:15 +01:00
Rémi Oudin bf3232d790 Fix -Wreorder warnings 2018-02-07 15:18:53 +01:00
Rémi Oudin 522ab7be39 Raw implementation of a Ball 2018-02-07 15:08:16 +01:00