Skip to content

Commit

Permalink
done ig
Browse files Browse the repository at this point in the history
  • Loading branch information
fauwara committed Jul 26, 2022
1 parent f8de7da commit 0668261
Show file tree
Hide file tree
Showing 15 changed files with 317 additions and 92 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
.vscode
a.out
Audio
.vscode
1 change: 1 addition & 0 deletions Audio.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class Audio {
sf::Sound song;
unsigned int sampleRate;
sf::Uint64 sampleCount;
int played = 0;

const sf::Int16* samples;
sf::Uint64 sampleSize;
Expand Down
39 changes: 37 additions & 2 deletions Graphic/Bar.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
class Bar {

public:
const int count = 30; // number of bars
const int count = 60; // number of bars
float scaleBar; // value to scale the bars
float barGap = 0.06;
float maxScale = 4.5;
// float barScale[];

GLfloat vertices[8] = {
Expand All @@ -18,7 +20,40 @@ class Bar {
};

// color format: CMY
GLfloat colors[12] = {
GLfloat colorsLow[12] = {
// 0.6275, 0.7059, 0.2863, // purple
// 0.6275, 0.7059, 0.2863,
// 0.1451, 0.0000, 0.5098, // green
// 0.1451, 0.0000, 0.5098,
// 0.5647, 0.9333, 0.5647, // light green
// 0.5647, 0.9333, 0.5647, // light green
// 0.5647, 0.9333, 0.5647, // light green
// 0.5647, 0.9333, 0.5647, // light green

0.2314, 0.2824, 0.2039,
0.2314, 0.2824, 0.2039,
0.2314, 0.2824, 0.2039,
0.2314, 0.2824, 0.2039,

// 0.1607, 0.1843, 0.2,
// 0.1607, 0.1843, 0.2,
// 0.1607, 0.1843, 0.2,
// 0.1607, 0.1843, 0.2,

// 0.745, 0.2549, 0.6529,
// 0.745, 0.2549, 0.6529,
// 0.745, 0.2549, 0.6529,
// 0.745, 0.2549, 0.6529


// 1.0, 1.0, 1.0, //white
// 1.0, 1.0, 1.0,
// 0.4078, 0.0824, 0.1765, // mint bllue
// 0.4078, 0.0824, 0.1765,
};


GLfloat colorsHigh[12] = {
// 0.6275, 0.7059, 0.2863, // purple
// 0.6275, 0.7059, 0.2863,
// 0.1451, 0.0000, 0.5098, // green
Expand Down
53 changes: 53 additions & 0 deletions Graphic/DescriptionPage.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#pragma once

#include <GL/glut.h>


class DescriptionPage {

public:
int width, height, numColCh;

GLfloat vertices[8] = {
-0.7, 0.7,
0.7, 0.7,
0.7, -0.7,
-0.7, -0.7,
};

// color format: CMY
GLfloat colors[12] = {
// 0.6275, 0.7059, 0.2863, // purple
// 0.6275, 0.7059, 0.2863,
// 0.1451, 0.0000, 0.5098, // green
// 0.1451, 0.0000, 0.5098,
0.2314, 0.2824, 0.2039, // light purple
0.2314, 0.2824, 0.2039,
0.2314, 0.2824, 0.2039, // light purple
0.2314, 0.2824, 0.2039,
// 1.0, 0.0, 0.0, //white
// 1.0, 0.0, 0.0, //white
// 1.0, 0.0, 0.0, //white
// 1.0, 0.0, 0.0, //white
// 1.0, 1.0, 1.0,
// 0.4078, 0.0824, 0.1765, // mint bllue
// 0.4078, 0.0824, 0.1765,
};

// bar indices
GLubyte indices[4] = {
0, 1,
2, 3,
};



// initialize barScale
// void initBarScale() {
// for ( int i = 0; i < numBar; i++) {
// barScale[i] = 0;
// }
// }


};
4 changes: 2 additions & 2 deletions Graphic/Stars.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class Star {
};

// color format: CMY
GLfloat colorsOff[4] = {
0.0, 0.0, 0.0, 1.0
GLfloat colorsOff[3] = {
0.2314, 0.2824, 0.2039,
};

GLfloat colorsOn[4] = {
Expand Down
Binary file removed Textures/back.png
Binary file not shown.
Binary file removed Textures/bottom.png
Binary file not shown.
Binary file removed Textures/front.png
Binary file not shown.
Binary file removed Textures/left.png
Binary file not shown.
Binary file removed Textures/right.png
Binary file not shown.
Binary file removed Textures/skybox.png
Binary file not shown.
Binary file removed Textures/top.png
Binary file not shown.
Binary file modified a.out
Binary file not shown.
31 changes: 0 additions & 31 deletions fft.hpp

This file was deleted.

Loading

0 comments on commit 0668261

Please sign in to comment.