Skip to content

Commit

Permalink
Merge pull request #3 from Im-Rises/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@Im-Rises
Im-Rises authored May 22, 2023
2 parents 48a06b7 + 0b2f74f commit 3d2689d
Show file tree
Hide file tree
Showing 2 changed files with 163 additions and 32 deletions.
157 changes: 125 additions & 32 deletions CubeAscii/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,18 @@
#include <unistd.h>
#endif

#include <stdlib.h>

#include "cUnicodeLib.h"

#define SCREEN_WIDTH 60
#define SCREEN_HEIGHT 30
#define SCREEN_SIZE (SCREEN_WIDTH * SCREEN_HEIGHT)
#define OPTION_CUBE_COUNT "-c"
#define OPTION_CUBE_GRAY_MODE "-g"
#define OPTION_HELP "-h"

#define FRAME_DELAY_MILLISECONDS 16

#define MAX_CUBE_COUNT 3

#define BACKGROUND_CHARACTER '.'
#define FACE_1_CHARACTER '@'
#define FACE_2_CHARACTER '$'
Expand All @@ -24,14 +29,12 @@
#define FACE_5_CHARACTER ';'
#define FACE_6_CHARACTER '+'

int screenWidth = SCREEN_WIDTH, screenHeight = SCREEN_HEIGHT;
int screenWidth, screenHeight, screenSize;

float zBuffer[SCREEN_SIZE];
char buffer[SCREEN_SIZE];
float* zBuffer;
char* buffer;

float K1 = 40;
float charIncrementSpeed = 1.0F;


typedef struct Cube Cube;
struct Cube {
Expand Down Expand Up @@ -88,7 +91,7 @@ float calculateZ(int i, int j, int k, Cube* cube) {
return k * cos(cube->rotationX) * cos(cube->rotationY) - j * sin(cube->rotationX) * cos(cube->rotationY) + i * sin(cube->rotationY);
}

void calculateForSurface(float cubeX, float cubeY, float cubeZ, Cube* cube, char ch) {
void calculateForSurface(int cubeX, int cubeY, int cubeZ, Cube* cube, char ch) {
float x = calculateX(cubeX, cubeY, cubeZ, cube);
float y = calculateY(cubeX, cubeY, cubeZ, cube);
float z = calculateZ(cubeX, cubeY, cubeZ, cube) + cube->distanceFromCam;
Expand All @@ -112,9 +115,9 @@ void calculateForSurface(float cubeX, float cubeY, float cubeZ, Cube* cube, char
void updateBuffers(Cube* cube) {
const int halfCubeLength = cube->cubeWidthHeight / 2;

for (float cubeX = -halfCubeLength; cubeX < halfCubeLength; cubeX += charIncrementSpeed)
for (int cubeX = -halfCubeLength; cubeX < halfCubeLength; cubeX++)
{
for (float cubeY = -halfCubeLength; cubeY < halfCubeLength; cubeY += charIncrementSpeed)
for (int cubeY = -halfCubeLength; cubeY < halfCubeLength; cubeY++)
{
calculateForSurface(cubeX, cubeY, -halfCubeLength, cube, FACE_1_CHARACTER);
calculateForSurface(halfCubeLength, cubeY, cubeX, cube, FACE_2_CHARACTER);
Expand All @@ -140,9 +143,9 @@ void sleepMilliseconds(int milliseconds) {
#endif
}

void printToConsole() {
void printToConsoleColored() {
printf(ESC_CURSOR_HOME);
for (int k = 0; k < SCREEN_SIZE; k++)
for (int k = 0; k < screenSize; k++)
{
switch (buffer[k])
{
Expand Down Expand Up @@ -173,28 +176,77 @@ void printToConsole() {
}
}

void printCube() {
void printToConsole() {
printf(ESC_CURSOR_HOME);
for (int k = 0; k < SCREEN_SIZE; k++)
for (int k = 0; k < screenSize; k++)
{
putchar(k % screenWidth ? buffer[k] : '\n');
}
}

void printUsage(const char* programName) {
printf("Usage: %s [OPTIONS]\n"
"Options:\n"
" %s <count> Number of cubes to render (default: 1) from 1 to %d\n"
" %s Render in gray mode\n"
" %s Print this help message\n"
"\n",
programName,
OPTION_CUBE_COUNT, MAX_CUBE_COUNT,
OPTION_CUBE_GRAY_MODE,
OPTION_HELP);
}

void printUnknownArgumentError(const char* argument) {
fprintf(stderr, "Unknown argument: %s\n", argument);
}

int main(int argc, char** argv) {
// int useColors = 0;
// int twoCubeMode = 0;
// if (argc > 1)
// {
// if (strcmp(argv[1], "colors") == 0)
// {
// useColors = 1;
// }
// else if (strcmp(argv[1], "twocube") == 0)
// {
// twoCubeMode = 1;
// }
// }
void (*printCubePtr)() = printToConsoleColored;
int cubeCount = 1;

/* Handle arguments */
for (int i = 1; i < argc; i++)
{
printf("%s\n", argv[i]);
if (strcmp(argv[i], OPTION_CUBE_COUNT) == 0)
{
if (i + 1 < argc)
{
cubeCount = atoi(argv[i + 1]);
if (cubeCount < 1)
{
fprintf(stderr, "Cube count must be greater than 0\n");
return 1;
}
else if (cubeCount > MAX_CUBE_COUNT)
{
fprintf(stderr, "Cube count must be less than %d\n", MAX_CUBE_COUNT);
return 1;
}
i++;
}
else
{
printUsage(argv[0]);
return 1;
}
}
else if (strcmp(argv[i], OPTION_CUBE_GRAY_MODE) == 0)
{
printCubePtr = printToConsole;
}
else if (strcmp(argv[i], OPTION_HELP) == 0)
{
printUsage(argv[0]);
return 0;
}
else
{
printUnknownArgumentError(argv[i]);
return 1;
}
}

/* Initialize unicode library */
initUnicodeLib();
Expand All @@ -203,26 +255,67 @@ int main(int argc, char** argv) {
printf(ESC_CLEAR_SCREEN);

/* Initialize cube */
Cube cube = createCube();
Cube cubeArray[MAX_CUBE_COUNT];
cubeArray[0] = createCube();

if (cubeCount == 1)
{
screenWidth = 70;
screenHeight = 30;
}
else if (cubeCount == 2)
{
screenWidth = 100;
screenHeight = 30;
cubeArray[0].horizontalOffset = 15;
cubeArray[1] = createCustomCube(0, 0, 0, -0.03F, 0.05F, -0.02F, 20, -30, 0, 100);
}
else if (cubeCount == 3)
{
screenWidth = 120;
screenHeight = 30;
cubeArray[0].horizontalOffset = 5;
cubeArray[1] = createCustomCube(0, 0, 0, -0.03F, 0.05F, -0.02F, 20, -42, 0, 100);
cubeArray[2] = createCustomCube(0, 0, 0, -0.03F, 0.05F, -0.02F, 10, +45, 0, 100);
}
else
{
fprintf(stderr, "Cube count must be less than %d\n", MAX_CUBE_COUNT);
return 1;
}

screenSize = screenWidth * screenHeight;
buffer = malloc(screenSize * sizeof(char));
zBuffer = malloc(screenSize * sizeof(float));

/* Main loop */
while (1)
{
/* Refresh buffers */
memset(buffer, BACKGROUND_CHARACTER, (size_t)screenWidth * screenHeight);
memset(zBuffer, 0, (unsigned long)screenWidth * screenHeight * sizeof(float));

/* Update buffers */
updateBuffers(&cube);
for (int i = 0; i < cubeCount; i++)
{
updateBuffers(&cubeArray[i]);
}

/* Display buffers to console */
printToConsole(); // printCube();
printCubePtr();

/* Rotate cube */
rotateCube(&cube);
for (int i = 0; i < cubeCount; i++)
{
rotateCube(&cubeArray[i]);
}

/* Delay */
sleepMilliseconds(FRAME_DELAY_MILLISECONDS);
}

free(buffer);
free(zBuffer);

return 0;
}
38 changes: 38 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,44 @@ color.

https://github.com/Im-Rises/cubeAscii/assets/59691442/f5bd5eae-67f1-4b75-88f0-6140808ba2f8

## How to use

### Build

To build the project, you need to have `CMake` installed on your computer.
Then, you can run the following commands:

```bash
mkdir build
cd build
cmake ..
cmake --build .
```

### Run

To run the project, you can run the following command:

```bash
./cubeAscii
```

### Options

You can use the following options:

- `-h` : to display the usage
- `-c <count>` : to set the number of cubes to display (default: 1) choose between 1 and 3
- `-g` : to display in gray mode the cubes

You can combine the commands to set the number of cubes and to display in gray mode at the same time:

```bash
./cubeAscii -c 3 -g
```

This will display 3 cubes in gray mode.

## Github-Actions

[![flawfinder](https://github.com/Im-Rises/CubeAscii/actions/workflows/flawfinder.yml/badge.svg?branch=main)](https://github.com/Im-Rises/CubeAscii/actions/workflows/flawfinder.yml)
Expand Down

0 comments on commit 3d2689d

Please sign in to comment.