summaryrefslogtreecommitdiff
path: root/diff.out
blob: 8ee81c6340057a6eb6c4ca3724cd3f73ffa336a1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
===================================================================
RCS file: RCS/camera.h,v
retrieving revision 1.1
diff -r1.1 camera.h
24c24
< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
---
> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
===================================================================
RCS file: RCS/config.h,v
retrieving revision 1.5
diff -r1.5 config.h
===================================================================
RCS file: RCS/global.h,v
retrieving revision 1.1
diff -r1.1 global.h
24c24
< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
---
> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
===================================================================
RCS file: RCS/mass.h,v
retrieving revision 1.4
diff -r1.4 mass.h
24c24
< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
---
> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
67a68
> 	void getPreviousPosition(double& x, double& x, double& x) const;
100a102
> 	double	m_prevx,m_prevy,m_prevz;
===================================================================
RCS file: RCS/matrix.h,v
retrieving revision 1.1
diff -r1.1 matrix.h
24c24
< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
---
> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
===================================================================
RCS file: RCS/particles.h,v
retrieving revision 1.3
diff -r1.3 particles.h
24c24
< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
---
> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
39c39,40
< 	void add(GLfloat x, GLfloat y, GLfloat z,
---
> 	void add(GLfloat x1, GLfloat y1, GLfloat z1,
> 		 GLfloat x2, GLfloat y2, GLfloat z2,
43c44
< 	void updateNoDraw();
---
> 	void update();
49c50,51
< 	    GLfloat	x,y,z;
---
> 	    GLfloat	x1,y1,z1;
> 	    GLfloat	x2,y2,z2;
===================================================================
RCS file: RCS/sparks.h,v
retrieving revision 1.3
diff -r1.3 sparks.h
24c24
< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
---
> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
44c44
< 	void updateNoDraw();
---
> 	void update();
rcsdiff: RCS/*.html,v: No such file or directory
===================================================================
RCS file: RCS/makefile,v
retrieving revision 1.1
diff -r1.1 makefile
22c22
< # $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
---
> # $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
50c50
< DEBUG	=	-DDEBUG
---
> #DEBUG	=	-DDEBUG