Skip to content

Commit ef6bd63

Browse files
committed
quick fix
1 parent 65aca67 commit ef6bd63

File tree

5 files changed

+22
-6
lines changed

5 files changed

+22
-6
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111
*.pptx
1212
*.docx
1313
bin/
14-
temp/
14+
temp/
15+
obj/

effects.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@ void bars()
4747
/******************* CIRCLE3D **********************/
4848
void circle3d()
4949
{
50-
glTranslatef(0,-5,-50.0);
50+
glTranslatef(0,-10,-56.0);
5151
//Translation motion along(x,y,z) axis
5252
//rotation after translation (order matters)
5353
glRotatef(deg,1,0,0); //(degree, x,y,z);
54+
glRotatef(220,0,1,0);
5455
//deg+=1.5;
5556
d=0.8;
5657
glPointSize(10.0);
@@ -124,7 +125,7 @@ void circle3d()
124125
glVertex3f(x-d,0,z-d); //-x,y=0,z
125126
glEnd();
126127
}
127-
128+
glLineWidth(0.8);
128129
{
129130

130131
glColor3f(1,1,1);
@@ -319,7 +320,7 @@ void dust()
319320
//Translation motion along(x,y,z) axis
320321
d=0.7;
321322
glPointSize(2.0);
322-
glColor3ub(0x43,0xA0,0x47);
323+
glColor3ub(0xFF,0xCA,0x28);
323324
for(int i=0; i<60; i++)
324325
{
325326
if((int)avgarr.size()-2<=j)

logo.ico

36.3 KB
Binary file not shown.

main.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ int flag=0,temp=0,loading=0,timerFlag=0;
1818
int W,H;
1919
typedef unsigned long long timestamp_t;
2020
int j=0;
21-
float r=20.0; //circle "r"
21+
float r=23.0; //circle "r"
2222
float d=0.3; //cuboid width/2
23-
float deg=30.0;
23+
float deg=15.0;
2424
double SAMPLE_COUNT;
2525
double SAMPLE_RATE;
2626
kiss_fft_cpx in[N], out[N];
@@ -70,6 +70,7 @@ void reshape(int w, int h)
7070

7171
void drawStrokeText(char*str,int x,int y,int z)
7272
{
73+
glLineWidth(1);
7374
char *c;
7475
float wt = glutStrokeLength(GLUT_STROKE_ROMAN,(unsigned char*)str)*0.4;
7576
glPushMatrix();
@@ -86,6 +87,7 @@ void drawStrokeText(char*str,int x,int y,int z)
8687
void instructText(char*str,int x,int y,int z)
8788
{
8889
char *c;
90+
glLineWidth(1);
8991
float wt = glutStrokeLength(GLUT_STROKE_ROMAN,(unsigned char*)str)*0.1;
9092
glPushMatrix();
9193
glTranslatef(-wt/2, y+8,z);
@@ -399,6 +401,8 @@ void *callLoadData(void *thread)
399401
{
400402
loadData();
401403
loading=1;
404+
glutKeyboardFunc(processKeys);
405+
glutSpecialFunc(processSpecialKeys);
402406
pthread_exit(NULL);
403407
}
404408

@@ -420,6 +424,8 @@ void loadingScreen()
420424
i+=.5;
421425
}
422426
rot_val+=1;
427+
if(rot_val>360)
428+
rot_val-=360;
423429
}
424430
void display(void)
425431
{
@@ -433,6 +439,8 @@ void display(void)
433439
if(loading==0){
434440
loadingScreen();
435441
if(timerFlag++==0){
442+
glutKeyboardFunc(NULL);
443+
glutSpecialFunc(NULL);
436444
rc1 = pthread_create(&threads[0], NULL, callLoadData, (void *)0);
437445
if (rc1){
438446
cout << "Error:unable to create thread rc2," << rc1 << endl;

resource.rc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#ifndef RESOURCE_RC_INCLUDED
2+
#define RESOURCE_RC_INCLUDED
3+
4+
MAINICON ICON "logo.ico"
5+
6+
#endif // RESOURCE_RC_INCLUDED

0 commit comments

Comments
 (0)