JailDoctor/chirping
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

draw functions ready

Browse Source
This commit is contained in:
JailDoctor
2021-09-03 14:04:19 +02:00
parent 2cc9188053
commit e55e4c64dd
3 changed files with 68 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
main.cpp
View File

@@ -1,31 +1,14 @@
#include <SDL2/SDL.h>
#include "tonegen.h"
#include "audio.h"
#include "draw.h"
#define SOUND_DURATION 0.25f
#define SOUND_NUM_SAMPLES SOUND_DURATION*SAMPLES_PER_SECOND
#define SOUND_SIZE_IN_BYTES SOUND_NUM_SAMPLES*AUDIO_FORMAT_SIZE
SDL_Window *sdlWindow = nullptr;
SDL_Renderer *sdlRenderer = nullptr;
SDL_Texture *sdlTexture = nullptr;
SDL_AudioSpec audioSpec{SAMPLES_PER_SECOND, AUDIO_FORMAT, 1, 0, 512, 0, 0, NULL, NULL};
void draw_char(const uint8_t character, const int x, const int y) {
SDL_Rect src {((character-32)%16)*4, ((character-32)/16)*5, 4, 5};
SDL_Rect dst {x, y, 4, 5};
SDL_RenderCopy(sdlRenderer, sdlTexture, &src, &dst);
}
void draw_string(const char* str, int x, const int y) {
const int l = strlen(str);
for (int i = 0; i < l; ++i) {
draw_char(str[i], x, y);
x += 5;
}
}
int main(int argc, char* argv[]) {
SDL_Init(SDL_INIT_EVERYTHING);
SDL_AudioDeviceID sdlAudioDevice = SDL_OpenAudioDevice(NULL, 0, &audioSpec, NULL, 0);
@@ -75,21 +58,19 @@ int main(int argc, char* argv[]) {
beeps[i] += beeps2[i];
}
sdlWindow = SDL_CreateWindow("Mus", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_SHOWN);
sdlRenderer = SDL_CreateRenderer(sdlWindow, -1, 0);
SDL_RenderSetLogicalSize(sdlRenderer, 320, 240);
sdlTexture = SDL_CreateTextureFromSurface(sdlRenderer, SDL_LoadBMP("font.bmp"));
SDL_SetRenderDrawColor(sdlRenderer, 255, 255, 255, 255);
draw_init();
draw_clear(color_dark_grey);
draw_fill(3, 14, 32, 97, color_black);
draw_inset(2, 13, 34, 99, color_light_peach, color_dark_blue);
/*int last_x = 0, last_y = 120;
for (int x=0; x<1102; ++x) {
int y = 700 - (350+300*(float(beeps[x*10])/float(AUDIO_FORMAT_MAX_VALUE)));
SDL_RenderDrawLine(sdlRenderer, x, y, last_x, last_y);
last_x = x; last_y = y;
}*/
draw_string("HOLA", 10, 10);
SDL_RenderPresent(sdlRenderer);
draw_string("HOLA", 11, 11, color_black);
draw_string("HOLA", 10, 10, color_white);
draw_present();
SDL_QueueAudio(sdlAudioDevice, &beeps[0], SOUND_SIZE_IN_BYTES*8);
SDL_PauseAudioDevice(sdlAudioDevice, 0);
@@ -102,8 +83,7 @@ int main(int argc, char* argv[]) {
}
}
SDL_DestroyRenderer(sdlRenderer);
SDL_DestroyWindow(sdlWindow);
draw_quit();
SDL_Quit();
return 0;
}