williamjcm/small3dlib
1
0
Fork 0
mirror of https://git.coom.tech/drummyfish/small3dlib.git synced 2024-11-23 20:59:58 +01:00
Code Activity

Continue city

Browse source
This commit is contained in:
Miloslav Číž 2019-06-20 16:12:00 +02:00
parent 1763cc3454
commit 27204211bd
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
programs/city.c
View file

@ -14,7 +14,7 @@
#define S3L_PERSPECTIVE_CORRECTION 2 #define S3L_PERSPECTIVE_CORRECTION 2
#define S3L_SORT 0 #define S3L_SORT 0
#define S3L_STENCIL_BUFFER 0 #define S3L_STENCIL_BUFFER 0
#define S3L_Z_BUFFER 1 #define S3L_Z_BUFFER 2
#define S3L_PIXEL_FUNCTION drawPixel #define S3L_PIXEL_FUNCTION drawPixel
@ -30,7 +30,7 @@
#define TEXTURE_W 256 #define TEXTURE_W 256
#define TEXTURE_H 256 #define TEXTURE_H 256
#define MAX_VELOCITY 1000 #define MAX_VELOCITY 800
S3L_Model3D models[2]; S3L_Model3D models[2];
@ -168,6 +168,24 @@ static inline uint32_t collision(S3L_Vec4 worldPosition)
return collisionMap[index]; return collisionMap[index];
} }
void handleCollision(S3L_Vec4 *pos, S3L_Vec4 previousPos)
{
S3L_Vec4 newPos = *pos;
newPos.x = previousPos.x;
if (collision(newPos))
{
newPos = *pos;
newPos.z = previousPos.z;
if (collision(newPos))
newPos = previousPos;
}
*pos = newPos;
}
int16_t fps = 0; int16_t fps = 0;
int main() int main()
@ -201,8 +219,8 @@ int main()
S3L_initVec4(&carDirection); S3L_initVec4(&carDirection);
scene.camera.transform.translation.y = S3L_FRACTIONS_PER_UNIT / 3; scene.camera.transform.translation.y = (3 * S3L_FRACTIONS_PER_UNIT) / 5;
scene.camera.transform.rotation.x = -S3L_FRACTIONS_PER_UNIT / 32; scene.camera.transform.rotation.x = -S3L_FRACTIONS_PER_UNIT / 16;
int16_t velocity = 0; int16_t velocity = 0;
@ -238,7 +256,7 @@ int main()
int16_t step = velocity * frameDiff; int16_t step = velocity * frameDiff;
int16_t stepFriction = 300 * frameDiff; int16_t stepFriction = 300 * frameDiff;
int16_t stepRotation = 200 * frameDiff * S3L_abs(velocity) / ((float) MAX_VELOCITY); int16_t stepRotation = 200 * frameDiff * S3L_max(0,velocity - 400) / ((float) MAX_VELOCITY);
int16_t stepVelocity = S3L_nonZero(1000 * frameDiff); int16_t stepVelocity = S3L_nonZero(1000 * frameDiff);
if (stepRotation == 0 && S3L_abs(velocity) >= 200) if (stepRotation == 0 && S3L_abs(velocity) >= 200)
@ -250,19 +268,20 @@ int main()
if (state[SDL_SCANCODE_LEFT]) if (state[SDL_SCANCODE_LEFT])
{ {
models[1].transform.rotation.y += stepRotation; models[1].transform.rotation.y += stepRotation;
models[1].transform.rotation.z = S3L_min(velocity / 64, models[1].transform.rotation.z + stepRotation); models[1].transform.rotation.z = S3L_min(velocity / 64, models[1].transform.rotation.z + 1);
} }
else if (state[SDL_SCANCODE_RIGHT]) else if (state[SDL_SCANCODE_RIGHT])
{ {
models[1].transform.rotation.y -= stepRotation; models[1].transform.rotation.y -= stepRotation;
models[1].transform.rotation.z = S3L_max(-velocity / 64, models[1].transform.rotation.z - stepRotation); models[1].transform.rotation.z = S3L_max(-velocity / 64, models[1].transform.rotation.z - 1);
} }
else else
models[1].transform.rotation.z = (models[1].transform.rotation.z * 3) / 4; models[1].transform.rotation.z = (models[1].transform.rotation.z * 3) / 4;
S3L_rotationToDirections(models[1].transform.rotation,S3L_FRACTIONS_PER_UNIT,&carDirection,0,0); S3L_rotationToDirections(models[1].transform.rotation,S3L_FRACTIONS_PER_UNIT,&carDirection,0,0);
S3L_Vec4 previousPos = models[1].transform.translation; S3L_Vec4 previousCarPos = models[1].transform.translation;
S3L_Vec4 previousCamPos = scene.camera.transform.translation;
int16_t friction = 0; int16_t friction = 0;
@ -282,24 +301,8 @@ int main()
{ {
if (coll == 1) if (coll == 1)
{ {
S3L_Vec4 newPos = models[1].transform.translation; handleCollision(&(models[1].transform.translation),previousCarPos);
newPos.x = previousPos.x;
friction = 8; friction = 8;
if (collision(newPos))
{
newPos = models[1].transform.translation;
newPos.z = previousPos.z;
if (collision(newPos))
{
newPos = previousPos;
velocity = 0;
}
}
models[1].transform.translation = newPos;
} }
else if (coll == 2) else if (coll == 2)
{ {
@ -329,6 +332,9 @@ int main()
scene.camera.transform.rotation.y = models[1].transform.rotation.y; scene.camera.transform.rotation.y = models[1].transform.rotation.y;
if (collision(scene.camera.transform.translation))
handleCollision(&(scene.camera.transform.translation),previousCamPos);
SDL_RenderClear(renderer); SDL_RenderClear(renderer);
SDL_RenderCopy(renderer,textureSDL,NULL,NULL); SDL_RenderCopy(renderer,textureSDL,NULL,NULL);
SDL_RenderPresent(renderer); SDL_RenderPresent(renderer);