Skip to content

Commit 12338a6

Browse files
committed
minor bug fix
1 parent 5dfb6f2 commit 12338a6

File tree

5 files changed

+36
-11
lines changed

5 files changed

+36
-11
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@
99
*.dll
1010
*.txt
1111
*.pptx
12-
bin/
12+
*.docx
13+
bin/
14+
temp/

effects.cpp

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ void bars()
3131
glVertex3f(x-d,0,z); //-x,y=0,z
3232
glEnd();
3333
}
34+
//sync
35+
//j++;
36+
//Sleep(97);
37+
3438
//sync3
3539
if( curtime > (j*100+100))
3640
{
@@ -123,38 +127,45 @@ void circle3d()
123127

124128
{
125129

126-
glBegin(GL_LINE_LOOP);
127130
glColor3f(1,1,1);
131+
glBegin(GL_LINE_LOOP);
128132
//left
129133
glVertex3f(x-d,0,z+d); //-x,y=0,z
130134
glVertex3f(x-d,0,z-d); //-x,y=0,-z
131135
glVertex3f(x-d,y,z-d); //-x,y,-z
132136
glVertex3f(x-d,y,z+d); //-x,y,z
137+
glEnd();
133138

134139
//back
140+
glBegin(GL_LINE_LOOP);
135141
glVertex3f(x+d,0,z-d); //x,y=0,z
136142
glVertex3f(x+d,y,z-d); //x,y,z
137143
glVertex3f(x-d,y,z-d); //-x,y,z
138144
glVertex3f(x-d,0,z-d); //-x,y=0,z
145+
glEnd();
139146

140147
//right
148+
glBegin(GL_LINE_LOOP);
141149
glVertex3f(x+d,0,z+d); //x,y=0,z
142150
glVertex3f(x+d,0,z-d); //x,y=0,-z
143151
glVertex3f(x+d,y,z-d); //x,y,-z
144152
glVertex3f(x+d,y,z+d); //x,y,z
153+
glEnd();
145154

146155
//front
156+
glBegin(GL_LINE_LOOP);
147157
glVertex3f(x+d,0,z+d); //x,y=0,z
148158
glVertex3f(x+d,y,z+d); //x,y,z
149159
glVertex3f(x-d,y,z+d); //-x,y,z
150160
glVertex3f(x-d,0,z+d); //-x,y=0,z
161+
glEnd();
151162

152163
//top
164+
glBegin(GL_LINE_LOOP);
153165
glVertex3f(x-d,y,z+d); //-x,y,z
154166
glVertex3f(x+d,y,z+d); //x,y,z
155167
glVertex3f(x+d,y,z-d); //x,y,-z
156168
glVertex3f(x-d,y,z-d); //-x,y,-z
157-
158169
glEnd();
159170

160171
}
@@ -189,7 +200,7 @@ void pentagon()
189200
{
190201
x=r*cos(deg*(3.14/180));
191202
y=r*sin(deg*(3.14/180));
192-
glVertex2f(x,y);
203+
glVertex3f(x,y,z);
193204
deg+=72;
194205
}
195206
glEnd();
@@ -320,7 +331,7 @@ void dust()
320331
x=r*cos(deg*(3.14/180));
321332
y=r*sin(deg*(3.14/180));
322333
glBegin(GL_POINTS);
323-
glVertex2f(x,y);
334+
glVertex3f(x,y,z);
324335
glEnd();
325336
deg+=6;
326337
}

main.cpp

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,12 @@ void processKeys(unsigned char key, int x, int y)
137137
sound.pause();
138138
temp--;
139139
}
140+
if(flag==0)
141+
{
142+
flag=1;
143+
temp=1;
144+
sound.play();
145+
}
140146
}
141147
else if(key == 77 || key==109)
142148
{
@@ -179,8 +185,8 @@ void processSpecialKeys(int key, int x, int y)
179185
countb-=5;
180186
break;
181187
case GLUT_KEY_F11:
182-
glutFullScreen();
183-
//glutFullScreenToggle();
188+
//glutFullScreen();
189+
glutFullScreenToggle();
184190
break;
185191
}
186192
}
@@ -234,6 +240,7 @@ void display(void)
234240
float tottime = buffer.getDuration().asSeconds();
235241
float cursor = sound.getPlayingOffset().asSeconds();
236242
curtime = sound.getPlayingOffset().asMilliseconds();
243+
//cout<<curtime<<endl;
237244
float timepercent = (cursor/tottime)*760;
238245
ss << (int)cursor;
239246
const std::string tmp = "Time : " + ss.str();
@@ -317,7 +324,6 @@ int BinSrch(int freq)
317324
if(freq>(i*333) && freq<=(i+1)*333)
318325
break;
319326
}
320-
321327
return i;
322328
}
323329

@@ -336,7 +342,8 @@ void loadlogo()
336342

337343
int main(int argc, char *argv[])
338344
{
339-
loadlogo(); //SFML usage error
345+
loadlogo();
346+
//SFML usage error
340347
if (argc < 2)
341348
{
342349
std::cout << "Usage: wave_iteration <FILENAME>" << std::endl;
@@ -346,7 +353,6 @@ int main(int argc, char *argv[])
346353
if (!buffer.loadFromFile(argv[1]))
347354
return 0;
348355
//sound.play(); called just before display
349-
350356
std::cout<<"SampleRate: "<<(SAMPLE_RATE= buffer.getSampleRate())<< std::endl;
351357
std::cout<<"SampleCount: "<<(SAMPLE_COUNT= buffer.getSampleCount())<< std::endl;
352358
std::cout<<"SampleCount/2: "<<buffer.getSampleCount()/2<< std::endl;
@@ -405,7 +411,7 @@ int main(int argc, char *argv[])
405411
int val,f;
406412
mag[i] = sqrt((out[i].r * out[i].r) + (out[i].i * out[i].i));
407413
f = (i*sf)/N;
408-
414+
//cout<<"amp: "<<mag[i]<<" f: "<<f<<endl;
409415
/*
410416
Frequency_Range Frequency_Values
411417
Sub-bass 20 to 60 Hz
@@ -489,6 +495,12 @@ int main(int argc, char *argv[])
489495
temp[j]/=cnt[j];
490496
}
491497
avgarr.push_back(temp);
498+
/*
499+
//print display data
500+
for(int ppp=0;ppp<60;ppp++)
501+
cout<<temp[ppp]<<" ";
502+
cout<<endl;
503+
*/
492504
}
493505

494506
glutInit(&argc, argv);
Binary file not shown.

screenshots/Hann_function.png

-7.84 KB
Binary file not shown.

0 commit comments

Comments
 (0)