ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/hd/sm.h
(Generate patch)

Comparing ray/src/hd/sm.h (file contents):
Revision 3.1 by gwlarson, Wed Aug 19 17:45:23 1998 UTC vs.
Revision 3.12 by greg, Fri Jun 20 00:25:49 2003 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1998 Silicon Graphics, Inc. */
2 <
3 < /* SCCSid "$SunId$ SGI" */
4 <
1 > /* RCSid: $Id$ */
2   /*
3   *  sm.h
4   */
5  
6   #ifndef _SM_H_
7   #define _SM_H_
11
8   #include "rhd_sample.h"
9 + #include "sm_qtree.h"
10   #include "sm_stree.h"
11 + #define NEWSETS
12  
13 +
14   #ifndef TRUE
15   #define TRUE 1
16   #define FALSE 0
17   #endif
18  
20 #define P_REPLACE_EPS 0.5
21 #define SQRT3_2 0.8660254
19  
20 < #define MAX_EDGES 200
20 > #define ON_V 1
21 > #define ON_P 2
22 > #define ON_E 3
23 > #define IN_T 4
24  
25 < #define SM_INVALID  -1
26 < #define SM_DEFAULT   0
27 < #define SM_EXTRA_POINTS 5
28 < #define SM_EXTRA_VERTS  SM_EXTRA_POINTS
29 < #define SM_POINTSIZ     (3*sizeof(float)+ sizeof(int4))
30 < #define SM_POINT_SPACE SM_EXTRA_POINTS * SM_POINTSIZ
25 > #ifdef SMLFLT
26 > #define VERT_EPS 2e-3 /* min edge length in radians */
27 > #define COS_VERT_EPS 0.999998 /* cos min edge length in radians */
28 > #define EDGE_EPS 2e-5 /* min distance until considered "on-edge"*/
29 > #define COLINEAR_EPS 1e-10 /* min sine of between edges angle :amount off PI */
30 > #else
31 > #define VERT_EPS 5e-4 /* min edge length in radians */
32 > #define COS_VERT_EPS 0.999999875 /* cos min edge length in radians */
33 > #define EDGE_EPS 2e-7 /* min distance until considered "on-edge"*/
34 > #define COLINEAR_EPS 1e-10 /* min sine of between edges angle :amount off PI*/
35 > #endif
36  
37 < #define SM_INC_PERCENT 0.60
37 > #define EV_EPS EDGE_EPS      /* Minimum edge-vertex distance */
38 >
39 >
40 > #define S_REPLACE_SCALE (5.*5.)   /* if (distance to new point squared) is
41 >         > (triangle edge length squared*S_REPLACE_SCALE):for all edges/
42 >         triangle vertices: new point is puncture point: dont add*/
43 > #define S_REPLACE_TRI 2e-8              /* .052 radians to the sixth power */
44 >
45 >
46 >
47 > #define SM_DEFAULT 0
48 > #define SM_BASE_POINTS 162
49 > #define SM_BASE_TRIS 320
50 > #define SM_BASE_VERTS  SM_BASE_POINTS
51 >
52   #define SM_VIEW_FRAC   0.1
53  
54 + #define  SM_ALL_LEVELS -1
55  
56 +
57   typedef int VERT;  /* One triangle that vertex belongs to- the rest
58                        are derived by traversing neighbors */
59  
60   typedef struct _EDGE {
61 <    int verts[2];
61 >    S_ID verts[2];
62      int tris[2];
63   } EDGE;
64 +
65   #define E_NTH_VERT(e,i)  ((e>0)?Edges[(e)].verts[(i)]:Edges[-(e)].verts[(1-i)])
66   #define SET_E_NTH_VERT(e,i,v) if(e>0) Edges[(e)].verts[(i)]=(v); \
67                                 else Edges[-(e)].verts[(1-i)]=(v)
68   #define E_NTH_TRI(e,i)  ((e>0)?Edges[(e)].tris[(i)]:Edges[-(e)].tris[(1-i)])
69   #define SET_E_NTH_TRI(e,i,v) if(e>0) Edges[(e)].tris[(i)]=(v); \
70                                else Edges[-(e)].tris[(1-i)]=(v)
71 < #define eNew_edge() (((Ecnt) < MAX_EDGES)?(++Ecnt):SM_INVALID)
50 < #define eClear_edges() (Ecnt = 0)
71 > #define eClear_edges() (Ecnt = 0,free(Edges),Edges=NULL)
72  
73   #define FOR_ALL_EDGES(i) for((i)=1; (i) <= Ecnt; i++)
74 < #define FOR_ALL_EDGES_FROM(e,i) for((i)=++e; (i) <= Ecnt; i++)
74 > #define FOR_ALL_EDGES_FROM(e,i) for((i)=e+1; (i) <= Ecnt; i++)
75  
76  
77   typedef struct _TRI {
78 <  int verts[3];         /* Ids into sample and vertex array for each vertex*/
78 >  S_ID verts[3];         /* Ids into sample and vertex array for each vertex*/
79    int nbrs[3]; /* Ids for neighboring triangles: -1 if invalid */
80   }TRI;
81  
# Line 66 | Line 87 | typedef struct _TRI {
87   #define T_NTH_V(t,i)  ((t)->verts[(i)])
88   #define T_WHICH_V(t,i)     \
89           (T_NTH_V(t,0)==(i)?0:T_NTH_V(t,1)==(i)?1:T_NTH_V(t,2)==(i)?2:-1)
90 < #define T_NEXT_FREE(t) ((t)->verts[0])
91 < #define T_VALID_FLAG(t) ((t)->verts[1])
90 > #define T_NEXT_FREE(t) ((t)->nbrs[0])
91 > #define T_VALID_FLAG(t) ((t)->nbrs[1])
92   #define T_IS_VALID(t)  (T_VALID_FLAG(t)!=-1)
93   #define T_FLAGS 4
73 #define T_FLAG_BYTES T_FLAGS/8.0
74 #define T_TOTAL_FLAG_BYTES(c)  ((((c)+31)>>5)*sizeof(int4))
94  
95   typedef struct _SM {
96      FVECT view_center;    /* Canonical view center defining unit sphere */
97 <    RSAMP *samples;       /* Sample point information */
98 <    STREE locator;      /* spherical quadtree for point/triangle location */
97 >    SAMP *samples;        /* Sample point information */
98 >    STREE locator;        /* spherical quadtree for point/triangle location */
99      int max_tris;         /* Maximum number of triangles */
100 <    int tri_cnt;          /* Total number of tris ever alloc at one time*/
82 <    int num_tris;         /* Current number of sample (nonbase)triangles */
100 >    int num_tri;          /* Current number of triangles */
101      int free_tris;        /* pointer to free_list */
102      int max_verts;        /* Maximum number of vertices in the mesh */
103      TRI *tris;            /* Pointer to list of triangle structs */
104 <    VERT *verts;          /* List of vertices */
105 <    int4 *flags[T_FLAGS]; /* Bit 0 set if active(in current frustum) */
106 <                             /* Bit 1 set if not rendered since created */
89 <                             /* Bit 2 set if base triangle */
90 <                             /* Bit 3 set used for LRU replacement */
91 <    char *base;           /* Allocated space */
104 >    int32 *flags[T_FLAGS]; /* Bit 0 set if active(in current frustum) */
105 >                          /* Bit 1 set if not rendered since created */
106 >                          /* Bit 2 set if base triangle */
107   }SM;
108  
109   #define T_ACTIVE_FLAG   0
110   #define T_NEW_FLAG      1
111   #define T_BASE_FLAG     2
112 < #define T_LRU_FLAG      3
112 > #define T_BG_FLAG       3
113  
114   #define SM_VIEW_CENTER(m)             ((m)->view_center)
115   #define SM_SAMP(m)                    ((m)->samples)
116   #define SM_LOCATOR(m)                 (&((m)->locator))
117   #define SM_MAX_TRIS(m)                ((m)->max_tris)
118 < #define SM_TRI_CNT(m)                 ((m)->tri_cnt)
104 < #define SM_NUM_TRIS(m)                 ((m)->num_tris)
118 > #define SM_NUM_TRI(m)                 ((m)->num_tri)
119   #define SM_FREE_TRIS(m)               ((m)->free_tris)
120   #define SM_MAX_VERTS(m)               ((m)->max_verts)
121   #define SM_TRIS(m)                    ((m)->tris)
108 #define SM_VERTS(m)                   ((m)->verts)
122   #define SM_NTH_FLAGS(m,n)             ((m)->flags[(n)])
123 < #define SM_BASE(m)                    ((m)->base)
123 > #define SM_FLAGS(m)                   ((m)->flags)
124  
112 #define TF_OFFSET(n)  ((n) >> 5)
113 #define TF_BIT(n)     ((n) & 0x1f)
114 #define SM_IS_NTH_T_FLAG(sm,n,f)  (SM_NTH_FLAGS(sm,f)[TF_OFFSET(n)] & (0x1 <<TF_BIT(n)))
115 #define SM_SET_NTH_T_FLAG(sm,n,f) (SM_NTH_FLAGS(sm,f)[TF_OFFSET(n)] |= (0x1<<TF_BIT(n)))
116 #define SM_CLEAR_NTH_T_FLAG(sm,n,f) (SM_NTH_FLAGS(sm,f)[TF_OFFSET(n)] &= ~(0x1<<TF_BIT(n)))
125  
126 + #define SM_IS_NTH_T_FLAG(sm,n,f)  IS_FLAG(SM_NTH_FLAGS(sm,f),n)
127 + #define SM_SET_NTH_T_FLAG(sm,n,f) SET_FLAG(SM_NTH_FLAGS(sm,f),n)
128 + #define SM_CLR_NTH_T_FLAG(sm,n,f) CLR_FLAG(SM_NTH_FLAGS(sm,f),n)
129 +
130   #define SM_IS_NTH_T_ACTIVE(sm,n)     SM_IS_NTH_T_FLAG(sm,n,T_ACTIVE_FLAG)
131   #define SM_IS_NTH_T_BASE(sm,n)       SM_IS_NTH_T_FLAG(sm,n,T_BASE_FLAG)
132   #define SM_IS_NTH_T_NEW(sm,n)        SM_IS_NTH_T_FLAG(sm,n,T_NEW_FLAG)
133 < #define SM_IS_NTH_T_LRU(sm,n)        SM_IS_NTH_T_FLAG(sm,n,T_LRU_FLAG)
133 > #define SM_IS_NTH_T_BG(sm,n)        SM_IS_NTH_T_FLAG(sm,n,T_BG_FLAG)
134  
135   #define SM_SET_NTH_T_ACTIVE(sm,n)    SM_SET_NTH_T_FLAG(sm,n,T_ACTIVE_FLAG)
136   #define SM_SET_NTH_T_BASE(sm,n)      SM_SET_NTH_T_FLAG(sm,n,T_BASE_FLAG)
137 < #define SM_SET_NTH_T_NEW(sm,n)    SM_SET_NTH_T_FLAG(sm,n,T_NEW_FLAG)
138 < #define SM_SET_NTH_T_LRU(sm,n)       SM_SET_NTH_T_FLAG(sm,n,T_LRU_FLAG)
137 > #define SM_SET_NTH_T_NEW(sm,n)       SM_SET_NTH_T_FLAG(sm,n,T_NEW_FLAG)
138 > #define SM_SET_NTH_T_BG(sm,n)        SM_SET_NTH_T_FLAG(sm,n,T_BG_FLAG)
139  
140 < #define SM_CLEAR_NTH_T_ACTIVE(sm,n)  SM_CLEAR_NTH_T_FLAG(sm,n,T_ACTIVE_FLAG)
141 < #define SM_CLEAR_NTH_T_BASE(sm,n)    SM_CLEAR_NTH_T_FLAG(sm,n,T_BASE_FLAG)
142 < #define SM_CLEAR_NTH_T_NEW(sm,n)  SM_CLEAR_NTH_T_FLAG(sm,n,T_NEW_FLAG)
143 < #define SM_CLEAR_NTH_T_LRU(sm,n)     SM_CLEAR_NTH_T_FLAG(sm,n,T_LRU_FLAG)
140 > #define SM_CLR_NTH_T_ACTIVE(sm,n)   SM_CLR_NTH_T_FLAG(sm,n,T_ACTIVE_FLAG)
141 > #define SM_CLR_NTH_T_BASE(sm,n)     SM_CLR_NTH_T_FLAG(sm,n,T_BASE_FLAG)
142 > #define SM_CLR_NTH_T_NEW(sm,n)      SM_CLR_NTH_T_FLAG(sm,n,T_NEW_FLAG)
143 > #define SM_CLR_NTH_T_BG(sm,n)       SM_CLR_NTH_T_FLAG(sm,n,T_BG_FLAG)
144  
145   #define SM_NTH_TRI(m,n)               (&(SM_TRIS(m)[(n)]))
146 < #define SM_NTH_VERT(m,n)              (SM_VERTS(m)[(n)])
147 < #define SM_FREE_TRI_ID(m,n) (n = SM_FREE_TRIS(m)==-1? \
148 <    (SM_TRI_CNT(m)<SM_MAX_TRIS(m)?SM_TRI_CNT(m)++:-1):(n=SM_FREE_TRIS(m), \
137 <     SM_FREE_TRIS(m)=T_NEXT_FREE(SM_NTH_TRI(m,SM_FREE_TRIS(m))),n))
146 > #define SM_NTH_VERT(m,n)              S_NTH_INFO(SM_SAMP(m),n)
147 >
148 > #define SM_T_ID_VALID(s,t_id) T_IS_VALID(SM_NTH_TRI(s,t_id))
149  
139 #define SM_SAMP_BASE(m)               RS_BASE(SM_SAMP(m))
140 #define SM_SAMP_FREE(m)               RS_FREE(SM_SAMP(m))
141 #define SM_SAMP_EOL(m)                RS_EOL(SM_SAMP(m))
142 #define SM_MAX_SAMP(m)                RS_MAX_SAMP(SM_SAMP(m))
143 #define SM_MAX_AUX_PT(m)              RS_MAX_AUX_PT(SM_SAMP(m))
144 #define SM_NTH_WV(m,i)                RS_NTH_W_PT(SM_SAMP(m),i)
145 #define SM_NTH_W_DIR(m,i)             RS_NTH_W_DIR(SM_SAMP(m),i)
146 #define SM_NTH_RGB(m,i)               RS_NTH_RGB(SM_SAMP(m),i)
147 #define SM_RGB(m)                    RS_RGB(SM_SAMP(m))
148 #define SM_BRT(m)                     RS_BRT(SM_SAMP(m))
149 #define SM_NTH_BRT(m,i)               RS_NTH_BRT(SM_SAMP(m),i)
150 #define SM_CHR(m)                     RS_CHR(SM_SAMP(m))
151 #define SM_NTH_CHR(m,i)               RS_NTH_CHR(SM_SAMP(m),i)
152 #define SM_NUM_SAMP(m)               RS_NUM_SAMP(SM_SAMP(m))
153 #define SM_TONE_MAP(m)               RS_TONE_MAP(SM_SAMP(m))
150  
151 + #define SM_MAX_SAMP(m)                S_MAX_SAMP(SM_SAMP(m))
152 + #define SM_MAX_POINTS(m)              S_MAX_POINTS(SM_SAMP(m))
153 + #define SM_SAMP_BASE(m)               S_BASE(SM_SAMP(m))
154 + #define SM_NTH_WV(m,i)                S_NTH_W_PT(SM_SAMP(m),i)
155 + #define SM_NTH_W_DIR(m,i)             S_NTH_W_DIR(SM_SAMP(m),i)
156 + #define SM_DIR_ID(m,i)            (!SM_BASE_ID(m,i) && SM_NTH_W_DIR(m,i)==-1)
157 + #define SM_NTH_RGB(m,i)               S_NTH_RGB(SM_SAMP(m),i)
158 + #define SM_RGB(m)                    S_RGB(SM_SAMP(m))
159 + #define SM_WP(m)                    S_W_PT(SM_SAMP(m))
160 + #define SM_BRT(m)                     S_BRT(SM_SAMP(m))
161 + #define SM_NTH_BRT(m,i)               S_NTH_BRT(SM_SAMP(m),i)
162 + #define SM_CHR(m)                     S_CHR(SM_SAMP(m))
163 + #define SM_NTH_CHR(m,i)               S_NTH_CHR(SM_SAMP(m),i)
164 + #define SM_NUM_SAMP(m)               S_NUM_SAMP(SM_SAMP(m))
165 + #define SM_TONE_MAP(m)               S_TONE_MAP(SM_SAMP(m))
166 +
167   #define SM_ALLOWED_VIEW_CHANGE(m) (SM_NUM_SAMP(m)/smDist_sum*SM_VIEW_FRAC)
168  
157 #define SM_FOR_ALL_FLAGGED_TRIS(m,i,w,b) for(i=0,i=smNext_tri_flag_set(m,i,w,b);i < SM_TRI_CNT(m);i++,i=smNext_tri_flag_set(m,i,w,b))
158
159 #define SM_FOR_ALL_ACTIVE_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_ACTIVE_FLAG,0)
160 #define SM_FOR_ALL_NEW_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_NEW_FLAG,0)
161 #define SM_FOR_ALL_BASE_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_BASE_FLAG,0)
162 #define SM_FOR_ALL_VALID_TRIS(m,i) for((i)=0,(i)=smNext_valid_tri(m,i);(i)< \
163 SM_TRI_CNT(m); (i)++,(i)= smNext_valid_tri(m,i))
164
165 #define SM_FOR_ALL_ACTIVE_FG_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_ACTIVE_FLAG,1)
166
167 #define SM_FOR_ALL_ACTIVE_BG_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_ACTIVE_FLAG,2)
168
169
169   #define SM_FOR_ALL_ADJACENT_TRIS(sm,id,t) for(t=smTri_next_ccw_nbr(sm,t,id); \
170   t!=SM_NTH_TRI(sm,SM_NTH_VERT(sm,id)); t=smTri_next_ccw_nbr(sm,t,id))
171  
172   #define SM_INVALID_SAMP_ID(sm,id)  (((id) < 0) || ((id) >= SM_MAX_SAMP(sm)))
173 < #define SM_INVALID_POINT_ID(sm,id)  (((id) < 0) || ((id) >= SM_MAX_AUX_PT(sm)))
175 < #define SM_T_CENTROID(sm,t,c)  tri_centroid(SM_NTH_WV(sm,T_NTH_V(t,0)),SM_NTH_WV(sm,T_NTH_V(t,1)),SM_NTH_WV(sm,T_NTH_V(t,2)),c)
173 > #define SM_INVALID_POINT_ID(sm,id)  (((id) < 0) || ((id) >= SM_MAX_POINTS(sm)))
174   #define SM_T_NTH_WV(sm,t,i)  (SM_NTH_WV(sm,T_NTH_V(t,i)))
175  
176   #define SM_BASE_ID(s,i)  \
177 < ((i) >= RS_MAX_SAMP(SM_SAMP(s)) && (i) < RS_MAX_AUX_PT(SM_SAMP(s)))
177 > ((i) >= S_MAX_SAMP(SM_SAMP(s)) && (i) < S_MAX_BASE_PT(SM_SAMP(s)))
178  
179   #define SM_BG_SAMPLE(sm,i)   (SM_NTH_W_DIR(sm,i)==-1)
180  
181 < #define SM_BG_TRI(sm,i)  (SM_BG_SAMPLE(sm,T_NTH_V(SM_NTH_TRI(sm,i),0)) || \
181 > #define SM_BG_TRI(sm,i)  (SM_BG_SAMPLE(sm,T_NTH_V(SM_NTH_TRI(sm,i),0)) && \
182 >                          SM_BG_SAMPLE(sm,T_NTH_V(SM_NTH_TRI(sm,i),1)) && \
183 >                          SM_BG_SAMPLE(sm,T_NTH_V(SM_NTH_TRI(sm,i),2)))
184 > #define SM_MIXED_TRI(sm,i)  (SM_BG_SAMPLE(sm,T_NTH_V(SM_NTH_TRI(sm,i),0)) || \
185                            SM_BG_SAMPLE(sm,T_NTH_V(SM_NTH_TRI(sm,i),1)) || \
186                            SM_BG_SAMPLE(sm,T_NTH_V(SM_NTH_TRI(sm,i),2)))
187  
188   #define SM_FOR_ALL_SAMPLES(sm,i) for((i)=0;i < SM_NUM_SAMP(sm);(i)++)
189  
190 < typedef struct _T_DEPTH {
191 <  int tri;
191 <  double depth;
192 < }T_DEPTH;
190 > #define SM_FOR_ALL_VALID_TRIS(m,i) for((i)=0,(i)=smNext_valid_tri(m,i);(i)< \
191 > SM_NUM_TRI(m); (i)++,(i)= smNext_valid_tri(m,i))
192  
193 + #define SM_FOR_ALL_FLAGGED_TRIS(m,i,w,b) for(i=0,i=smNext_tri_flag_set(m,i,w,b);i < SM_NUM_TRI(m);i++,i=smNext_tri_flag_set(m,i,w,b))
194 + #define SM_FOR_ALL_ACTIVE_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_ACTIVE_FLAG,0)
195 + #define smInit_locator(sm)    stInit(SM_LOCATOR(sm))
196 + #define smAlloc_locator(sm)   stAlloc(SM_LOCATOR(sm))
197 + #define smFree_locator(sm)   stFree(SM_LOCATOR(sm))
198 + #define smUnalloc_samp(sm,id)  sUnalloc_samp(SM_SAMP(sm),id)
199 + #define smPoint_locate_cell(sm,pt)  stPoint_locate(SM_LOCATOR(sm),pt)
200 + #define smFree_samples(sm)     sFree(SM_SAMP(sm))
201 + #define smInit_samples(sm)     sInit(SM_SAMP(sm))
202  
203 + #define SM_S_NTH_QT(sm,s_id)       S_NTH_INFO1(SM_SAMP(sm),s_id)
204 + #define smClear_vert(sm,id)    (SM_NTH_VERT(sm,id) = INVALID)
205 +
206 + #define freebuf(b)  tempbuf(-1)
207 +
208 + typedef struct _RT_ARGS_{
209 +  FVECT orig,dir;
210 +  int t_id;
211 +  S_ID *os;
212 + }RT_ARGS;
213 +
214 + typedef struct _S_ARGS_{
215 +  S_ID s_id;
216 +  S_ID n_id;
217 + }S_ARGS;
218 +
219 +
220 + typedef struct _ADD_ARGS {
221 +  int t_id;
222 +  S_ID *del_set;
223 + }ADD_ARGS;
224 +
225   extern SM *smMesh;
196 extern int smNew_tri_cnt;
226   extern double smDist_sum;
227  
228 +
229   #ifdef TEST_DRIVER
230   extern VIEW View;
231   extern VIEW Current_View;
232 < extern int Pick_tri,Picking;
232 > extern int Pick_tri,Picking,Pick_samp;
233   extern FVECT Pick_point[500],Pick_origin,Pick_dir;
234   extern FVECT Pick_v0[500],Pick_v1[500],Pick_v2[500];
235 + extern int Pick_q[500];
236   extern FVECT P0,P1,P2;
237   extern int Pick_cnt;
238   extern FVECT FrustumNear[4],FrustumFar[4];
239   #endif
240  
241 < #ifdef DEBUG
242 < extern int Malloc_cnt;
243 < #endif
241 >
242 > /*
243 > * int
244 > * smInit(n)            : Initialize/clear data structures for n entries
245 > * int  n;
246 > *
247 > * Initialize sampL and other data structures for at least n samples.
248 > * If n is 0, then free data structures.  Return number actually allocated.
249 > *
250 > *
251 > * int
252 > * smNewSamp(c, p, v)   : register new sample point and return index
253 > * COLR c;              : pixel color (RGBE)
254 > * FVECT        p;      : world intersection point
255 > * FVECT        v;      : ray direction vector
256 > *
257 > * Add new sample point to data structures, removing old values as necessary.
258 > * New sample representation will be output in next call to smUpdate().
259 > *
260 > *
261 > * int
262 > * smFindSamp(orig, dir): intersect ray with 3D rep. and find closest sample
263 > * FVECT        orig, dir;
264 > *
265 > * Find the closest sample to the given ray.  Return -1 on failure.
266 > *
267 > */
268   #endif
269  
270  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines