Subversion Repositories gelsvn

Rev

Rev 178 | Rev 198 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 178 Rev 195
Line 14... Line 14...
14 
#endif
 14 
#endif
15 
 
 15 
 
16 
#include <list>
 16 
#include <list>
17 
#include <vector>
 17 
#include <vector>
18 
 
 18 
 
- 
 
 19 
#include <assert.h>
- 
 
 20 
#include <stdio.h>
- 
 
 21 
#ifdef WIN32
- 
 
 22 
#include <windows.h>
- 
 
 23 
#include <io.h>
- 
 
 24 
#endif
- 
 
 25 
#include <string.h>
- 
 
 26 
#include <stdlib.h>
- 
 
 27 
 
- 
 
 28 
#include <iostream>
- 
 
 29 
#include <CGLA/Vec2i.h>
- 
 
 30 
#include <CGLA/Vec2f.h>
- 
 
 31 
#include <IL/il.h>
- 
 
 32 
#include <IL/ilu.h>
- 
 
 33 
 
19 
#include <CGLA/Vec3f.h>
 34 
#include <CGLA/Vec3f.h>
20 
#include <CGLA/Mat4x4f.h>
 35 
#include <CGLA/Mat4x4f.h>
21 
#include "GLGraphics/gel_glut.h"
 36 
#include "GLGraphics/gel_glut.h"
22 
#include "GLGraphics/SimpleTrackBall.h"
 37 
#include "GLGraphics/SimpleTrackBall.h"
23 
#include "GLGraphics/draw.h"
 38 
#include "GLGraphics/draw.h"
Line 36... Line 51...
36 
 
 51 
 
37 
SimpleTrackBall* ball;
 52 
SimpleTrackBall* ball;
38 
 
 53 
 
39 
int main_window;
 54 
int main_window;
40 
 
 55 
 
41 
#include <assert.h>
 - 
 
42 
#include <stdio.h>
 - 
 
43 
#ifdef WIN32
 - 
 
44 
#include <windows.h>
 - 
 
45 
#include <io.h>
 - 
 
46 
#endif
 - 
 
47 
#include <string.h>
 - 
 
48 
#include <stdlib.h>
 - 
 
49 
 
 - 
 
50 
#include <iostream>
 - 
 
51 
#include <CGLA/Vec2i.h>
 - 
 
52 
#include <CGLA/Vec2f.h>
 - 
 
53 
#include <IL/il.h>
 - 
 
54 
#include <IL/ilu.h>
 - 
 
55 
 
 - 
 
56 
 
 - 
 
57 
using namespace std;
 - 
 
58 
using namespace CGLA;
 - 
 
59 
 
 - 
 
60 
bool load_image_into_texture(const std::string& name, GLuint& id)
 56 
bool load_image_into_texture(const std::string& name, GLuint& id)
61 
{
 57 
{
62 
    unsigned char* image = 0;
 58 
    unsigned char* image = 0;
63 
    unsigned int bpp = 0;
 59 
    unsigned int bpp = 0;
64 
    unsigned int size_x = 0;
 60 
    unsigned int size_x = 0;