ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/radiance/ray/src/hd/sm.c

Comparing ray/src/hd/sm.c (file contents):
Revision 3.8 by gwlarson, Tue Oct 6 18:16:54 1998 UTC vs.
Revision 3.11 by gwlarson, Wed Dec 30 13:44:15 1998 UTC

#	Line 19 | Line 19 | static char SCCSid[] = "$SunId$ SGI";
19		SM *smMesh = NULL;
20		double smDist_sum=0;
21		int smNew_tri_cnt=0;
22	<	double smMinSampDiff = 1e-4;
22	>	double smMinSampDiff = 4.25e-4; /* min edge length in radians */
23
24	<	static FVECT smDefault_base[4] = { {SQRT3_INV, SQRT3_INV, SQRT3_INV},
25	<	{-SQRT3_INV, -SQRT3_INV, SQRT3_INV},
26	<	{-SQRT3_INV, SQRT3_INV, -SQRT3_INV},
27	<	{SQRT3_INV, -SQRT3_INV, -SQRT3_INV}};
28	<	static int smTri_verts[4][3] = { {2,1,0},{3,2,0},{1,3,0},{2,3,1}};
24	>	/* Each edge extends .5536 radians - 31.72 degrees */
25	>	static FVECT icosa_verts[162] =
26	>	{{-0.018096,0.495400,0.868477},{0.018614,-0.554780,0.831789},
27	>	{0.850436,0.011329,0.525956},{0.850116,0.048016,-0.524402},
28	>	{-0.850116,-0.048016,0.524402},{-0.850436,-0.011329,-0.525956},
29	>	{0.495955,0.867825,0.030147},{-0.555329,0.831118,0.029186},
30	>	{0.555329,-0.831118,-0.029186},{-0.495955,-0.867825,-0.030147},
31	>	{-0.018614,0.554780,-0.831789},{0.018096,-0.495400,-0.868477},
32	>	{0.000305,-0.034906,0.999391},{0.489330,0.297837,0.819664},
33	>	{0.510900,-0.319418,0.798094},{-0.488835,-0.354308,0.797186},
34	>	{-0.510409,0.262947,0.818744},{0.999391,0.034875,0.000914},
35	>	{0.791335,0.516672,0.326862},{0.791142,0.538234,-0.290513},
36	>	{0.826031,-0.460219,-0.325378},{0.826216,-0.481780,0.291985},
37	>	{-0.999391,-0.034875,-0.000914},{-0.826216,0.481780,-0.291985},
38	>	{-0.826031,0.460219,0.325378},{-0.791142,-0.538234,0.290513},
39	>	{-0.791335,-0.516672,-0.326862},{-0.034911,0.998782,0.034881},
40	>	{0.280899,0.801316,0.528194},{-0.337075,0.779739,0.527624},
41	>	{-0.337377,0.814637,-0.471746},{0.280592,0.836213,-0.471186},
42	>	{0.034911,-0.998782,-0.034881},{-0.280592,-0.836213,0.471186},
43	>	{0.337377,-0.814637,0.471746},{0.337075,-0.779739,-0.527624},
44	>	{-0.280899,-0.801316,-0.528194},{-0.000305,0.034906,-0.999391},
45	>	{0.510409,-0.262947,-0.818744},{0.488835,0.354308,-0.797186},
46	>	{-0.510900,0.319418,-0.798094},{-0.489330,-0.297837,-0.819664},
47	>	{0.009834,-0.306509,0.951817},{0.268764,-0.186284,0.945021},
48	>	{0.275239,-0.454405,0.847207},{-0.009247,0.239357,0.970888},
49	>	{0.244947,0.412323,0.877491},{0.257423,0.138235,0.956360},
50	>	{0.525850,-0.011345,0.850502},{0.696394,0.160701,0.699436},
51	>	{0.707604,-0.160141,0.688223},{-0.268186,0.119892,0.955878},
52	>	{-0.274715,0.394186,0.877011},{-0.244420,-0.472542,0.846737},
53	>	{-0.256843,-0.204627,0.944542},{-0.525332,-0.048031,0.849541},
54	>	{-0.695970,-0.209123,0.686945},{-0.707182,0.111718,0.698149},
55	>	{0.961307,0.043084,-0.272090},{0.941300,0.301289,-0.152245},
56	>	{0.853076,0.304715,-0.423568},{0.961473,0.024015,0.273848},
57	>	{0.853344,0.274439,0.443269},{0.941400,0.289953,0.172315},
58	>	{0.831918,0.554570,0.019109},{0.669103,0.719629,0.185565},
59	>	{0.669003,0.730836,-0.135332},{0.959736,-0.234941,0.153979},
60	>	{0.871472,-0.244526,0.425140},{0.871210,-0.214250,-0.441690},
61	>	{0.959638,-0.223606,-0.170573},{0.868594,-0.495213,-0.017555},
62	>	{0.717997,-0.671205,-0.184294},{0.718092,-0.682411,0.136596},
63	>	{-0.961307,-0.043084,0.272090},{-0.959638,0.223606,0.170573},
64	>	{-0.871210,0.214250,0.441690},{-0.961473,-0.024015,-0.273848},
65	>	{-0.871472,0.244526,-0.425140},{-0.959736,0.234941,-0.153979},
66	>	{-0.868594,0.495213,0.017555},{-0.718092,0.682411,-0.136596},
67	>	{-0.717997,0.671205,0.184294},{-0.941400,-0.289953,-0.172315},
68	>	{-0.853344,-0.274439,-0.443269},{-0.853076,-0.304715,0.423568},
69	>	{-0.941300,-0.301289,0.152245},{-0.831918,-0.554570,-0.019109},
70	>	{-0.669003,-0.730836,0.135332},{-0.669103,-0.719629,-0.185565},
71	>	{-0.306809,0.951188,0.033302},{-0.195568,0.935038,0.295731},
72	>	{-0.463858,0.837300,0.289421},{0.239653,0.970270,0.033802},
73	>	{0.403798,0.867595,0.290218},{0.129326,0.946383,0.296031},
74	>	{-0.029535,0.831255,0.555106},{0.136603,0.674019,0.725974},
75	>	{-0.184614,0.662804,0.725678},{0.129164,0.964728,-0.229382},
76	>	{0.403637,0.885733,-0.229245},{-0.464015,0.855438,-0.230036},
77	>	{-0.195726,0.953383,-0.229677},{-0.029855,0.867949,-0.495755},
78	>	{-0.185040,0.711807,-0.677562},{0.136173,0.723022,-0.677271},
79	>	{0.306809,-0.951188,-0.033302},{0.195726,-0.953383,0.229677},
80	>	{0.464015,-0.855438,0.230036},{-0.239653,-0.970270,-0.033802},
81	>	{-0.403637,-0.885733,0.229245},{-0.129164,-0.964728,0.229382},
82	>	{0.029855,-0.867949,0.495755},{-0.136173,-0.723022,0.677271},
83	>	{0.185040,-0.711807,0.677562},{-0.129326,-0.946383,-0.296031},
84	>	{-0.403798,-0.867595,-0.290218},{0.463858,-0.837300,-0.289421}
85	>	,{0.195568,-0.935038,-0.295731},{0.029535,-0.831255,-0.555106},
86	>	{0.184614,-0.662804,-0.725678},{-0.136603,-0.674019,-0.725974},
87	>	{-0.009834,0.306509,-0.951817},{0.256843,0.204627,-0.944542},
88	>	{0.244420,0.472542,-0.846737},{0.009247,-0.239357,-0.970888},
89	>	{0.274715,-0.394186,-0.877011},{0.268186,-0.119892,-0.955878},
90	>	{0.525332,0.048031,-0.849541},{0.707182,-0.111718,-0.698149},
91	>	{0.695970,0.209123,-0.686945},{-0.257423,-0.138235,-0.956360},
92	>	{-0.244947,-0.412323,-0.877491},{-0.275239,0.454405,-0.847207},
93	>	{-0.268764,0.186284,-0.945021},{-0.525850,0.011345,-0.850502},
94	>	{-0.707604,0.160141,-0.688223},{-0.696394,-0.160701,-0.699436},
95	>	{0.563717,0.692920,0.449538},{0.673284,0.428212,0.602763},
96	>	{0.404929,0.577853,0.708603},{0.445959,-0.596198,0.667584},
97	>	{0.702960,-0.421213,0.573086},{0.611746,-0.681577,0.401523},
98	>	{-0.445543,0.548166,0.707818},{-0.702606,0.380190,0.601498},
99	>	{-0.611490,0.651895,0.448456},{-0.563454,-0.722602,0.400456},
100	>	{-0.672921,-0.469235,0.571835},{-0.404507,-0.625886,0.666814},
101	>	{0.404507,0.625886,-0.666814},{0.672921,0.469235,-0.571835},
102	>	{0.563454,0.722602,-0.400456},{0.611490,-0.651895,-0.448456},
103	>	{0.702606,-0.380190,-0.601498},{0.445543,-0.548166,-0.707818},
104	>	{-0.611746,0.681577,-0.401523},{-0.702960,0.421213,-0.573086},
105	>	{-0.445959,0.596198,-0.667584},{-0.404929,-0.577853,-0.708603},
106	>	{-0.673284,-0.428212,-0.602763},{-0.563717,-0.692920,-0.449538}};
107	>	static int icosa_tris[320][3] =
108	>	{ {1,42,44},{42,12,43},{44,43,14},{42,43,44},{12,45,47},{45,0,46},{47,46,13},
109	>	{45,46,47},{14,48,50},{48,13,49},{50,49,2},{48,49,50},{12,47,43},{47,13,48},
110	>	{43,48,14},{47,48,43},{0,45,52},{45,12,51},{52,51,16},{45,51,52},{12,42,54},
111	>	{42,1,53},{54,53,15},{42,53,54},{16,55,57},{55,15,56},{57,56,4},{55,56,57},
112	>	{12,54,51},{54,15,55},{51,55,16},{54,55,51},{3,58,60},{58,17,59},{60,59,19},
113	>	{58,59,60},{17,61,63},{61,2,62},{63,62,18},{61,62,63},{19,64,66},{64,18,65},
114	>	{66,65,6},{64,65,66},{17,63,59},{63,18,64},{59,64,19},{63,64,59},{2,61,68},
115	>	{61,17,67},{68,67,21},{61,67,68},{17,58,70},{58,3,69},{70,69,20},{58,69,70},
116	>	{21,71,73},{71,20,72},{73,72,8},{71,72,73},{17,70,67},{70,20,71},{67,71,21},
117	>	{70,71,67},{4,74,76},{74,22,75},{76,75,24},{74,75,76},{22,77,79},{77,5,78},
118	>	{79,78,23},{77,78,79},{24,80,82},{80,23,81},{82,81,7},{80,81,82},{22,79,75},
119	>	{79,23,80},{75,80,24},{79,80,75},{5,77,84},{77,22,83},{84,83,26},{77,83,84},
120	>	{22,74,86},{74,4,85},{86,85,25},{74,85,86},{26,87,89},{87,25,88},{89,88,9},
121	>	{87,88,89},{22,86,83},{86,25,87},{83,87,26},{86,87,83},{7,90,92},{90,27,91},
122	>	{92,91,29},{90,91,92},{27,93,95},{93,6,94},{95,94,28},{93,94,95},{29,96,98},
123	>	{96,28,97},{98,97,0},{96,97,98},{27,95,91},{95,28,96},{91,96,29},{95,96,91},
124	>	{6,93,100},{93,27,99},{100,99,31},{93,99,100},{27,90,102},{90,7,101},
125	>	{102,101,30},{90,101,102},{31,103,105},{103,30,104},{105,104,10},{103,104,105},
126	>	{27,102,99},{102,30,103},{99,103,31},{102,103,99},{8,106,108},{106,32,107},
127	>	{108,107,34},{106,107,108},{32,109,111},{109,9,110},{111,110,33},{109,110,111},
128	>	{34,112,114},{112,33,113},{114,113,1},{112,113,114},{32,111,107},{111,33,112},
129	>	{107,112,34},{111,112,107},{9,109,116},{109,32,115},{116,115,36},{109,115,116},
130	>	{32,106,118},{106,8,117},{118,117,35},{106,117,118},{36,119,121},{119,35,120},
131	>	{121,120,11},{119,120,121},{32,118,115},{118,35,119},{115,119,36},{118,119,115},
132	>	{10,122,124},{122,37,123},{124,123,39},{122,123,124},{37,125,127},{125,11,126},
133	>	{127,126,38},{125,126,127},{39,128,130},{128,38,129},{130,129,3},{128,129,130},
134	>	{37,127,123},{127,38,128},{123,128,39},{127,128,123},{11,125,132},{125,37,131},
135	>	{132,131,41},{125,131,132},{37,122,134},{122,10,133},{134,133,40},{122,133,134},
136	>	{41,135,137},{135,40,136},{137,136,5},{135,136,137},{37,134,131},{134,40,135},
137	>	{131,135,41},{134,135,131},{6,65,94},{65,18,138},{94,138,28},{65,138,94},
138	>	{18,62,139},{62,2,49},{139,49,13},{62,49,139},{28,140,97},{140,13,46},{97,46,0},
139	>	{140,46,97},{18,139,138},{139,13,140},{138,140,28},{139,140,138},{1,44,114},
140	>	{44,14,141},{114,141,34},{44,141,114},{14,50,142},{50,2,68},{142,68,21},
141	>	{50,68,142},{34,143,108},{143,21,73},{108,73,8},{143,73,108},{14,142,141},
142	>	{142,21,143},{141,143,34},{142,143,141},{0,52,98},{52,16,144},{98,144,29},
143	>	{52,144,98},{16,57,145},{57,4,76},{145,76,24},{57,76,145},{29,146,92},
144	>	{146,24,82},{92,82,7},{146,82,92},{16,145,144},{145,24,146},{144,146,29},
145	>	{145,146,144},{9,88,110},{88,25,147},{110,147,33},{88,147,110},{25,85,148},
146	>	{85,4,56},{148,56,15},{85,56,148},{33,149,113},{149,15,53},{113,53,1},
147	>	{149,53,113},{25,148,147},{148,15,149},{147,149,33},{148,149,147},{10,124,105},
148	>	{124,39,150},{105,150,31},{124,150,105},{39,130,151},{130,3,60},{151,60,19},
149	>	{130,60,151},{31,152,100},{152,19,66},{100,66,6},{152,66,100},{39,151,150},
150	>	{151,19,152},{150,152,31},{151,152,150},{8,72,117},{72,20,153},{117,153,35},
151	>	{72,153,117},{20,69,154},{69,3,129},{154,129,38},{69,129,154},{35,155,120},
152	>	{155,38,126},{120,126,11},{155,126,120},{20,154,153},{154,38,155},{153,155,35},
153	>	{154,155,153},{7,81,101},{81,23,156},{101,156,30},{81,156,101},{23,78,157},
154	>	{78,5,136},{157,136,40},{78,136,157},{30,158,104},{158,40,133},{104,133,10},
155	>	{158,133,104},{23,157,156},{157,40,158},{156,158,30},{157,158,156},{11,132,121},
156	>	{132,41,159},{121,159,36},{132,159,121},{41,137,160},{137,5,84},{160,84,26},
157	>	{137,84,160},{36,161,116},{161,26,89},{116,89,9},{161,89,116},{41,160,159},
158	>	{160,26,161},{159,161,36},{160,161,159}};
159	>	static int icosa_nbrs[320][3] =
160	>	{{3,208,21},{12,3,20},{14,209,3},{2,0,1},{7,12,17},{202,7,16},{201,13,7},
161	>	{6,4,5},{11,212,14},{198,11,13},{197,213,11},{10,8,9},{15,1,4},{9,15,6},
162	>	{8,2,15},{14,12,13},{19,224,5},{28,19,4},{30,225,19},{18,16,17},{23,28,1},
163	>	{250,23,0},{249,29,23},{22,20,21},{27,228,30},{246,27,29},{245,229,27},
164	>	{26,24,25},{31,17,20},{25,31,22},{24,18,31},{30,28,29},{35,261,53},{44,35,52},
165	>	{46,262,35},{34,32,33},{39,44,49},{197,39,48},{196,45,39},{38,36,37},
166	>	{43,265,46},{193,43,45},{192,266,43},{42,40,41},{47,33,36},{41,47,38},
167	>	{40,34,47},{46,44,45},{51,213,37},{60,51,36},{62,214,51},{50,48,49},{55,60,33},
168	>	{277,55,32},{276,61,55},{54,52,53},{59,217,62},{273,59,61},{272,218,59},
169	>	{58,56,57},{63,49,52},{57,63,54},{56,50,63},{62,60,61},{67,229,85},{76,67,84},
170	>	{78,230,67},{66,64,65},{71,76,81},{293,71,80},{292,77,71},{70,68,69},
171	>	{75,233,78},{289,75,77},{288,234,75},{74,72,73},{79,65,68},{73,79,70},
172	>	{72,66,79},{78,76,77},{83,309,69},{92,83,68},{94,310,83},{82,80,81},{87,92,65},
173	>	{245,87,64},{244,93,87},{86,84,85},{91,313,94},{241,91,93},{240,314,91},
174	>	{90,88,89},{95,81,84},{89,95,86},{88,82,95},{94,92,93},{99,234,117},
175	>	{108,99,116},{110,232,99},{98,96,97},{103,108,113},{192,103,112},{194,109,103},
176	>	{102,100,101},{107,226,110},{200,107,109},{202,224,107},{106,104,105},
177	>	{111,97,100},{105,111,102},{104,98,111},{110,108,109},{115,266,101},
178	>	{124,115,100},{126,264,115},{114,112,113},{119,124,97},{288,119,96},
179	>	{290,125,119},{118,116,117},{123,258,126},{296,123,125},{298,256,123},
180	>	{122,120,121},{127,113,116},{121,127,118},{120,114,127},{126,124,125},
181	>	{131,218,149},{140,131,148},{142,216,131},{130,128,129},{135,140,145},
182	>	{240,135,144},{242,141,135},{134,132,133},{139,210,142},{248,139,141},
183	>	{250,208,139},{138,136,137},{143,129,132},{137,143,134},{136,130,143},
184	>	{142,140,141},{147,314,133},{156,147,132},{158,312,147},{146,144,145},
185	>	{151,156,129},{272,151,128},{274,157,151},{150,148,149},{155,306,158},
186	>	{280,155,157},{282,304,155},{154,152,153},{159,145,148},{153,159,150},
187	>	{152,146,159},{158,156,157},{163,256,181},{172,163,180},{174,257,163},
188	>	{162,160,161},{167,172,177},{282,167,176},{281,173,167},{166,164,165},
189	>	{171,260,174},{278,171,173},{277,261,171},{170,168,169},{175,161,164},
190	>	{169,175,166},{168,162,175},{174,172,173},{179,304,165},{188,179,164},
191	>	{190,305,179},{178,176,177},{183,188,161},{298,183,160},{297,189,183},
192	>	{182,180,181},{187,308,190},{294,187,189},{293,309,187},{186,184,185},
193	>	{191,177,180},{185,191,182},{184,178,191},{190,188,189},{195,101,42},
194	>	{204,195,41},{206,102,195},{194,192,193},{199,204,38},{10,199,37},{9,205,199},
195	>	{198,196,197},{203,105,206},{6,203,205},{5,106,203},{202,200,201},{207,193,196},
196	>	{201,207,198},{200,194,207},{206,204,205},{211,138,0},{220,211,2},{222,136,211},
197	>	{210,208,209},{215,220,8},{48,215,10},{50,221,215},{214,212,213},{219,130,222},
198	>	{56,219,221},{58,128,219},{218,216,217},{223,209,212},{217,223,214},
199	>	{216,210,223},{222,220,221},{227,106,16},{236,227,18},{238,104,227},
200	>	{226,224,225},{231,236,24},{64,231,26},{66,237,231},{230,228,229},{235,98,238},
201	>	{72,235,237},{74,96,235},{234,232,233},{239,225,228},{233,239,230},
202	>	{232,226,239},{238,236,237},{243,133,90},{252,243,89},{254,134,243},
203	>	{242,240,241},{247,252,86},{26,247,85},{25,253,247},{246,244,245},{251,137,254},
204	>	{22,251,253},{21,138,251},{250,248,249},{255,241,244},{249,255,246},
205	>	{248,242,255},{254,252,253},{259,122,160},{268,259,162},{270,120,259},
206	>	{258,256,257},{263,268,168},{32,263,170},{34,269,263},{262,260,261},
207	>	{267,114,270},{40,267,269},{42,112,267},{266,264,265},{271,257,260},
208	>	{265,271,262},{264,258,271},{270,268,269},{275,149,58},{284,275,57},
209	>	{286,150,275},{274,272,273},{279,284,54},{170,279,53},{169,285,279},
210	>	{278,276,277},{283,153,286},{166,283,285},{165,154,283},{282,280,281},
211	>	{287,273,276},{281,287,278},{280,274,287},{286,284,285},{291,117,74},
212	>	{300,291,73},{302,118,291},{290,288,289},{295,300,70},{186,295,69},
213	>	{185,301,295},{294,292,293},{299,121,302},{182,299,301},{181,122,299},
214	>	{298,296,297},{303,289,292},{297,303,294},{296,290,303},{302,300,301},
215	>	{307,154,176},{316,307,178},{318,152,307},{306,304,305},{311,316,184},
216	>	{80,311,186},{82,317,311},{310,308,309},{315,146,318},{88,315,317},
217	>	{90,144,315},{314,312,313},{319,305,308},{313,319,310},{312,306,319},
218	>	{318,316,317}};
219
30	–	static int smBase_nbrs[4][3] =  { {3,2,1},{3,0,2},{3,1,0},{1,2,0}};
220
221		#ifdef TEST_DRIVER
222		VIEW  Current_View = {0,{0,0,0},{0,0,-1},{0,1,0},60,60,0};
#	Line 35 | Line 224 | int Pick_cnt =0;
224		int Pick_tri = -1,Picking = FALSE,Pick_samp=-1;
225		FVECT Pick_point[500],Pick_origin,Pick_dir;
226		FVECT  Pick_v0[500], Pick_v1[500], Pick_v2[500];
227	+	int    Pick_q[500];
228		FVECT P0,P1,P2;
229		FVECT FrustumNear[4],FrustumFar[4];
230		double dev_zmin=.01,dev_zmax=1000;
#	Line 80 | Line 270 | smInit_mesh(sm)
270		SM_NUM_TRI(sm) = 0;
271		SM_SAMPLE_TRIS(sm) = 0;
272		SM_FREE_TRIS(sm) = -1;
273	+	SM_AVAILABLE_TRIS(sm) = -1;
274		smClear_flags(sm,-1);
275		}
276
#	Line 156 | Line 347 | memerr:
347		}
348
349
350	+	int
351	+	compress_set(os)
352	+	OBJECT *os;
353	+	{
354	+	int i,j;
355	+
356	+	for (i = 1, j = os[0]; i <= j; i++)
357	+	{
358	+	if(SM_T_ID_VALID(smMesh,os[i]))
359	+	continue;
360	+	if(i==j)
361	+	break;
362	+	while(!SM_T_ID_VALID(smMesh,os[j]) && (i < j))
363	+	j--;
364	+	if(i==j)
365	+	break;
366	+	os[i] = os[j--];
367	+	}
368	+	i--;
369	+
370	+	os[0] = i;
371	+	return(i);
372	+
373	+	}
374	+
375		int
376		smAlloc_tri(sm)
377		SM *sm;
#	Line 166 | Line 382 | SM *sm;
382		/* Otherwise, have we reached the end of the list yet?*/
383		if(SM_NUM_TRI(sm) < SM_MAX_TRIS(sm))
384		return(SM_NUM_TRI(sm)++);
385	<
385	>	if((id = SM_AVAILABLE_TRIS(sm)) != -1)
386	>	{
387	>	SM_AVAILABLE_TRIS(sm) =  T_NEXT_AVAILABLE(SM_NTH_TRI(sm,id));
388	>	return(id);
389	>	}
390		if((id = SM_FREE_TRIS(sm)) != -1)
391		{
392	<	SM_FREE_TRIS(sm) =  T_NEXT_FREE(SM_NTH_TRI(sm,id));
392	>	dosets(compress_set);
393	>	SM_AVAILABLE_TRIS(sm) = T_NEXT_FREE(SM_NTH_TRI(sm,id));
394	>	SM_FREE_TRIS(sm) = -1;
395		return(id);
396		}
175	–
397		/*Else: realloc */
398		smRealloc_mesh(sm);
399		return(SM_NUM_TRI(sm)++);
#	Line 296 | Line 517 | smInit(n)
517		}
518
519
520	<	smLocator_apply_func(sm,v0,v1,v2,edge_func,tri_func,argptr)
520	>	smLocator_apply(sm,v0,v1,v2,func)
521		SM *sm;
522		FVECT v0,v1,v2;
523	<	int (*edge_func)();
303	<	int (*tri_func)();
304	<	int *argptr;
523	>	FUNC func;
524		{
525		STREE *st;
526	<	FVECT p0,p1,p2;
526	>	FVECT tri[3];
527
528		st = SM_LOCATOR(sm);
529
530	<	VSUB(p0,v0,SM_VIEW_CENTER(sm));
531	<	VSUB(p1,v1,SM_VIEW_CENTER(sm));
532	<	VSUB(p2,v2,SM_VIEW_CENTER(sm));
530	>	VSUB(tri[0],v0,SM_VIEW_CENTER(sm));
531	>	VSUB(tri[1],v1,SM_VIEW_CENTER(sm));
532	>	VSUB(tri[2],v2,SM_VIEW_CENTER(sm));
533	>	stVisit(st,tri,func);
534
315	–	stApply_to_tri(st,p0,p1,p2,edge_func,tri_func,argptr);
316	–
535		}
536
319	–	QUADTREE
320	–	delete_tri_set(qt,optr,del_set)
321	–	QUADTREE qt;
322	–	OBJECT *optr,*del_set;
323	–	{
537
538	<	int set_size,i,t_id;
326	<	OBJECT *rptr,r_set[QT_MAXSET+1];
327	<	OBJECT *tptr,t_set[QT_MAXSET+1],*sptr;
328	<
329	<	/* First need to check if set size larger than QT_MAXSET: if so
330	<	need to allocate larger array
331	<	*/
332	<	if((set_size = MAX(QT_SET_CNT(optr),QT_SET_CNT(del_set))) >QT_MAXSET)
333	<	rptr = (OBJECT *)malloc((set_size+1)*sizeof(OBJECT));
334	<	else
335	<	rptr = r_set;
336	<	if(!rptr)
337	<	goto memerr;
338	<	setintersect(rptr,del_set,optr);
339	<
340	<	if(QT_SET_CNT(rptr) > 0)
341	<	{
342	<	/* First need to check if set size larger than QT_MAXSET: if so
343	<	need to allocate larger array
344	<	*/
345	<	sptr = QT_SET_PTR(rptr);
346	<	for(i = QT_SET_CNT(rptr); i > 0; i--)
347	<	{
348	<	t_id = QT_SET_NEXT_ELEM(sptr);
349	<	qt = qtdelelem(qt,t_id);
350	<	}
351	<	}
352	<	/* If we allocated memory: free it */
353	<	if(rptr != r_set)
354	<	free(rptr);
355	<
356	<	return(qt);
357	<	memerr:
358	<	error(SYSTEM,"delete_tri_set():Unable to allocate memory");
359	<	}
360	<
538	>	/* NEW INSERTION!!! ******************************************************/
539		QUADTREE
540	<	expand_node(qt,q0,q1,q2,optr,n)
541	<	QUADTREE qt;
542	<	FVECT q0,q1,q2;
543	<	OBJECT *optr;
544	<	int n;
540	>	insert_tri(argptr,root,qt,q0,q1,q2,t0,t1,t2,dt10,dt21,dt02,scale,
541	>	s0,s1,s2,sq0,sq1,sq2,rev,f,n)
542	>	int *argptr;
543	>	int root;
544	>	QUADTREE qt;
545	>	BCOORD q0[3],q1[3],q2[3];
546	>	BCOORD t0[3],t1[3],t2[3];
547	>	BCOORD dt10[3],dt21[3],dt02[3];
548	>	unsigned int scale,s0,s1,s2,sq0,sq1,sq2,rev;
549	>	FUNC f;
550	>	int n;
551		{
552	<	OBJECT *tptr,t_set[QT_MAXSET+1];
553	<	int i,t_id,found;
552	>	OBJECT *optr,*tptr,t_set[QT_MAXSET+1];
553	>	int i,t_id;
554		TRI *t;
555	<	FVECT v0,v1,v2;
555	>	FVECT tri[3];
556	>	BCOORD b0[3],b1[3],b2[3];
557	>	BCOORD tb0[3],tb1[3],tb2[3];
558	>	BCOORD db10[3],db21[3],db02[3];
559	>	BCOORD a,b,c,qa,qb,qc;
560	>	FUNC tfunc;
561
562	<	if(QT_SET_CNT(optr) > QT_MAXSET)
374	<	tptr = (OBJECT *)malloc((QT_SET_CNT(optr)+1)*sizeof(OBJECT));
375	<	else
376	<	tptr = t_set;
377	<	if(!tptr)
378	<	goto memerr;
562	>	t_id = *argptr;
563
564	<	qtgetset(tptr,qt);
565	<	/* If set size exceeds threshold: subdivide cell and reinsert tris*/
564	>	/* If the set is empty - just add */
565	>	if(QT_IS_EMPTY(qt))
566	>	return(qtadduelem(qt,t_id));
567	>
568	>	/* If the set size is below expansion threshold,or at maximum
569	>	number of quadtree levels : just add */
570	>	optr = qtqueryset(qt);
571	>	if(QT_SET_CNT(optr) < QT_SET_THRESHOLD || (n > (QT_MAX_LEVELS-2)))
572	>	return(qtadduelem(qt,t_id));
573	>	/* otherwise: expand node- and insert tri, and reinsert existing tris
574	>	in set to children of new node
575	>	*/
576	>	/* First tri compressing set */
577	>	#ifdef NEWSETS0
578	>	if(qtcompressuelem(qt,compress_set) < QT_SET_THRESHOLD)
579	>	/* Get set: If greater than standard size: allocate memory to hold */
580	>	return(qtadduelem(qt,t_id));
581	>	#endif
582	>	if(QT_SET_CNT(optr) > QT_MAXSET)
583	>	{
584	>	if(!(tptr = (OBJECT *)malloc((QT_SET_CNT(optr)+1)*sizeof(OBJECT))))
585	>	goto memerr;
586	>	}
587	>	else
588	>	tptr = t_set;
589	>	qtgetset(tptr,qt);
590	>
591	>	/* subdivide node */
592		qtfreeleaf(qt);
593		qtSubdivide(qt);
594
595	+	a = q1[0];  b = q0[1]; c = q0[2];
596	+	qa = q0[0]; qb = q1[1];  qc = q2[2];
597	+	/* First add current tri: have all of the information */
598	+	if(rev)
599	+	qt = qtInsert_tri_rev(root,qt,q0,q1,q2,t0,t1,t2,dt10,dt21,dt02,scale,
600	+	s0,s1,s2,sq0,sq1,sq2,f,n);
601	+	else
602	+	qt = qtInsert_tri(root,qt,q0,q1,q2,t0,t1,t2,dt10,dt21,dt02,scale,
603	+	s0,s1,s2,sq0,sq1,sq2,f,n);
604	+
605	+	/* Now add in all of the rest; */
606	+	F_FUNC(tfunc) = F_FUNC(f);
607		for(optr = QT_SET_PTR(tptr),i=QT_SET_CNT(tptr); i > 0; i--)
608		{
609		t_id = QT_SET_NEXT_ELEM(optr);
610		t = SM_NTH_TRI(smMesh,t_id);
611		if(!T_IS_VALID(t))
612		continue;
613	<	VSUB(v0,SM_T_NTH_WV(smMesh,t,0),SM_VIEW_CENTER(smMesh));
614	<	VSUB(v1,SM_T_NTH_WV(smMesh,t,1),SM_VIEW_CENTER(smMesh));
615	<	VSUB(v2,SM_T_NTH_WV(smMesh,t,2),SM_VIEW_CENTER(smMesh));
616	<	qt = qtAdd_tri(qt,q0,q1,q2,v0,v1,v2,t_id,n);
613	>	F_ARGS(tfunc) = &t_id;
614	>	VSUB(tri[0],SM_T_NTH_WV(smMesh,t,0),SM_VIEW_CENTER(smMesh));
615	>	VSUB(tri[1],SM_T_NTH_WV(smMesh,t,1),SM_VIEW_CENTER(smMesh));
616	>	VSUB(tri[2],SM_T_NTH_WV(smMesh,t,2),SM_VIEW_CENTER(smMesh));
617	>	convert_tri_to_frame(root,tri,b0,b1,b2,db10,db21,db02);
618	>
619	>	/* Calculate appropriate sidedness values */
620	>	SIDES_GTR(b0,b1,b2,s0,s1,s2,a,b,c);
621	>	SIDES_GTR(b0,b1,b2,sq0,sq1,sq2,qa,qb,qc);
622	>	if(rev)
623	>	qt = qtInsert_tri_rev(root,qt,q0,q1,q2,b0,b1,b2,db10,db21,db02,scale,
624	>	s0,s1,s2,sq0,sq1,sq2,tfunc,n);
625	>	else
626	>	qt = qtInsert_tri(root,qt,q0,q1,q2,b0,b1,b2,db10,db21,db02,scale,
627	>	s0,s1,s2,sq0,sq1,sq2,tfunc,n);
628		}
629		/* If we allocated memory: free it */
630		if( tptr != t_set)
#	Line 400 | Line 633 | int n;
633		return(qt);
634		memerr:
635		error(SYSTEM,"expand_node():Unable to allocate memory");
403	–	}
636
405	–	add_tri_expand(qtptr,f,argptr,q0,q1,q2,t0,t1,t2,n)
406	–	QUADTREE *qtptr;
407	–	int *f;
408	–	ADD_ARGS *argptr;
409	–	FVECT q0,q1,q2;
410	–	FVECT t0,t1,t2;
411	–	int n;
412	–	{
413	–	int t_id;
414	–	OBJECT *optr,*del_set;
415	–
416	–	t_id = argptr->t_id;
417	–
418	–	if(QT_IS_EMPTY(*qtptr))
419	–	{
420	–	*qtptr = qtaddelem(*qtptr,t_id);
421	–	return;
422	–	}
423	–	if(!QT_LEAF_IS_FLAG(*qtptr))
424	–	{
425	–	optr = qtqueryset(*qtptr);
426	–
427	–	if(del_set=argptr->del_set)
428	–	*qtptr = delete_tri_set(*qtptr,optr,del_set);
429	–	*qtptr = qtaddelem(*qtptr,t_id);
430	–	}
431	–	if (n >= QT_MAX_LEVELS)
432	–	return;
433	–	optr = qtqueryset(*qtptr);
434	–	if(QT_SET_CNT(optr) < QT_SET_THRESHOLD)
435	–	return;
436	–	*qtptr = expand_node(*qtptr,q0,q1,q2,optr,n);
637		}
638
639
640
641	<	add_tri(qtptr,fptr,argptr)
442	<	QUADTREE *qtptr;
443	<	int *fptr;
444	<	ADD_ARGS *argptr;
445	<	{
446	<
447	<	OBJECT *optr,*del_set;
448	<	int t_id;
449	<
450	<	t_id = argptr->t_id;
451	<
452	<
453	<	if(QT_IS_EMPTY(*qtptr))
454	<	{
455	<	*qtptr = qtaddelem(*qtptr,t_id);
456	<	if(!QT_FLAG_FILL_TRI(*fptr))
457	<	(*fptr)++;
458	<	return;
459	<	}
460	<	if(QT_LEAF_IS_FLAG(*qtptr))
461	<	return;
462	<
463	<	optr = qtqueryset(*qtptr);
464	<
465	<	if(del_set = argptr->del_set)
466	<	*qtptr = delete_tri_set(*qtptr,optr,del_set);
467	<
468	<	if(!QT_IS_EMPTY(*qtptr))
469	<	{
470	<	optr = qtqueryset(*qtptr);
471	<	if(QT_SET_CNT(optr) >= QT_SET_THRESHOLD)
472	<	(*fptr) |= QT_EXPAND;
473	<	}
474	<	if(!QT_FLAG_FILL_TRI(*fptr))
475	<	(*fptr)++;
476	<	*qtptr = qtaddelem(*qtptr,t_id);
477	<
478	<	}
479	<
480	<
481	<	smLocator_add_tri(sm,t_id,v0_id,v1_id,v2_id,del_set)
641	>	smLocator_add_tri(sm,t_id,v0_id,v1_id,v2_id)
642		SM *sm;
643		int t_id;
644		int v0_id,v1_id,v2_id;
485	–	OBJECT *del_set;
645		{
646	<	STREE *st;
647	<	FVECT v0,v1,v2;
489	<	ADD_ARGS args;
646	>	FVECT tri[3];
647	>	FUNC f;
648
649	<	st = SM_LOCATOR(sm);
649	>	#ifdef DEBUG
650	>	if(T_NTH_NBR(SM_NTH_TRI(sm,t_id),0)== -1 ||
651	>	T_NTH_NBR(SM_NTH_TRI(sm,t_id),1)== -1 ||
652	>	T_NTH_NBR(SM_NTH_TRI(sm,t_id),2)== -1)
653	>	error("Invalid tri: smLocator_add_tri()\n");
654
655	+	if(!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,t_id),0))) ||
656	+	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,t_id),1))) ||
657	+	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,t_id),2))))
658	+	error("Invalid tri: smLocator_add_tri()\n");
659	+	#endif
660
661	<	VSUB(v0,SM_NTH_WV(sm,v0_id),SM_VIEW_CENTER(sm));
662	<	VSUB(v1,SM_NTH_WV(sm,v1_id),SM_VIEW_CENTER(sm));
663	<	VSUB(v2,SM_NTH_WV(sm,v2_id),SM_VIEW_CENTER(sm));
661	>	VSUB(tri[0],SM_NTH_WV(sm,v0_id),SM_VIEW_CENTER(sm));
662	>	VSUB(tri[1],SM_NTH_WV(sm,v1_id),SM_VIEW_CENTER(sm));
663	>	VSUB(tri[2],SM_NTH_WV(sm,v2_id),SM_VIEW_CENTER(sm));
664
665	<	qtClearAllFlags();
666	<	args.t_id = t_id;
667	<	args.del_set = del_set;
501	<
502	<	stApply_to_tri(st,v0,v1,v2,add_tri,add_tri_expand,&args);
503	<
665	>	F_FUNC(f) = insert_tri;
666	>	F_ARGS(f) = &t_id;
667	>	stInsert_tri(SM_LOCATOR(sm),tri,f);
668		}
669
670		/* Add a triangle to the base array with vertices v1-v2-v3 */
#	Line 511 | Line 675 | int v0_id,v1_id,v2_id;
675		{
676		int t_id;
677		TRI *t;
678	<
678	>	#ifdef DEBUG
679	>	if(v0_id==v1_id || v0_id==v2_id || v1_id==v2_id)
680	>	error(CONSISTENCY,"smAdd_tri: invalid vertex ids\n");
681	>	#endif
682		t_id = smAlloc_tri(sm);
683
684		if(t_id == -1)
#	Line 552 | Line 719 | int v0_id,v1_id,v2_id;
719
720
721		void
722	<	smTris_swap_edge(sm,t_id,t1_id,e,e1,tn_id,tn1_id,add_ptr,delptr)
722	>	smTris_swap_edge(sm,t_id,t1_id,e,e1,tn_id,tn1_id,add_ptr)
723		SM *sm;
724		int t_id,t1_id;
725		int e,e1;
726		int *tn_id,*tn1_id;
727		LIST **add_ptr;
561	–	QUADTREE *delptr;
562	–
728		{
729		int verts[3],enext,eprev,e1next,e1prev;
730	<	TRI *n;
730	>	TRI *n,*ta,*tb,*t,*t1;
731		FVECT p1,p2,p3;
732		int ta_id,tb_id;
733	<	/* swap diagonal (e relative to t, and e1 relative to t1)
734	<	defined by quadrilateral
570	<	formed by t,t1- swap for the opposite diagonal
733	>	/* form new diagonal (e relative to t, and e1 relative to t1)
734	>	defined by quadrilateral formed by t,t1- swap for the opposite diagonal
735		*/
736		enext = (e+1)%3;
737		eprev = (e+2)%3;
738		e1next = (e1+1)%3;
739		e1prev = (e1+2)%3;
740		verts[e] = T_NTH_V(SM_NTH_TRI(sm,t_id),e);
741	<	verts[enext] = T_NTH_V(SM_NTH_TRI(sm,t1_id),e1prev);
742	<	verts[eprev] = T_NTH_V(SM_NTH_TRI(sm,t_id),eprev);
741	>	verts[enext] = T_NTH_V(SM_NTH_TRI(sm,t_id),enext);
742	>	verts[eprev] = T_NTH_V(SM_NTH_TRI(sm,t1_id),e1);
743		ta_id = smAdd_tri(sm,verts[0],verts[1],verts[2]);
744		*add_ptr = push_data(*add_ptr,ta_id);
745		verts[e1] = T_NTH_V(SM_NTH_TRI(sm,t1_id),e1);
746	<	verts[e1next] = T_NTH_V(SM_NTH_TRI(sm,t_id),eprev);
747	<	verts[e1prev] = T_NTH_V(SM_NTH_TRI(sm,t1_id),e1prev);
746	>	verts[e1next] = T_NTH_V(SM_NTH_TRI(sm,t1_id),e1next);
747	>	verts[e1prev] = T_NTH_V(SM_NTH_TRI(sm,t_id),e);
748		tb_id = smAdd_tri(sm,verts[0],verts[1],verts[2]);
585	–	*add_ptr = push_data(*add_ptr,tb_id);
749
750	+	*add_ptr = push_data(*add_ptr,tb_id);
751	+	ta = SM_NTH_TRI(sm,ta_id);
752	+	tb = SM_NTH_TRI(sm,tb_id);
753	+	t = SM_NTH_TRI(sm,t_id);
754	+	t1 = SM_NTH_TRI(sm,t1_id);
755		/* set the neighbors */
756	<	T_NTH_NBR(SM_NTH_TRI(sm,ta_id),e) = T_NTH_NBR(SM_NTH_TRI(sm,t1_id),e1next);
757	<	T_NTH_NBR(SM_NTH_TRI(sm,tb_id),e1) = T_NTH_NBR(SM_NTH_TRI(sm,t_id),enext);
758	<	T_NTH_NBR(SM_NTH_TRI(sm,ta_id),enext) =tb_id;
759	<	T_NTH_NBR(SM_NTH_TRI(sm,tb_id),e1next) = ta_id;
760	<	T_NTH_NBR(SM_NTH_TRI(sm,ta_id),eprev)=T_NTH_NBR(SM_NTH_TRI(sm,t_id),eprev);
761	<	T_NTH_NBR(SM_NTH_TRI(sm,tb_id),e1prev)=
594	<	T_NTH_NBR(SM_NTH_TRI(sm,t1_id),e1prev);
756	>	T_NTH_NBR(ta,e) = T_NTH_NBR(t1,e1next);
757	>	T_NTH_NBR(tb,e1) = T_NTH_NBR(t,enext);
758	>	T_NTH_NBR(ta,enext)= tb_id;
759	>	T_NTH_NBR(tb,e1next)= ta_id;
760	>	T_NTH_NBR(ta,eprev)=T_NTH_NBR(t,eprev);
761	>	T_NTH_NBR(tb,e1prev)=T_NTH_NBR(t1,e1prev);
762
763	+
764	+	#ifdef DEBUG
765	+	if(!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(ta,0))) ||
766	+	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(ta,1))) ||
767	+	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(ta,2))) ||
768	+	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(tb,0))) ||
769	+	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(tb,1))) ||
770	+	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(tb,2))))
771	+	goto Ltri_error;
772	+	/*
773	+	if(SM_NTH_TRI(sm,T_NTH_NBR(ta,0))==SM_NTH_TRI(sm,T_NTH_NBR(ta,1)) ||
774	+	SM_NTH_TRI(sm,T_NTH_NBR(ta,0))==SM_NTH_TRI(sm,T_NTH_NBR(ta,2)) ||
775	+	SM_NTH_TRI(sm,T_NTH_NBR(ta,1))==SM_NTH_TRI(sm,T_NTH_NBR(ta,2)) ||
776	+	SM_NTH_TRI(sm,T_NTH_NBR(tb,0))==SM_NTH_TRI(sm,T_NTH_NBR(tb,1)) ||
777	+	SM_NTH_TRI(sm,T_NTH_NBR(tb,0))==SM_NTH_TRI(sm,T_NTH_NBR(tb,2)) ||
778	+	SM_NTH_TRI(sm,T_NTH_NBR(tb,1))==SM_NTH_TRI(sm,T_NTH_NBR(tb,2)) )
779	+	goto Ltri_error;
780	+	*/
781	+	#endif
782		/* Reset neighbor pointers of original neighbors */
783	<	n = SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,t_id),enext));
783	>	n = SM_NTH_TRI(sm,T_NTH_NBR(t,enext));
784	>	#ifdef DEBUG
785	>	if(!T_IS_VALID(n))
786	>	goto Ltri_error;
787	>	#endif
788		T_NTH_NBR(n,T_NTH_NBR_PTR(t_id,n)) = tb_id;
789	<	n = SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,t_id),eprev));
789	>	n = SM_NTH_TRI(sm,T_NTH_NBR(t,eprev));
790	>	#ifdef DEBUG
791	>	if(!T_IS_VALID(n))
792	>	goto Ltri_error;
793	>	#endif
794		T_NTH_NBR(n,T_NTH_NBR_PTR(t_id,n)) = ta_id;
795
796	<	n = SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,t1_id),e1next));
796	>	n = SM_NTH_TRI(sm,T_NTH_NBR(t1,e1next));
797	>	#ifdef DEBUG
798	>	if(!T_IS_VALID(n))
799	>	goto Ltri_error;
800	>	#endif
801		T_NTH_NBR(n,T_NTH_NBR_PTR(t1_id,n)) = ta_id;
802	<	n = SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,t1_id),e1prev));
802	>	n = SM_NTH_TRI(sm,T_NTH_NBR(t1,e1prev));
803	>	#ifdef DEBUG
804	>	if(!T_IS_VALID(n))
805	>	goto Ltri_error;
806	>	#endif
807		T_NTH_NBR(n,T_NTH_NBR_PTR(t1_id,n)) = tb_id;
808
809	<	/* Delete two parent triangles */
810	<	if(remove_from_list(t_id,add_ptr))
811	<	smDelete_tri(sm,t_id);
812	<	else
611	<	*delptr = qtaddelem(*delptr,t_id);
809	>	#ifdef DEBUG
810	>	T_VALID_FLAG(SM_NTH_TRI(sm,t_id))=-1;
811	>	T_VALID_FLAG(SM_NTH_TRI(sm,t1_id))=-1;
812	>	#endif
813
814	<	if(remove_from_list(t1_id,add_ptr))
815	<	smDelete_tri(sm,t1_id);
816	<	else
817	<	*delptr = qtaddelem(*delptr,t1_id);
814	>	remove_from_list(t_id,add_ptr);
815	>	remove_from_list(t1_id,add_ptr);
816	>	#if 1
817	>	smDelete_tri(sm,t_id);
818	>	smDelete_tri(sm,t1_id);
819	>	#else
820	>	*del_ptr = push_data(*del_ptr,t_id);
821	>	*del_ptr = push_data(*del_ptr,t1_id);
822	>	#endif
823
824	+
825	+
826		*tn_id = ta_id;
827		*tn1_id = tb_id;
828	+
829	+	#ifdef DEBUG
830	+	if(T_NTH_NBR(SM_NTH_TRI(sm,ta_id),0)== -1 ||
831	+	T_NTH_NBR(SM_NTH_TRI(sm,ta_id),1)== -1 ||
832	+	T_NTH_NBR(SM_NTH_TRI(sm,ta_id),2)== -1 ||
833	+	T_NTH_NBR(SM_NTH_TRI(sm,tb_id),0)== -1 ||
834	+	T_NTH_NBR(SM_NTH_TRI(sm,tb_id),1)== -1 ||
835	+	T_NTH_NBR(SM_NTH_TRI(sm,tb_id),2)== -1)
836	+	goto Ltri_error;
837	+	if(!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,ta_id),0))) ||
838	+	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,ta_id),1))) ||
839	+	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,ta_id),2))))
840	+	goto Ltri_error;
841	+	if(!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,tb_id),0))) ||
842	+	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,tb_id),1))) ||
843	+	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,tb_id),2))))
844	+	goto Ltri_error;
845	+	#endif
846	+	return;
847	+	Ltri_error:
848	+	error(CONSISTENCY,"Invalid tri: smTris_swap_edge()\n");
849		}
850
851	<	smUpdate_locator(sm,add_list,del_set)
851	>	smUpdate_locator(sm,add_list)
852		SM *sm;
853		LIST *add_list;
625	–	OBJECT *del_set;
854		{
855		int t_id,i;
856		TRI *t;
#	Line 632 | Line 860 | OBJECT *del_set;
860		{
861		t_id = pop_list(&add_list);
862		t = SM_NTH_TRI(sm,t_id);
863	<	smLocator_add_tri(sm,t_id,T_NTH_V(t,0),T_NTH_V(t,1),T_NTH_V(t,2),del_set);
863	>	smLocator_add_tri(sm,t_id,T_NTH_V(t,0),T_NTH_V(t,1),T_NTH_V(t,2));
864		}
637	–
638	–	optr = QT_SET_PTR(del_set);
639	–	for(i = QT_SET_CNT(del_set); i > 0; i--)
640	–	{
641	–	t_id = QT_SET_NEXT_ELEM(optr);
642	–	#if 0
643	–	t = SM_NTH_TRI(sm,t_id);
644	–	smLocator_remove_tri(sm,t_id,T_NTH_V(t,0),T_NTH_V(t,1),T_NTH_V(t,2));
645	–	#endif
646	–	smDelete_tri(sm,t_id);
647	–	}
865		}
866	<	/* MUST add check for constrained edges */
866	>
867		int
868	<	smFix_tris(sm,id,tlist,add_list,delptr)
868	>	smFix_tris(sm,id,tlist,add_list)
869		SM *sm;
870		int id;
871		LIST *tlist,*add_list;
655	–	QUADTREE *delptr;
872		{
873		TRI *t,*t_opp;
874	<	FVECT p,p1,p2,p3;
874	>	FVECT p,p0,p1,p2;
875		int e,e1,swapped = 0;
876		int t_id,t_opp_id;
877	+	LIST *del_list=NULL;
878
879		VSUB(p,SM_NTH_WV(sm,id),SM_VIEW_CENTER(sm));
880		while(tlist)
881		{
882		t_id = pop_list(&tlist);
883	+	#ifdef DEBUG
884	+	if(t_id==INVALID || t_id > smMesh->num_tri)
885	+	error(CONSISTENCY,"Invalid tri id smFix_tris()\n");
886	+	#endif
887		t = SM_NTH_TRI(sm,t_id);
888	<	e = (T_WHICH_V(t,id)+1)%3;
888	>	e = T_WHICH_V(t,id);
889		t_opp_id = T_NTH_NBR(t,e);
890	<	t_opp = SM_NTH_TRI(sm,t_opp_id);
891	<
892	<	smDir_in_cone(sm,p1,T_NTH_V(t_opp,0));
893	<	smDir_in_cone(sm,p2,T_NTH_V(t_opp,1));
894	<	smDir_in_cone(sm,p3,T_NTH_V(t_opp,2));
895	<	if(point_in_cone(p,p1,p2,p3))
890	>	#ifdef DEBUG
891	>	if(t_opp_id==INVALID || t_opp_id > smMesh->num_tri)
892	>	error(CONSISTENCY,"Invalid tri id smFix_tris()\n");
893	>	#endif
894	>	t_opp = SM_NTH_TRI(sm,t_opp_id);
895	>	#ifdef DEBUG
896	>	if(!T_IS_VALID(t_opp))
897	>	error(CONSISTENCY,"Invalid trismFix_tris()\n");
898	>	#endif
899	>	smDir_in_cone(sm,p0,T_NTH_V(t_opp,0));
900	>	smDir_in_cone(sm,p1,T_NTH_V(t_opp,1));
901	>	smDir_in_cone(sm,p2,T_NTH_V(t_opp,2));
902	>	if(point_in_cone(p,p0,p1,p2))
903		{
904		swapped = 1;
905		e1 = T_NTH_NBR_PTR(t_id,t_opp);
906		/* check list for t_opp and Remove if there */
907		remove_from_list(t_opp_id,&tlist);
908		smTris_swap_edge(sm,t_id,t_opp_id,e,e1,&t_id,&t_opp_id,
909	<	&add_list,delptr);
909	>	&add_list);
910		tlist = push_data(tlist,t_id);
911		tlist = push_data(tlist,t_opp_id);
912		}
913		}
914	<	smUpdate_locator(sm,add_list,qtqueryset(*delptr));
914	>	#if 0
915	>	while(del_list)
916	>	{
917	>	t_id = pop_list(&del_list);
918	>	smDelete_tri(sm,t_id);
919	>	}
920	>	#endif
921	>	smUpdate_locator(sm,add_list);
922	>
923		return(swapped);
924		}
925
#	Line 696 | Line 932 | SM *sm;
932		TRI *t;
933		int id;
934		{
935	<	int t_id;
935	>	int which;
936		int nbr_id;
937	<
937	>
938		/* Want the edge for which "id" is the destination */
939	<	t_id = (T_WHICH_V(t,id)+ 2)% 3;
940	<	nbr_id = T_NTH_NBR(t,t_id);
939	>	which = T_WHICH_V(t,id);
940	>	if(which== INVALID)
941	>	return(which);
942	>
943	>	nbr_id = T_NTH_NBR(t,(which + 1)% 3);
944		return(nbr_id);
945		}
946
#	Line 718 | Line 957 | int id;
957
958		/* Locate the point-id in the point location structure: */
959		int
960	<	smInsert_samp(sm,s_id,tri_id)
960	>	smInsert_samp(sm,s_id,tri_id,on,which)
961		SM *sm;
962		int s_id,tri_id;
963	+	int on,which;
964		{
965	<	int v0_id,v1_id,v2_id;
966	<	int t0_id,t1_id,t2_id,replaced;
965	>	int v_id[3],topp_id,i;
966	>	int t0_id,t1_id,t2_id,t3_id,replaced;
967	>	int e0,e1,e2,opp0,opp1,opp2,opp_id;
968		LIST *tlist,*add_list;
728	–	OBJECT del_set[2];
729	–	QUADTREE delnode;
969		FVECT npt;
970	<	TRI *tri,*nbr;
970	>	TRI *tri,*nbr,*topp;
971
972	+
973		add_list = NULL;
974	+	for(i=0; i<3;i++)
975	+	v_id[i] = T_NTH_V(SM_NTH_TRI(sm,tri_id),i);
976
977	<	v0_id = T_NTH_V(SM_NTH_TRI(sm,tri_id),0);
978	<	v1_id = T_NTH_V(SM_NTH_TRI(sm,tri_id),1);
979	<	v2_id = T_NTH_V(SM_NTH_TRI(sm,tri_id),2);
977	>	/* If falls on existing edge */
978	>	if(on == ON_E)
979	>	{
980	>	tri = SM_NTH_TRI(sm,tri_id);
981	>	topp_id = T_NTH_NBR(tri,which);
982	>	e0 = which;
983	>	e1 = (which+1)%3;
984	>	e2 = (which+2)%3;
985	>	topp = SM_NTH_TRI(sm,topp_id);
986	>	opp0 = T_NTH_NBR_PTR(tri_id,topp);
987	>	opp_id = T_NTH_V(topp,opp0);
988	>	opp1 = (opp0+1)%3;
989	>	opp2 = (opp0+2)%3;
990	>
991	>	/* Create 4 triangles */
992	>	/*      /|\             /|\
993	>	/ | \           / | \
994	>	/  *  \  ---->  /__|__\
995	>	\  |  /         \  |  /
996	>	\ | /           \ | /
997	>	\|/             \|/
998	>	*/
999	>	t0_id = smAdd_tri(sm,s_id,v_id[e0],v_id[e1]);
1000	>	add_list = push_data(add_list,t0_id);
1001	>	t1_id = smAdd_tri(sm,s_id,v_id[e2],v_id[e0]);
1002	>	add_list = push_data(add_list,t1_id);
1003	>	t2_id = smAdd_tri(sm,s_id,v_id[e1],opp_id);
1004	>	add_list = push_data(add_list,t2_id);
1005	>	t3_id = smAdd_tri(sm,s_id,opp_id,v_id[e2]);
1006	>	add_list = push_data(add_list,t3_id);
1007	>	/* CAUTION: tri must be assigned after Add_tri: pointers may change*/
1008	>	tri = SM_NTH_TRI(sm,tri_id);
1009	>	topp =SM_NTH_TRI(sm,topp_id);
1010
1011	<	t0_id = smAdd_tri(sm,s_id,v0_id,v1_id);
1012	<	/* Add triangle to the locator */
1013	<
1014	<	add_list = push_data(add_list,t0_id);
1011	>	/* Set the neighbor pointers for the new tris */
1012	>	T_NTH_NBR(SM_NTH_TRI(sm,t0_id),0) = T_NTH_NBR(tri,e2);
1013	>	T_NTH_NBR(SM_NTH_TRI(sm,t0_id),1) = t2_id;
1014	>	T_NTH_NBR(SM_NTH_TRI(sm,t0_id),2) = t1_id;
1015	>	T_NTH_NBR(SM_NTH_TRI(sm,t1_id),0) = T_NTH_NBR(tri,e1);
1016	>	T_NTH_NBR(SM_NTH_TRI(sm,t1_id),1) = t0_id;
1017	>	T_NTH_NBR(SM_NTH_TRI(sm,t1_id),2) = t3_id;
1018	>	T_NTH_NBR(SM_NTH_TRI(sm,t2_id),0) = T_NTH_NBR(topp,opp1);
1019	>	T_NTH_NBR(SM_NTH_TRI(sm,t2_id),1) = t3_id;
1020	>	T_NTH_NBR(SM_NTH_TRI(sm,t2_id),2) = t0_id;
1021	>	T_NTH_NBR(SM_NTH_TRI(sm,t3_id),0) = T_NTH_NBR(topp,opp2);
1022	>	T_NTH_NBR(SM_NTH_TRI(sm,t3_id),1) = t1_id;
1023	>	T_NTH_NBR(SM_NTH_TRI(sm,t3_id),2) = t2_id;
1024
1025	<	t1_id = smAdd_tri(sm,s_id,v1_id,v2_id);
1026	<	add_list = push_data(add_list,t1_id);
1025	>	/* Reset the neigbor pointers for the neighbors of the original */
1026	>	nbr = SM_NTH_TRI(sm,T_NTH_NBR(tri,e1));
1027	>	T_NTH_NBR(nbr,T_NTH_NBR_PTR(tri_id,nbr)) = t1_id;
1028	>	nbr = SM_NTH_TRI(sm,T_NTH_NBR(tri,e2));
1029	>	T_NTH_NBR(nbr,T_NTH_NBR_PTR(tri_id,nbr)) = t0_id;
1030	>	nbr = SM_NTH_TRI(sm,T_NTH_NBR(topp,opp1));
1031	>	T_NTH_NBR(nbr,T_NTH_NBR_PTR(topp_id,nbr)) = t2_id;
1032	>	nbr = SM_NTH_TRI(sm,T_NTH_NBR(topp,opp2));
1033	>	T_NTH_NBR(nbr,T_NTH_NBR_PTR(topp_id,nbr)) = t3_id;
1034	>	#ifdef DEBUG
1035	>	T_VALID_FLAG(SM_NTH_TRI(sm,tri_id))=-1;
1036	>	T_VALID_FLAG(SM_NTH_TRI(sm,topp_id))=-1;
1037	>	#endif
1038	>	tlist = push_data(NULL,t0_id);
1039	>	tlist = push_data(tlist,t1_id);
1040	>	tlist = push_data(tlist,t2_id);
1041	>	tlist = push_data(tlist,t3_id);
1042	>	}
1043	>	else
1044	>	{
1045	>	/* Create 3 triangles */
1046	>	/*      / \             /|\
1047	>	/   \           / | \
1048	>	/  *  \  ---->  /  |  \
1049	>	/       \       /  / \  \
1050	>	/         \     / /     \ \
1051	>	/___________\   //_________\\
1052	>	*/
1053
1054	<	t2_id = smAdd_tri(sm,s_id,v2_id,v0_id);
1055	<	add_list = push_data(add_list,t2_id);
1054	>	t0_id = smAdd_tri(sm,s_id,v_id[0],v_id[1]);
1055	>	add_list = push_data(add_list,t0_id);
1056	>	t1_id = smAdd_tri(sm,s_id,v_id[1],v_id[2]);
1057	>	add_list = push_data(add_list,t1_id);
1058	>	t2_id = smAdd_tri(sm,s_id,v_id[2],v_id[0]);
1059	>	add_list = push_data(add_list,t2_id);
1060
1061	<	/* CAUTION: tri must be assigned after Add_tri: pointers may change*/
1062	<	tri = SM_NTH_TRI(sm,tri_id);
1063	<
1064	<	/* Set the neighbor pointers for the new tris */
1065	<	T_NTH_NBR(SM_NTH_TRI(sm,t0_id),0) = t2_id;
1066	<	T_NTH_NBR(SM_NTH_TRI(sm,t0_id),1) = T_NTH_NBR(tri,0);
1067	<	T_NTH_NBR(SM_NTH_TRI(sm,t0_id),2) = t1_id;
1068	<	T_NTH_NBR(SM_NTH_TRI(sm,t1_id),0) = t0_id;
1069	<	T_NTH_NBR(SM_NTH_TRI(sm,t1_id),1) = T_NTH_NBR(tri,1);
1070	<	T_NTH_NBR(SM_NTH_TRI(sm,t1_id),2) = t2_id;
1071	<	T_NTH_NBR(SM_NTH_TRI(sm,t2_id),0) = t1_id;
1072	<	T_NTH_NBR(SM_NTH_TRI(sm,t2_id),1) = T_NTH_NBR(tri,2);
762	<	T_NTH_NBR(SM_NTH_TRI(sm,t2_id),2) = t0_id;
763	<
764	<	/* Reset the neigbor pointers for the neighbors of the original */
765	<	nbr = SM_NTH_TRI(sm,T_NTH_NBR(tri,0));
766	<	T_NTH_NBR(nbr,T_NTH_NBR_PTR(tri_id,nbr)) = t0_id;
767	<	nbr = SM_NTH_TRI(sm,T_NTH_NBR(tri,1));
768	<	T_NTH_NBR(nbr,T_NTH_NBR_PTR(tri_id,nbr)) = t1_id;
769	<	nbr = SM_NTH_TRI(sm,T_NTH_NBR(tri,2));
770	<	T_NTH_NBR(nbr,T_NTH_NBR_PTR(tri_id,nbr)) = t2_id;
1061	>	/* CAUTION: tri must be assigned after Add_tri: pointers may change*/
1062	>	tri = SM_NTH_TRI(sm,tri_id);
1063	>	/* Set the neighbor pointers for the new tris */
1064	>	T_NTH_NBR(SM_NTH_TRI(sm,t0_id),0) = T_NTH_NBR(tri,2);
1065	>	T_NTH_NBR(SM_NTH_TRI(sm,t0_id),1) = t1_id;
1066	>	T_NTH_NBR(SM_NTH_TRI(sm,t0_id),2) = t2_id;
1067	>	T_NTH_NBR(SM_NTH_TRI(sm,t1_id),0) = T_NTH_NBR(tri,0);
1068	>	T_NTH_NBR(SM_NTH_TRI(sm,t1_id),1) = t2_id;
1069	>	T_NTH_NBR(SM_NTH_TRI(sm,t1_id),2) = t0_id;
1070	>	T_NTH_NBR(SM_NTH_TRI(sm,t2_id),0) = T_NTH_NBR(tri,1);
1071	>	T_NTH_NBR(SM_NTH_TRI(sm,t2_id),1) = t0_id;
1072	>	T_NTH_NBR(SM_NTH_TRI(sm,t2_id),2) = t1_id;
1073
1074	<	del_set[0] = 1; del_set[1] = tri_id;
1075	<	delnode = qtnewleaf(del_set);
1074	>	/* Reset the neigbor pointers for the neighbors of the original */
1075	>	nbr = SM_NTH_TRI(sm,T_NTH_NBR(tri,0));
1076	>	T_NTH_NBR(nbr,T_NTH_NBR_PTR(tri_id,nbr)) = t1_id;
1077	>	nbr = SM_NTH_TRI(sm,T_NTH_NBR(tri,1));
1078	>	T_NTH_NBR(nbr,T_NTH_NBR_PTR(tri_id,nbr)) = t2_id;
1079	>	nbr = SM_NTH_TRI(sm,T_NTH_NBR(tri,2));
1080	>	T_NTH_NBR(nbr,T_NTH_NBR_PTR(tri_id,nbr)) = t0_id;
1081
1082	+	tlist = push_data(NULL,t0_id);
1083	+	tlist = push_data(tlist,t1_id);
1084	+	tlist = push_data(tlist,t2_id);
1085	+	}
1086		/* Fix up the new triangles*/
1087	<	tlist = push_data(NULL,t0_id);
777	<	tlist = push_data(tlist,t1_id);
778	<	tlist = push_data(tlist,t2_id);
1087	>	smFix_tris(sm,s_id,tlist,add_list);
1088
1089	<	smFix_tris(sm,s_id,tlist,add_list,&delnode);
1089	>	smDelete_tri(sm,tri_id);
1090	>	if(on==ON_E)
1091	>	smDelete_tri(sm,topp_id);
1092
782	–	qtfreeleaf(delnode);
783	–
1093		return(TRUE);
785	–	}
786	–
1094
1095	+	#ifdef DEBUG
1096	+	Ladderror:
1097	+	error(CONSISTENCY,"Invalid tri: smInsert_samp()\n");
1098	+	#endif
1099	+	}
1100	+
1101		int
1102	<	smTri_in_set(sm,p,optr)
1102	>	smTri_in_set(sm,p,optr,onptr,whichptr)
1103		SM *sm;
1104		FVECT p;
1105		OBJECT *optr;
1106	+	int *onptr,*whichptr;
1107		{
1108	<	int i,t_id;
1108	>	int i,t_id,on0,on1,on2;
1109		FVECT n,v0,v1,v2;
1110		TRI *t;
1111	<
1111	>	double side;
1112	>
1113		for (i = QT_SET_CNT(optr),optr = QT_SET_PTR(optr);i > 0; i--)
1114		{
1115		/* Find the first triangle that pt falls */
#	Line 806 | Line 1121 | OBJECT *optr;
1121		VSUB(v1,SM_T_NTH_WV(sm,t,1),SM_VIEW_CENTER(sm));
1122		VSUB(v2,SM_T_NTH_WV(sm,t,2),SM_VIEW_CENTER(sm));
1123
1124	<	if(EQUAL_VEC3(v0,p) || EQUAL_VEC3(v1,p) || EQUAL_VEC3(v2,p))
1125	<	return(t_id);
1124	>	if(EQUAL_VEC3(v0,p))
1125	>	{
1126	>	*onptr = ON_V;
1127	>	*whichptr = 0;
1128	>	return(t_id);
1129	>	}
1130	>	if(EQUAL_VEC3(v1,p))
1131	>	{
1132	>	*onptr = ON_V;
1133	>	*whichptr = 1;
1134	>	return(t_id);
1135	>	}
1136	>	if(EQUAL_VEC3(v2,p))
1137	>	{
1138	>	*onptr = ON_V;
1139	>	*whichptr = 2;
1140	>	return(t_id);
1141	>	}
1142
1143	<	VCROSS(n,v1,v0);
1144	<	if(DOT(n,p) >0.0)
1145	<	continue;
1146	<	VCROSS(n,v2,v1);
1147	<	if(DOT(n,p) > 0.0)
1148	<	continue;
1143	>	on0 = on1 =on2 = 0;
1144	>	VCROSS(n,v0,v1);
1145	>	side = DOT(n,p);
1146	>	if(ZERO(side))
1147	>	on2 = TRUE;
1148	>	else
1149	>	if(side >0.0)
1150	>	continue;
1151
1152	<	VCROSS(n,v0,v2);
1153	<	if(DOT(n,p) > 0.0)
1154	<	continue;
1152	>	VCROSS(n,v1,v2);
1153	>	side = DOT(n,p);
1154	>	if(ZERO(side))
1155	>	on0 = TRUE;
1156	>	else
1157	>	if(side >0.0)
1158	>	continue;
1159
1160	+	VCROSS(n,v2,v0);
1161	+	side = DOT(n,p);
1162	+	if(ZERO(side))
1163	+	on1 = TRUE;
1164	+	else
1165	+	if(side >0.0)
1166	+	continue;
1167	+	if(on0)
1168	+	{
1169	+	if(on1)
1170	+	{
1171	+	*onptr = ON_P;
1172	+	*whichptr = 2;
1173	+	}
1174	+	else
1175	+	if(on2)
1176	+	{
1177	+	*onptr = ON_P;
1178	+	*whichptr = 1;
1179	+	}
1180	+	else
1181	+	{
1182	+	*onptr = ON_E;
1183	+	*whichptr = 0;
1184	+	}
1185	+	return(t_id);
1186	+	}
1187	+	if(on1)
1188	+	{
1189	+	if(on2)
1190	+	{
1191	+	*onptr = ON_P;
1192	+	*whichptr = 0;
1193	+	}
1194	+	else
1195	+	{
1196	+	*onptr = ON_E;
1197	+	*whichptr = 1;
1198	+	}
1199	+	return(t_id);
1200	+	}
1201	+	if(on2)
1202	+	{
1203	+	*onptr = ON_E;
1204	+	*whichptr = 2;
1205	+	return(t_id);
1206	+	}
1207	+	*onptr = IN_T;
1208		return(t_id);
1209		}
1210		return(INVALID);
1211		}
1212
1213		int
1214	<	smPointLocateTri(sm,id)
1214	>	smPointLocateTri(sm,p,onptr,whichptr)
1215		SM *sm;
1216	<	int id;
1216	>	FVECT p;
1217	>	int *onptr,*whichptr;
1218		{
833	–	FVECT tpt;
1219		QUADTREE qt,*optr;
1220	<
1221	<	VSUB(tpt,SM_NTH_WV(sm,id),SM_VIEW_CENTER(sm));
1220	>	FVECT tpt;
1221	>	int tri_id;
1222	>
1223	>	VSUB(tpt,p,SM_VIEW_CENTER(sm));
1224		qt = smPointLocateCell(sm,tpt);
1225		if(QT_IS_EMPTY(qt))
1226		return(INVALID);
1227
1228		optr = qtqueryset(qt);
1229	<	return(smTri_in_set(sm,tpt,optr));
1229	>	tri_id = smTri_in_set(sm,tpt,optr,onptr,whichptr);
1230	>
1231	>	#ifdef DEBUG
1232	>	if(!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,tri_id),0))) ||
1233	>	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,tri_id),1))) ||
1234	>	!T_IS_VALID(SM_NTH_TRI(sm,T_NTH_NBR(SM_NTH_TRI(sm,tri_id),2))))
1235	>	eputs("Invalid tri nbrs smPointLocateTri()\n");
1236	>	#endif
1237	>	return(tri_id);
1238		}
1239
1240
#	Line 860 | Line 1255 | int id;
1255		The following tests are performed (in order) to determine the fate
1256		of the sample:
1257
1258	<	1) If the world space point of the sample coincides with one of the
864	<	triangle vertex samples: The values of the triangle sample are
865	<	replaced with the new values and FALSE is returned
866	<	2) If the new sample is close in ws, and close in the spherical projection
1258	>	1) If the new sample is close in ws, and close in the spherical projection
1259		to one of the triangle vertex samples:
1260		pick the point with dir closest to that of the canonical view
1261		If it is the new point: mark existing point for deletion,and return
1262		TRUE,else return FALSE
1263	<	3) If the spherical projection of new is < REPLACE_EPS from a base point:
1263	>	2) If the spherical projection of new is < REPLACE_EPS from a base point:
1264		add new and mark the base for deletion: return TRUE
1265	<	4) If the addition of the new sample point would introduce a "puncture"
1265	>	3) If the addition of the new sample point would introduce a "puncture"
1266		or cause new triangles with large depth differences:return FALSE
1267		This attempts to throw out points that should be occluded
1268		*/
1269		int
1270	<	smTest_sample(sm,tri_id,s_id,dir,rptr)
1270	>	smTest_sample(sm,tri_id,dir,p,rptr)
1271		SM *sm;
1272	<	int tri_id,s_id;
1273	<	FVECT dir;
1272	>	int tri_id;
1273	>	FVECT dir,p;
1274		int *rptr;
1275		{
1276		TRI *tri;
1277		double d,d2,dnear,dspt,d01,d12,d20,s0,s1,s2,ds,dv;
1278		int vid[3],i,nearid,norm,dcnt,bcnt;
1279		FVECT diff[3],spt,npt;
888	–	FVECT p;
1280
890	–	VCOPY(p,SM_NTH_WV(sm,s_id));
1281		*rptr = INVALID;
1282		bcnt = dcnt = 0;
1283		tri = SM_NTH_TRI(sm,tri_id);
#	Line 895 | Line 1285 | smTest_sample(sm,tri_id,s_id,dir,rptr)
1285		vid[1] = T_NTH_V(tri,1);
1286		vid[2] = T_NTH_V(tri,2);
1287
898	–	/* TEST 1: Test if the new point has the same world space point as
899	–	one of the existing triangle vertices
900	–	*/
1288		for(i=0; i<3; i++)
1289		{
1290		if(SM_BASE_ID(sm,vid[i]))
#	Line 909 | Line 1296 | smTest_sample(sm,tri_id,s_id,dir,rptr)
1296		dcnt++;
1297		VSUB(diff[i],SM_NTH_WV(sm,vid[i]),p);
1298		/* If same world point: replace */
912	–	if(ZERO_VEC3(diff[i]))
913	–	{
914	–	sReset_samp(SM_SAMP(sm),vid[i],s_id);
915	–	SM_TONE_MAP(sm) = 0;
916	–	return(FALSE);
917	–	}
1299		}
1300	<	if(SM_DIR_ID(sm,s_id))
920	<	return(TRUE);
921	<	/* TEST 2: If the new sample is close in ws, and close in the spherical
1300	>	/* TEST 1: If the new sample is close in ws, and close in the spherical
1301		projection to one of the triangle vertex samples
1302		*/
1303		norm = FALSE;
#	Line 949 | Line 1328 | smTest_sample(sm,tri_id,s_id,dir,rptr)
1328		VSUB(npt,SM_NTH_WV(sm,nearid),SM_VIEW_CENTER(sm));
1329		normalize(npt);
1330		d = fdir2diff(SM_NTH_W_DIR(sm,nearid), npt);
1331	<	if(dir)
953	<	d2 = 2. - 2.*DOT(dir,spt);
954	<	else
955	<	d2 = fdir2diff(SM_NTH_W_DIR(sm,s_id), spt);
1331	>	d2 = 2. - 2.*DOT(dir,spt);
1332		/* The existing sample is a better sample:punt */
1333		if(d2 > d)
1334		return(FALSE);
#	Line 966 | Line 1342 | smTest_sample(sm,tri_id,s_id,dir,rptr)
1342		}
1343		}
1344		/* TEST 3: If the spherical projection of new is < S_REPLACE_EPS
1345	<	from a base point
1345	>	from a base point: Edge length is constrained to subtend <45 degrees:
1346	>	original base mesh edges are approx 32 degrees- so have about 13 degrees
1347	>	to work in: S_REPLACE_EPS is the square of the radian value
1348		*/
1349		if(bcnt)
1350		{
#	Line 1025 | Line 1403 | smTest_sample(sm,tri_id,s_id,dir,rptr)
1403		if(s2 < S_REPLACE_SCALE*d)
1404		return(TRUE);
1405
1406	<
1406	>	/* TEST 5:
1407	>	Check to see if triangle is relatively large and should therefore
1408	>	be subdivided anyway.
1409	>	*/
1410	>	dv *= DIST_SQ(SM_NTH_WV(sm,vid[1]),SM_VIEW_CENTER(sm));
1411	>	dv *= DIST_SQ(SM_NTH_WV(sm,vid[2]),SM_VIEW_CENTER(sm));
1412	>	if (d01*d12*d20/dv > S_REPLACE_TRI)
1413	>	return(TRUE);
1414	>
1415		return(FALSE);
1416		}
1417
1418
1419		int
1420	<	smAlloc_samp(sm,c,dir,pt)
1420	>	smAlloc_samp(sm)
1421		SM *sm;
1036	–	COLR c;
1037	–	FVECT dir,pt;
1422		{
1423		int s_id,replaced,cnt;
1424		SAMP *s;
#	Line 1046 | Line 1430 | FVECT dir,pt;
1430		cnt=0;
1431		while(replaced)
1432		{
1433	<	if(smMesh_remove_vertex(sm,s_id))
1433	>	if(smRemoveVertex(sm,s_id))
1434		break;
1435		s_id = sAlloc_samp(s,&replaced);
1436		cnt++;
1437		if(cnt > S_MAX_SAMP(s))
1438		error(CONSISTENCY,"smAlloc_samp():unable to find free samp\n");
1439		}
1440	<
1441	<	if(pt)
1442	<	sInit_samp(s,s_id,c,dir,pt);
1440	>	return(s_id);
1441	>	}
1442	>
1443	>	int
1444	>	smReplace_samp(sm,c,dir,p,s_id,t_id,o_id,on,which)
1445	>	SM *sm;
1446	>	COLR c;
1447	>	FVECT dir,p;
1448	>	int s_id,t_id,o_id,on,which;
1449	>	{
1450	>	int tonemap,v_id;
1451	>	TRI *t,*tri;
1452	>
1453	>	tri = SM_NTH_TRI(sm,t_id);
1454	>	v_id = T_NTH_V(tri,which);
1455	>
1456	>	/* If it is a base id, need new sample */
1457	>	if(SM_BASE_ID(sm,v_id))
1458	>	{
1459	>	tonemap = (SM_TONE_MAP(sm) > s_id);
1460	>	sInit_samp(SM_SAMP(sm),s_id,c,dir,p,o_id,tonemap);
1461	>	SM_NTH_VERT(sm,s_id) = t_id;
1462	>	T_NTH_V(tri,which) = s_id;
1463	>	if(!(SM_BASE_ID(sm,T_NTH_V(tri,(which+1)%3)) ||
1464	>	SM_BASE_ID(sm,T_NTH_V(tri,(which+2)%3))))
1465	>	SM_CLR_NTH_T_BASE(sm,t_id);
1466	>	t_id = smTri_next_ccw_nbr(sm,tri,v_id);
1467	>	while(t_id != INVALID)
1468	>	{
1469	>	t = SM_NTH_TRI(sm,t_id);
1470	>	which = T_WHICH_V(t,v_id);
1471	>	T_NTH_V(t,which) = s_id;
1472	>	/* Check if still a base triangle */
1473	>	if(!(SM_BASE_ID(sm,T_NTH_V(t,(which+1)%3)) ||
1474	>	SM_BASE_ID(sm,T_NTH_V(t,(which+2)%3))))
1475	>	SM_CLR_NTH_T_BASE(sm,t_id);
1476	>	t_id = smTri_next_ccw_nbr(sm,t,v_id);
1477	>	}
1478	>	return(s_id);
1479	>	}
1480		else
1481	+	if(on == ON_V || !p)
1482		{
1483	<	VADD(p,dir,SM_VIEW_CENTER(sm));
1484	<	sInit_samp(s,s_id,c,NULL,p);
1483	>	tonemap = (SM_TONE_MAP(sm) > v_id);
1484	>	sInit_samp(SM_SAMP(sm),v_id,c,dir,p,o_id,tonemap);
1485	>	return(v_id);
1486		}
1487	<	return(s_id);
1487	>	else /* on == ON_P */
1488	>	{
1489	>	FVECT spt,npt;
1490	>	double d,d2;
1491	>
1492	>	/* Need to check which sample is preferable */
1493	>	VSUB(spt,p,SM_VIEW_CENTER(sm));
1494	>	normalize(spt);
1495	>
1496	>	VSUB(npt,SM_NTH_WV(sm,v_id),SM_VIEW_CENTER(sm));
1497	>	normalize(npt);
1498	>	d = fdir2diff(SM_NTH_W_DIR(sm,v_id), npt);
1499	>	d2 = 2. - 2.*DOT(dir,spt);
1500	>	/* The existing sample is a better sample:punt */
1501	>	if(d2 < d)
1502	>	{
1503	>	/* The new sample has better information- replace values */
1504	>	tonemap = (SM_TONE_MAP(sm) > v_id);
1505	>	sInit_samp(SM_SAMP(sm),v_id,c,dir,p,o_id,tonemap);
1506	>	}
1507	>	return(v_id);
1508	>	}
1509		}
1510
1511	+	/* Add sample to the mesh:
1512	+
1513	+	the sample can be a world space or directional point. If o_id !=INVALID,
1514	+	then we have an existing sample containing the appropriate information
1515	+	already converted into storage format.
1516	+	The spherical projection of the point/ray can:
1517	+	a) coincide with existing vertex
1518	+	i) conincides with existing sample
1519	+	ii) projects same as existing sample
1520	+	iii) hits a base vertex
1521	+	b) coincide with existing edge
1522	+	c) Fall in existing triangle
1523	+	*/
1524		int
1525	<	smAdd_samp(sm,s_id,p,dir)
1525	>	smAdd_samp(sm,c,dir,p,o_id)
1526		SM *sm;
1527	<	int s_id;
1528	<	FVECT p,dir;
1527	>	COLR c;
1528	>	FVECT dir,p;
1529	>	int o_id;
1530		{
1531	<	int t_id,r_id,test;
1532	<	double d;
1531	>	int t_id,s_id,r_id,on,which,n_id;
1532	>	double d;
1533	>	FVECT wpt;
1534
1535	<	r_id = INVALID;
1536	<	t_id = smPointLocateTri(sm,s_id);
1535	>	r_id = INVALID;
1536	>
1537	>	/* Must do this first-as may change mesh */
1538	>	s_id = smAlloc_samp(sm);
1539	>	/* If sample is a world space point */
1540	>	if(p)
1541	>	{
1542	>	t_id = smPointLocateTri(sm,p,&on,&which);
1543		if(t_id == INVALID)
1544	+	{
1545	+	#ifdef DEBUG
1546	+	eputs("smAddSamp(): unable to locate tri containing sample \n");
1547	+	#endif
1548	+	smUnalloc_samp(sm,s_id);
1549	+	return(INVALID);
1550	+	}
1551	+	/* If spherical projection coincides with existing sample: replace */
1552	+	if((on == ON_V || on == ON_P))
1553		{
1554	+	if((n_id = smReplace_samp(sm,c,dir,p,s_id,t_id,o_id,on,which))!= s_id)
1555	+	smUnalloc_samp(sm,s_id);
1556	+	return(n_id);
1557	+	}
1558	+	if((!(smTest_sample(sm,t_id,dir,p,&r_id))))
1559	+	{
1560	+	smUnalloc_samp(sm,s_id);
1561	+	return(INVALID);
1562	+	}
1563	+	/* If sample is being added in the middle of the sample array: tone
1564	+	map individually
1565	+	*/
1566	+	/* Initialize sample */
1567	+	sInit_samp(SM_SAMP(sm),s_id,c,dir,p,o_id,(SM_TONE_MAP(sm)>s_id));
1568	+
1569	+	}
1570	+	/* If sample is a direction vector */
1571	+	else
1572	+	{
1573	+	VADD(wpt,dir,SM_VIEW_CENTER(sm));
1574	+	t_id = smPointLocateTri(sm,wpt,&on,&which);
1575	+	if(t_id == INVALID)
1576	+	{
1577		#ifdef DEBUG
1578	<	eputs("smAdd_samp(): tri not found \n");
1578	>	eputs("smAddSamp(): unable to locate tri containing sample \n");
1579		#endif
1580	<	return(FALSE);
1580	>	smUnalloc_samp(sm,s_id);
1581	>	return(INVALID);
1582	>	}
1583	>	if(on == ON_V || on == ON_P)
1584	>	{
1585	>	if((n_id = smReplace_samp(sm,c,wpt,NULL,s_id,t_id,o_id,on,which))!= s_id)
1586	>	smUnalloc_samp(sm,s_id);
1587	>	return(n_id);
1588		}
1589	<	if(!SM_BASE_ID(sm,s_id))
1589	>	/* Allocate space for a sample and initialize */
1590	>	sInit_samp(SM_SAMP(sm),s_id,c,wpt,NULL,o_id,(SM_TONE_MAP(sm)>s_id));
1591	>	}
1592	>	if(!SM_DIR_ID(sm,s_id))
1593		{
1594	<	if(!smTest_sample(sm,t_id,s_id,dir,&r_id))
1595	<	return(FALSE);
1596	<	/* If not a sky point, add distance from the viewcenter to average*/
1597	<	if( !SM_DIR_ID(sm,s_id))
1091	<	{
1092	<	d = DIST(p,SM_VIEW_CENTER(smMesh));
1093	<	smDist_sum += 1.0/d;
1094	<	}
1594	>	/* If not a base or sky point, add distance from the
1595	>	viewcenter to average*/
1596	>	d = DIST(SM_NTH_WV(sm,s_id),SM_VIEW_CENTER(sm));
1597	>	smDist_sum += 1.0/d;
1598		}
1599	<	test = smInsert_samp(smMesh,s_id,t_id);
1599	>	smInsert_samp(sm,s_id,t_id,on,which);
1600
1601	<	if(test && r_id != INVALID)
1602	<	smMesh_remove_vertex(sm,r_id);
1603	<
1604	<	return(test);
1601	>	/* If new sample replaces existing one- remove that vertex now */
1602	>	if(r_id != INVALID)
1603	>	{
1604	>	smRemoveVertex(sm,r_id);
1605	>	sDelete_samp(SM_SAMP(sm),r_id);
1606	>	}
1607	>	return(s_id);
1608		}
1609
1610		/*
#	Line 1117 | Line 1623 | smNewSamp(c,dir,p)
1623		COLR c;
1624		FVECT dir;
1625		FVECT p;
1120	–
1626		{
1627		int s_id;
1628	<	int debug=0;
1629	<	static FILE *fp;
1125	<	static int cnt=0,n=3010;
1628	>
1629	>
1630		/* First check if this the first sample: if so initialize mesh */
1127	–	if(SM_NUM_SAMP(smMesh) == 0)
1128	–	{
1129	–	smInit_sm(smMesh,odev.v.vp);
1130	–	#if 0
1131	–	fp = fopen("Debug_data.view","w");
1132	–	fprintf(fp,"%d %d %f %f %f ",1280,1024,odev.v.vp[0],odev.v.vp[1],
1133	–	odev.v.vp[2]);
1134	–	fprintf(fp,"%f %f %f ",odev.v.vdir[0],odev.v.vdir[1],
1135	–	odev.v.vdir[2]);
1136	–	fprintf(fp,"%f %f %f ",odev.v.vup[0],odev.v.vup[1],odev.v.vup[2]);
1137	–	fprintf(fp,"%f %f ",odev.v.horiz,odev.v.vert);
1138	–	fclose(fp);
1139	–	fp = fopen("Debug_data","w");
1140	–	#endif
1141	–	}
1142	–	#if 0
1143	–	fprintf(fp,"%f %f %f %f %f %f ",p[0],p[1],p[2],(float)c[0]/255.0,(float)c[1]/255.0,
1144	–	(float)c[2]/255.0);
1145	–	#endif
1631
1632	<	/* Allocate space for a sample */
1633	<	s_id = smAlloc_samp(smMesh,c,dir,p);
1634	<	#if 0
1635	<	if(cnt==n)
1151	<	return(-1);
1152	<	cnt++;
1153	<	#endif
1154	<	/* Add the sample to the mesh */
1155	<	if(!smAdd_samp(smMesh,s_id,p,dir))
1156	<	{
1157	<	/* If the sample space was not used: return */
1158	<	smUnalloc_samp(smMesh,s_id);
1159	<	s_id = INVALID;
1632	>	if(SM_NUM_SAMP(smMesh) == 0)
1633	>	{
1634	>	smInit_sm(smMesh,odev.v.vp);
1635	>	sClear_all_flags(SM_SAMP(smMesh));
1636		}
1637	+	/* Add the sample to the mesh */
1638	+	s_id = smAdd_samp(smMesh,c,dir,p,INVALID);
1639	+
1640		return(s_id);
1641
1642		}
#	Line 1190 | Line 1669 | SM *sm;
1669		int type;
1670		{
1671		int i,s_id,tri_id,nbr_id;
1672	<	int p[4],ids[4];
1672	>	int p[SM_EXTRA_POINTS],ids[SM_BASE_TRIS];
1673		int v0_id,v1_id,v2_id;
1674		FVECT d,pt,cntr,v0,v1,v2;
1675	<
1675	>	TRI *t;
1676	>
1677		/* First insert the base vertices into the sample point array */
1678
1679	<	for(i=0; i < 4; i++)
1679	>	for(i=0; i < SM_EXTRA_POINTS; i++)
1680		{
1681	<	VCOPY(cntr,smDefault_base[i]);
1202	<	cntr[0] += .01;
1203	<	cntr[1] += .02;
1204	<	cntr[2] += .03;
1205	<	VADD(cntr,cntr,SM_VIEW_CENTER(sm));
1681	>	VADD(cntr,icosa_verts[i],SM_VIEW_CENTER(sm));
1682		p[i]  = smAdd_base_vertex(sm,cntr);
1683		}
1684		/* Create the base triangles */
1685	<	for(i=0;i < 4; i++)
1685	>	for(i=0;i < SM_BASE_TRIS; i++)
1686		{
1687	<	v0_id = p[smTri_verts[i][0]];
1688	<	v1_id = p[smTri_verts[i][1]];
1689	<	v2_id = p[smTri_verts[i][2]];
1687	>	v0_id = p[icosa_tris[i][0]];
1688	>	v1_id = p[icosa_tris[i][1]];
1689	>	v2_id = p[icosa_tris[i][2]];
1690		ids[i] = smAdd_tri(sm, v0_id,v1_id,v2_id);
1691	<	smLocator_add_tri(sm,ids[i],v0_id,v1_id,v2_id,NULL);
1692	<	}
1693	<
1218	<	/* Set neighbors */
1691	>	/* Set neighbors */
1692	>	for(nbr_id=0; nbr_id < 3; nbr_id++)
1693	>	T_NTH_NBR(SM_NTH_TRI(sm,ids[i]),nbr_id) = icosa_nbrs[i][nbr_id];
1694
1695	<	for(tri_id=0;tri_id < 4; tri_id++)
1696	<	for(nbr_id=0; nbr_id < 3; nbr_id++)
1222	<	T_NTH_NBR(SM_NTH_TRI(sm,ids[tri_id]),nbr_id) = smBase_nbrs[tri_id][nbr_id];
1223	<
1224	<
1225	<	/* Now add the centroids of the faces */
1226	<	for(tri_id=0;tri_id < 4; tri_id++)
1695	>	}
1696	>	for(i=0;i < SM_BASE_TRIS; i++)
1697		{
1698	<	VCOPY(v0,SM_T_NTH_WV(sm,SM_NTH_TRI(sm,ids[tri_id]),0));
1699	<	VCOPY(v1,SM_T_NTH_WV(sm,SM_NTH_TRI(sm,ids[tri_id]),1));
1230	<	VCOPY(v2,SM_T_NTH_WV(sm,SM_NTH_TRI(sm,ids[tri_id]),2));
1231	<	tri_centroid(v0,v1,v2,cntr);
1232	<	VSUB(cntr,cntr,SM_VIEW_CENTER(sm));
1233	<	normalize(cntr);
1234	<	VADD(cntr,cntr,SM_VIEW_CENTER(sm));
1235	<	s_id = smAdd_base_vertex(sm,cntr);
1236	<	smAdd_samp(sm,s_id,NULL,NULL);
1698	>	t = SM_NTH_TRI(sm,ids[i]);
1699	>	smLocator_add_tri(sm,ids[i],T_NTH_V(t,0),T_NTH_V(t,1),T_NTH_V(t,2));
1700		}
1701		return(1);
1702
#	Line 1305 | Line 1768 | smRebuild_mesh(sm,v)
1768		double d;
1769
1770		#ifdef DEBUG
1771	<	eputs("smRebuild_mesh(): rebuilding....");
1771	>	fprintf(stderr,"smRebuild_mesh(): rebuilding....");
1772		#endif
1773		/* Clear the mesh- and rebuild using the current sample array */
1774		/* Remember the current number of samples */
1775		cnt = SM_NUM_SAMP(sm);
1776		/* Calculate the difference between the current and new viewpoint*/
1777		/* Will need to subtract this off of sky points */
1778	<	VSUB(ov,v->vp,SM_VIEW_CENTER(sm));
1778	>	VCOPY(ov,SM_VIEW_CENTER(sm));
1779		/* Initialize the mesh to 0 samples and the base triangles */
1780
1781		/* Go through all samples and add in if in the new view frustum, and
1782		the dir is <= 30 degrees from new view
1783		*/
1784	<	j=0;
1784	>	smInit_sm(sm,v->vp);
1785		for(i=0; i < cnt; i++)
1786		{
1787		/* First check if sample visible(conservative approx: if one of tris
#	Line 1331 | Line 1794 | smRebuild_mesh(sm,v)
1794		{
1795		VSUB(p,SM_NTH_WV(sm,i),v->vp);
1796		normalize(p);
1797	<	d = fdir2diff(SM_NTH_W_DIR(sm,i), p);
1797	>	decodedir(dir,SM_NTH_W_DIR(sm,i));
1798	>	d = 2. - 2.*DOT(dir,p);
1799		if (d > MAXDIFF2)
1800		continue;
1801	+	VCOPY(p,SM_NTH_WV(sm,i));
1802	+	smAdd_samp(sm,NULL,dir,p,i);
1803		}
1804	<	sReset_samp(SM_SAMP(sm),j,i);
1805	<	j++;
1804	>	else
1805	>	{
1806	>	VSUB(dir,SM_NTH_WV(sm,i),ov);
1807	>	VADD(SM_NTH_WV(sm,i),dir,SM_VIEW_CENTER(sm));
1808	>	smAdd_samp(sm,NULL,dir,NULL,i);
1809	>	}
1810	>
1811		}
1812	<	smInit_sm(sm,v->vp);
1813	<	for(i=0; i< j; i++)
1343	<	{
1344	<	S_SET_FLAG(i);
1345	<	VCOPY(p,SM_NTH_WV(sm,i));
1346	<	smAdd_samp(sm,i,p,NULL);
1347	<	}
1348	<	SM_NUM_SAMP(sm) = j;
1349	<	smNew_tri_cnt = SM_SAMPLE_TRIS(sm);
1812	>
1813	>	smNew_tri_cnt = SM_SAMPLE_TRIS(sm);
1814		#ifdef DEBUG
1815	<	eputs("smRebuild_mesh():done\n");
1815	>	fprintf(stderr,"smRebuild_mesh():done\n");
1816		#endif
1817		}
1818
#	Line 1358 | Line 1822 | intersect_tri_set(t_set,orig,dir,pt)
1822		FVECT orig,dir,pt;
1823		{
1824		OBJECT *optr;
1825	<	int i,t_id,id;
1825	>	int i,t_id,id,base;
1826		int pid0,pid1,pid2;
1827		FVECT p0,p1,p2,p;
1828		TRI *t;
1829	+	double d,d1;
1830
1831		optr = QT_SET_PTR(t_set);
1832		for(i = QT_SET_CNT(t_set); i > 0; i--)
1833		{
1834		t_id = QT_SET_NEXT_ELEM(optr);
1370	–
1835		t = SM_NTH_TRI(smMesh,t_id);
1836		if(!T_IS_VALID(t))
1837		continue;
1374	–
1838		pid0 = T_NTH_V(t,0);
1839		pid1 = T_NTH_V(t,1);
1840		pid2 = T_NTH_V(t,2);
1841	+	if(base = SM_IS_NTH_T_BASE(smMesh,t_id))
1842	+	if(SM_BASE_ID(smMesh,pid0) && SM_BASE_ID(smMesh,pid1) &&
1843	+	SM_BASE_ID(smMesh,pid2))
1844	+	continue;
1845		VCOPY(p0,SM_NTH_WV(smMesh,pid0));
1846		VCOPY(p1,SM_NTH_WV(smMesh,pid1));
1847		VCOPY(p2,SM_NTH_WV(smMesh,pid2));
1848		if(ray_intersect_tri(orig,dir,p0,p1,p2,p))
1849		{
1850	<	id = closest_point_in_tri(p0,p1,p2,p,pid0,pid1,pid2);
1851	<
1850	>	if(!base)
1851	>	{
1852	>	d =  DIST_SQ(p,p0);
1853	>	d1 = DIST_SQ(p,p1);
1854	>	if(d < d1)
1855	>	{
1856	>	d1 = DIST_SQ(p,p2);
1857	>	id = (d1 < d)?pid2:pid0;
1858	>	}
1859	>	else
1860	>	{
1861	>	d = DIST_SQ(p,p2);
1862	>	id = (d < d1)? pid2:pid1;
1863	>	}
1864	>	}
1865	>	else
1866	>	{
1867	>	if(SM_BASE_ID(smMesh,pid0))
1868	>	{
1869	>	if(SM_BASE_ID(smMesh,pid1))
1870	>	id = pid2;
1871	>	else
1872	>	if(SM_BASE_ID(smMesh,pid2))
1873	>	id = pid1;
1874	>	else
1875	>	{
1876	>	d =  DIST_SQ(p,p1);
1877	>	d1 = DIST_SQ(p,p2);
1878	>	if(d < d1)
1879	>	id = pid1;
1880	>	else
1881	>	id = pid2;
1882	>	}
1883	>	}
1884	>	else
1885	>	{
1886	>	if(SM_BASE_ID(smMesh,pid1))
1887	>	{
1888	>	if(SM_BASE_ID(smMesh,pid2))
1889	>	id = pid0;
1890	>	else
1891	>	{
1892	>	d =  DIST_SQ(p,p0);
1893	>	d1 = DIST_SQ(p,p2);
1894	>	if(d < d1)
1895	>	id = pid0;
1896	>	else
1897	>	id = pid2;
1898	>	}
1899	>	}
1900	>	else
1901	>	{
1902	>	d =  DIST_SQ(p,p0);
1903	>	d1 = DIST_SQ(p,p1);
1904	>	if(d < d1)
1905	>	id = pid0;
1906	>	else
1907	>	id = pid1;
1908	>	}
1909	>	}
1910	>	}
1911		if(pt)
1912	<	VCOPY(pt,p);
1913	<	#ifdef DEBUG_TEST_DRIVER
1912	>	VCOPY(pt,p);
1913	>	#ifdef TEST_DRIVER
1914		Pick_tri = t_id;
1915		Pick_samp = id;
1916		VCOPY(Pick_point[0],p);
#	Line 1398 | Line 1924 | intersect_tri_set(t_set,orig,dir,pt)
1924		/* OS is constrained to be <= QT_MAXCSET : if the set exceeds this, the
1925		results of check_set are conservative
1926		*/
1927	+	int
1928	+	compare_ids(id1,id2)
1929	+	OBJECT *id1,*id2;
1930	+	{
1931	+	int d;
1932
1933	<	ray_trace_check_set(qtptr,fptr,argptr)
1934	<	QUADTREE *qtptr;
1935	<	int *fptr;
1933	>	d = *id2-*id1;
1934	>
1935	>	if(d > 0)
1936	>	return(-1);
1937	>	if(d < 0)
1938	>	return(1);
1939	>
1940	>	return(0);
1941	>	}
1942	>
1943	>	ray_trace_check_set(qt,argptr,fptr)
1944	>	QUADTREE qt;
1945		RT_ARGS *argptr;
1946	+	int *fptr;
1947		{
1948		OBJECT tset[QT_MAXSET+1],*tptr;
1949		double dt,t;
1950		int found;
1951	+	if(QT_IS_EMPTY(qt))
1952	+	return;
1953	+	if(QT_LEAF_IS_FLAG(qt))
1954	+	{
1955	+	QT_FLAG_SET_DONE(*fptr);
1956	+	#if DEBUG
1957	+	eputs("ray_trace_check_set():Already visited this node:aborting\n");
1958	+	#endif
1959	+	return;
1960	+	}
1961	+	else
1962	+	QT_LEAF_SET_FLAG(qt);
1963	+
1964	+	tptr = qtqueryset(qt);
1965	+	if(QT_SET_CNT(tptr) > QT_MAXSET)
1966	+	tptr = (OBJECT *)malloc((QT_SET_CNT(tptr)+1)*sizeof(OBJECT));
1967	+	else
1968	+	tptr = tset;
1969	+	if(!tptr)
1970	+	goto memerr;
1971
1972	<	if(QT_LEAF_IS_FLAG(*qtptr))
1973	<	{
1974	<	QT_FLAG_SET_DONE(*fptr);
1975	<	#if DEBUG
1976	<	eputs("ray_trace_check_set():Already visited this node:aborting\n");
1977	<	#endif
1978	<	return;
1979	<	}
1980	<	if(!QT_IS_EMPTY(*qtptr))
1420	<	{
1421	<	tptr = qtqueryset(*qtptr);
1422	<	if(QT_SET_CNT(tptr) > QT_MAXSET)
1423	<	tptr = (OBJECT *)malloc((QT_SET_CNT(tptr)+1)*sizeof(OBJECT));
1424	<	else
1425	<	tptr = tset;
1426	<	if(!tptr)
1427	<	goto memerr;
1428	<
1429	<	qtgetset(tptr,*qtptr);
1430	<	/* Check triangles in set against those seen so far(os):only
1431	<	check new triangles for intersection (t_set')
1432	<	*/
1433	<	check_set_large(tptr,argptr->os);
1434	<	if((found = intersect_tri_set(tptr,argptr->orig,argptr->dir,NULL))!= -1)
1435	<	{
1436	<	argptr->t_id = found;
1437	<	if(tptr != tset)
1438	<	free(tptr);
1439	<	QT_FLAG_SET_DONE(*fptr);
1440	<	return;
1441	<	}
1442	<	if(tptr != tset)
1443	<	free(tptr);
1444	<	}
1972	>	qtgetset(tptr,qt);
1973	>	/* Must sort */
1974	>	qsort((void *)(&(tptr[1])),tptr[0],sizeof(OBJECT),compare_ids);
1975	>	/* Check triangles in set against those seen so far(os):only
1976	>	check new triangles for intersection (t_set')
1977	>	*/
1978	>	check_set_large(tptr,argptr->os);
1979	>
1980	>	if(!QT_SET_CNT(tptr))
1981		return;
1982	+	found = intersect_tri_set(tptr,argptr->orig,argptr->dir,NULL);
1983	+	if(tptr != tset)
1984	+	free(tptr);
1985	+	if(found != INVALID)
1986	+	{
1987	+	argptr->t_id = found;
1988	+	QT_FLAG_SET_DONE(*fptr);
1989	+	}
1990	+	return;
1991		memerr:
1992		error(SYSTEM,"ray_trace_check_set():Unable to allocate memory");
1993		}
#	Line 1463 | Line 2008 | FVECT orig,dir;
2008		FVECT b,p,o;
2009		OBJECT *ts;
2010		QUADTREE qt;
2011	<	int s_id;
2011	>	int s_id,test;
2012		double d;
2013
2014		/*  r is the normalized vector from the view center to the current
#	Line 1484 | Line 2029 | FVECT orig,dir;
2029		/* orig will be updated-so preserve original value */
2030		if(!smMesh)
2031		return;
2032	<	point_on_sphere(b,orig,SM_VIEW_CENTER(smMesh));
2033	<	d = -DOT(b,dir);
2034	<	if(EQUAL_VEC3(orig,SM_VIEW_CENTER(smMesh)) || EQUAL(fabs(d),1.0))
2032	>	#ifdef TEST_DRIVER
2033	>	Picking= TRUE;
2034	>	#endif
2035	>
2036	>	if(EQUAL_VEC3(orig,SM_VIEW_CENTER(smMesh)))
2037		{
2038	<	qt = smPointLocateCell(smMesh,dir);
2039	<	/* Test triangles in the set for intersection with Ray:returns
2040	<	first found
2041	<	*/
2038	>	qt = smPointLocateCell(smMesh,dir);
2039	>	if(QT_IS_EMPTY(qt))
2040	>	goto Lerror;
2041	>	ts = qtqueryset(qt);
2042	>	s_id = intersect_tri_set(ts,orig,dir,p);
2043	>	#ifdef DEBUG_TEST_DRIVER
2044	>	VCOPY(Pick_point[0],p);
2045	>	#endif
2046		#ifdef DEBUG
2047	<	if(QT_IS_EMPTY(qt))
1497	<	{
1498	<	eputs("smFindSamp(): point not found");
1499	<	return;
1500	<	}
2047	>	fprintf(stderr,"Simple pick returning %d\n",s_id);
2048		#endif
2049	<	ts = qtqueryset(qt);
2050	<	s_id = intersect_tri_set(ts,orig,dir,p);
2049	>
2050	>	return(s_id);
2051	>	}
2052	>	d = point_on_sphere(b,orig,SM_VIEW_CENTER(smMesh));
2053	>	if(EQUAL_VEC3(b,dir))
2054	>	{
2055	>	qt = smPointLocateCell(smMesh,dir);
2056	>	if(QT_IS_EMPTY(qt))
2057	>	goto Lerror;
2058	>	ts = qtqueryset(qt);
2059	>	s_id = intersect_tri_set(ts,orig,dir,p);
2060		#ifdef DEBUG_TEST_DRIVER
2061	<	VCOPY(Pick_point[0],p);
2061	>	VCOPY(Pick_point[0],p);
2062		#endif
2063	+	#ifdef DEBUG
2064	+	fprintf(stderr,"Simple pick2 returning %d\n",s_id);
2065	+	#endif
2066	+	return(s_id);
2067		}
2068	<	else
2068	>	if(OPP_EQUAL_VEC3(b,dir))
2069		{
2070	+	qt = smPointLocateCell(smMesh,orig);
2071	+	if(QT_IS_EMPTY(qt))
2072	+	goto Lerror;
2073	+	ts = qtqueryset(qt);
2074	+	s_id = intersect_tri_set(ts,orig,dir,p);
2075	+	#ifdef DEBUG_TEST_DRIVER
2076	+	VCOPY(Pick_point[0],p);
2077	+	#endif
2078	+	if(s_id != INVALID)
2079	+	{
2080	+	#ifdef DEBUG
2081	+	fprintf(stderr,"Front pick returning %d\n",s_id);
2082	+	#endif
2083	+	return(s_id);
2084	+	}
2085	+	qt = smPointLocateCell(smMesh,dir);
2086	+	if(QT_IS_EMPTY(qt))
2087	+	goto Lerror;
2088	+	ts = qtqueryset(qt);
2089	+	s_id = intersect_tri_set(ts,orig,dir,p);
2090	+	#ifdef DEBUG_TEST_DRIVER
2091	+	VCOPY(Pick_point[0],p);
2092	+	#endif
2093	+	#ifdef DEBUG
2094	+	fprintf(stderr,"Back pick returning %d\n",s_id);
2095	+	#endif
2096	+	return(s_id);
2097	+	}
2098	+	{
2099		OBJECT t_set[QT_MAXCSET + 1];
2100		RT_ARGS rt;
2101	+	FUNC func;
2102
2103		/* Test each of the root triangles against point id */
2104		QT_CLEAR_SET(t_set);
#	Line 1518 | Line 2108 | FVECT orig,dir;
2108		rt.os = t_set;
2109		VCOPY(rt.orig,orig);
2110		VCOPY(rt.dir,dir);
2111	<	stTrace_ray(SM_LOCATOR(smMesh),o,dir,ray_trace_check_set,&rt);
2111	>	F_FUNC(func) = ray_trace_check_set;
2112	>	F_ARGS(func) = (int *)(&rt);
2113	>	stTrace_ray(SM_LOCATOR(smMesh),o,dir,func);
2114		s_id = rt.t_id;
2115	<	}
2115	>	}
2116	>	#ifdef DEBUG
2117	>	fprintf(stderr,"Trace pick returning %d\n",s_id);
2118	>	#endif
2119		return(s_id);
2120	+
2121	+	Lerror:
2122	+	#ifdef DEBUG
2123	+	eputs("smFindSamp(): point not found");
2124	+	#endif
2125	+	return(INVALID);
2126	+
2127		}
2128
2129	+
2130	+	mark_active_tris(argptr,root,qt)
2131	+	int *argptr;
2132	+	int root;
2133	+	QUADTREE qt;
2134	+	{
2135	+	OBJECT *os,*optr;
2136	+	register int i,t_id;
2137	+	TRI *tri;
2138	+
2139	+	if(QT_IS_EMPTY(qt) || QT_LEAF_IS_FLAG(qt))
2140	+	return;
2141	+
2142	+	/* For each triangle in the set, set the which flag*/
2143	+	os = qtqueryset(qt);
2144	+
2145	+	for (i = QT_SET_CNT(os), optr = QT_SET_PTR(os); i > 0; i--)
2146	+	{
2147	+	t_id = QT_SET_NEXT_ELEM(optr);
2148	+	/* Set the render flag */
2149	+	tri = SM_NTH_TRI(smMesh,t_id);
2150	+	if(!T_IS_VALID(tri) ||  SM_IS_NTH_T_BASE(smMesh,t_id))
2151	+	continue;
2152	+	SM_SET_NTH_T_ACTIVE(smMesh,t_id);
2153	+	/* Set the Active bits of the Vertices */
2154	+	S_SET_FLAG(T_NTH_V(tri,0));
2155	+	S_SET_FLAG(T_NTH_V(tri,1));
2156	+	S_SET_FLAG(T_NTH_V(tri,2));
2157	+	}
2158	+	}
2159	+
2160	+
2161	+	mark_tris_in_frustum(view)
2162	+	VIEW *view;
2163	+	{
2164	+	FVECT nr[4],far[4];
2165	+	FPEQ peq;
2166	+	int debug=0;
2167	+	FUNC f;
2168	+
2169	+	F_FUNC(f) = mark_active_tris;
2170	+	F_ARGS(f) = NULL;
2171	+
2172	+	/* Mark triangles in approx. view frustum as being active:set
2173	+	LRU counter: for use in discarding samples when out
2174	+	of space
2175	+	Radiance often has no far clipping plane: but driver will set
2176	+	dev_zmin,dev_zmax to satisfy OGL
2177	+	*/
2178	+
2179	+	/* First clear all the quadtree node and triangle active flags */
2180	+	qtClearAllFlags();
2181	+	smClear_flags(smMesh,T_ACTIVE_FLAG);
2182	+	/* Clear all of the active sample flags*/
2183	+	sClear_all_flags(SM_SAMP(smMesh));
2184	+
2185	+
2186	+	/* calculate the world space coordinates of the view frustum */
2187	+	calculate_view_frustum(view->vp,view->hvec,view->vvec,view->horiz,
2188	+	view->vert, dev_zmin,dev_zmax,nr,far);
2189	+
2190	+	#ifdef TEST_DRIVER
2191	+	VCOPY(FrustumFar[0],far[0]);
2192	+	VCOPY(FrustumFar[1],far[1]);
2193	+	VCOPY(FrustumFar[2],far[2]);
2194	+	VCOPY(FrustumFar[3],far[3]);
2195	+	VCOPY(FrustumNear[0],nr[0]);
2196	+	VCOPY(FrustumNear[1],nr[1]);
2197	+	VCOPY(FrustumNear[2],nr[2]);
2198	+	VCOPY(FrustumNear[3],nr[3]);
2199	+	#endif
2200	+	/* Project the view frustum onto the spherical quadtree */
2201	+	/* For every cell intersected by the projection of the faces
2202	+
2203	+	of the frustum: mark all triangles in the cell as ACTIVE-
2204	+	Also set the triangles LRU clock counter
2205	+	*/
2206	+
2207	+	if(EQUAL_VEC3(view->vp,SM_VIEW_CENTER(smMesh)))
2208	+	{/* Near face triangles */
2209	+
2210	+	smLocator_apply(smMesh,nr[0],nr[2],nr[3],f);
2211	+	smLocator_apply(smMesh,nr[2],nr[0],nr[1],f);
2212	+	return;
2213	+	}
2214	+	/* Test the view against the planes: and swap orientation if inside:*/
2215	+	tri_plane_equation(nr[0],nr[2],nr[3], &peq,FALSE);
2216	+	if(PT_ON_PLANE(SM_VIEW_CENTER(smMesh),peq) < 0.0)
2217	+	{/* Near face triangles */
2218	+	smLocator_apply(smMesh,nr[3],nr[2],nr[0],f);
2219	+	smLocator_apply(smMesh,nr[1],nr[0],nr[2],f);
2220	+	}
2221	+	else
2222	+	{/* Near face triangles */
2223	+	smLocator_apply(smMesh,nr[0],nr[2],nr[3],f);
2224	+	smLocator_apply(smMesh,nr[2],nr[0],nr[1],f);
2225	+	}
2226	+	tri_plane_equation(nr[0],far[3],far[0], &peq,FALSE);
2227	+	if(PT_ON_PLANE(SM_VIEW_CENTER(smMesh),peq) < 0.0)
2228	+	{ /* Right face triangles */
2229	+	smLocator_apply(smMesh,far[0],far[3],nr[0],f);
2230	+	smLocator_apply(smMesh,nr[3],nr[0],far[3],f);
2231	+	}
2232	+	else
2233	+	{/* Right face triangles */
2234	+	smLocator_apply(smMesh,nr[0],far[3],far[0],f);
2235	+	smLocator_apply(smMesh,far[3],nr[0],nr[3],f);
2236	+	}
2237	+
2238	+	tri_plane_equation(nr[1],far[2],nr[2], &peq,FALSE);
2239	+	if(PT_ON_PLANE(SM_VIEW_CENTER(smMesh),peq) < 0.0)
2240	+	{ /* Left face triangles */
2241	+	smLocator_apply(smMesh,nr[2],far[2],nr[1],f);
2242	+	smLocator_apply(smMesh,far[1],nr[1],far[2],f);
2243	+	}
2244	+	else
2245	+	{ /* Left face triangles */
2246	+	smLocator_apply(smMesh,nr[1],far[2],nr[2],f);
2247	+	smLocator_apply(smMesh,far[2],nr[1],far[1],f);
2248	+	}
2249	+	tri_plane_equation(nr[0],far[0],nr[1], &peq,FALSE);
2250	+	if(PT_ON_PLANE(SM_VIEW_CENTER(smMesh),peq) < 0.0)
2251	+	{/* Top face triangles */
2252	+	smLocator_apply(smMesh,nr[1],far[0],nr[0],f);
2253	+	smLocator_apply(smMesh,far[1],far[0],nr[1],f);
2254	+	}
2255	+	else
2256	+	{/* Top face triangles */
2257	+	smLocator_apply(smMesh,nr[0],far[0],nr[1],f);
2258	+	smLocator_apply(smMesh,nr[1],far[0],far[1],f);
2259	+	}
2260	+	tri_plane_equation(nr[3],nr[2],far[3], &peq,FALSE);
2261	+	if(PT_ON_PLANE(SM_VIEW_CENTER(smMesh),peq) < 0.0)
2262	+	{/* Bottom face triangles */
2263	+	smLocator_apply(smMesh,far[3],nr[2],nr[3],f);
2264	+	smLocator_apply(smMesh,far[3],far[2],nr[2],f);
2265	+	}
2266	+	else
2267	+	{ /* Bottom face triangles */
2268	+	smLocator_apply(smMesh,nr[3],nr[2],far[3],f);
2269	+	smLocator_apply(smMesh,nr[2],far[2],far[3],f);
2270	+	}
2271	+	tri_plane_equation(far[2],far[0],far[1], &peq,FALSE);
2272	+	if(PT_ON_PLANE(SM_VIEW_CENTER(smMesh),peq) < 0.0)
2273	+	{/* Far face triangles */
2274	+	smLocator_apply(smMesh,far[0],far[2],far[1],f);
2275	+	smLocator_apply(smMesh,far[2],far[0],far[3],f);
2276	+	}
2277	+	else
2278	+	{/* Far face triangles */
2279	+	smLocator_apply(smMesh,far[1],far[2],far[0],f);
2280	+	smLocator_apply(smMesh,far[3],far[0],far[2],f);
2281	+	}
2282	+
2283	+	}
2284
2285
2286

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines