moving_obstacle.cpp 42.8 KB
Newer Older
pitiot's avatar
maj    
pitiot committed
1
2
3
4
#include "moving_obstacle.h"
#include "obstacle.h"
#include "agent.h"
#include "simulator.h"
5
#include "moving_mesh.h"
6
#include "Utils/colorMaps.h"
pitiot's avatar
maj    
pitiot committed
7

8
9
#include "Algo/Modelisation/triangulation.h"

Pierre Kraemer's avatar
Pierre Kraemer committed
10
//float MovingObstacle::neighborDistSq_ = 5.0f * 5.0f;
pitiot's avatar
maj    
pitiot committed
11

pitiot's avatar
pitiot committed
12
float MovingObstacle::maxSpeed_ = 2.0f;
pitiot's avatar
pitiot committed
13
14
float MovingObstacle::neighborDist_ = 10.0f ;
float MovingObstacle::neighborDistSq_ = neighborDist_ * neighborDist_ ;
pitiot's avatar
maj    
pitiot committed
15
16
17
18
float MovingObstacle::timeHorizonObst_ = 10.0f;
unsigned int MovingObstacle::maxNeighbors_ = 20;
float MovingObstacle::detectionFixedObst = 50;

pitiot's avatar
pitiot committed
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
void  MovingObstacle::addGeneralCell ( Dart d)
{
	bool added = false;
	std::vector< std::pair<Dart,int> >::iterator it =general_belonging.begin();
	while (it != general_belonging.end() )
	{
		if(sim_->envMap_.map.sameFace((*it).first,d))
		{
			(*it).second ++;
			added= true;
			break;
		}
		else ++it;

	};

	if (!added)
	{
		general_belonging.push_back(std::make_pair(d,1));
	}
}
Thomas Jund's avatar
Thomas Jund committed
40

pitiot's avatar
pitiot committed
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
bool  MovingObstacle::removeGeneralCell (Dart d)
{
	std::vector< std::pair<Dart,int> >::iterator it =general_belonging.begin();
	while (it != general_belonging.end() )
	{
		if(sim_->envMap_.map.sameFace((*it).first,d))
		{
			if(--((*it).second)==0)
			{
				*it = general_belonging.back() ;
				general_belonging.pop_back() ;
			}
			return true;
		}
		else ++it;

	};
	return false;
}

pitiot's avatar
up    
pitiot committed
61
62


pitiot's avatar
maj    
pitiot committed
63
64
bool MovingObstacle::is_inside(VEC3 p)
{
65
//	return false;
pitiot's avatar
up    
pitiot committed
66
	VEC3 vec, norm, p1,vec2,p2;
67
68
69
70
71


	for (unsigned int i = 0; i < nbVertices; i++)
	{
		 p1 = getPosition(i);
pitiot's avatar
up    
pitiot committed
72
		 p2 = center;
73
74
75

		vec = VEC3(p2 - p1);

pitiot's avatar
up    
pitiot committed
76
77
78

		vec2 = VEC3(p -p1);
		if (vec*vec2 < 0)
79
80
81
82
			return false;
	}

	return true;
pitiot's avatar
maj    
pitiot committed
83
84
}

pitiot's avatar
pitiot committed
85
float get_angle(VEC3 v1, VEC3 v2) //renvoie l'angle entre [- pi ; Pi] du v2 à v1
pitiot's avatar
maj    
pitiot committed
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
{
	float flo = 0.0f;
	float nb = std::sqrt(v1.norm2() * v2.norm2());

	if (nb != 0)
	{
		nb = (v1*v2) / nb;

		if (nb > 1)
			nb = 1;
		else if (nb < -1)
			nb = -1;
		flo = std::acos(nb);
	}

	if ((v1[0] * v2[1] - v2[0] * v1[1]) > 0)
pitiot's avatar
pitiot committed
102
103
104
105
106
107
108
		flo = - flo;

	if(flo >M_PI)
		flo= flo-2*M_PI;
	if (flo<(-M_PI))
		flo=flo+2*M_PI;

pitiot's avatar
maj    
pitiot committed
109
110
111
	return flo;
}

pitiot's avatar
pitiot committed
112
VEC3 rotate2D(VEC3 pos1, VEC3 center, float angle) // renvoie le déplacement necessaire depuis pos1 pour effectuer la rotation centrée en center d'angle angle
pitiot's avatar
maj    
pitiot committed
113
114
115
116
117
118
119
120
121
{
	VEC3 pos2;
	PFP::REAL x = pos1[0] - center[0];
	PFP::REAL y = pos1[1] - center[1];
	pos2[0] = x * cos(angle) - y * sin(angle) - x;
	pos2[1] = x * sin(angle) + y * cos(angle) - y;
	return pos2;
}

pitiot's avatar
pitiot committed
122

pitiot's avatar
pitiot committed
123
MovingObstacle::MovingObstacle(Simulator* sim, int ind, std::vector<VEC3> pos, std::vector<VEC3> goals, bool rigid, bool spin,int curGoal, Dart dInside, ArticulatedObstacle * art, int indParent) :
124
		nbVertices(pos.size()),
125
		center(0),
pitiot's avatar
maj    
pitiot committed
126
		index(ind),
127
		goals_(goals),
pitiot's avatar
pitiot committed
128
		curGoal_(curGoal),
129
130
131
132
133
		velocity_factor(0.8f),
		color1(1.0f),
		color2(1.0f),
		color3(1.0f),
		seen(false),
pitiot's avatar
maj    
pitiot committed
134
		newVelocity_(0),
pitiot's avatar
merging    
pitiot committed
135
		sim_(sim),
136
137
		rigid_(rigid),
		spinning(spin),
pitiot's avatar
merging    
pitiot committed
138
		parent(art),
pitiot's avatar
blah    
pitiot committed
139
		mm_(NULL),
Thomas Jund's avatar
Thomas Jund committed
140
		ag_(NULL),
141
142
		index_parent(indParent),
		gravity_dist(0)
pitiot's avatar
maj    
pitiot committed
143
144
145
{
	assert(pos.size() > 2);

146
147
	if(dInside==NIL)
		dInside = sim_->envMap_.getBelongingCell(pos[0]);
pitiot's avatar
maj    
pitiot committed
148

149
150
151
152
	unsigned int nbParticles = nbVertices;
	if(!rigid);
	  nbParticles +=1; //a center particle for the mass-spring
	
153
#ifdef TWO_AND_HALF_DIM
154
	parts_ = new CGoGN::Algo::Surface::MovingObjects::ParticleCell2DAndHalf<PFP>*[nbParticles];
155
#else
156
157
158
159
160
#ifdef SECURED
	parts_ = new CGoGN::Algo::Surface::MovingObjects::ParticleCell2DSecured<PFP>*[nbParticles];
#else
	parts_ = new CGoGN::Algo::Surface::MovingObjects::ParticleCell2D<PFP>*[nbParticles];
#endif
161
162
#endif

pitiot's avatar
maj    
pitiot committed
163
	obstacles_ = new Obstacle*[nbVertices];
164
165
	belonging_cells = new std::vector<Dart>[nbVertices];
	neighbor_cells = new std::vector<Dart>[nbVertices];
166
167
168
169

	position = map.addAttribute<VEC3, VERTEX>("position") ;
	normal = map.addAttribute<VEC3, VERTEX>("normal") ;
	deformation = map.addAttribute<VEC3, VERTEX>("deformation") ;
170
171
172
173

	if(!rigid_)
	{
		velocity = map.addAttribute<VEC3, VERTEX>("velocity") ;
Thomas Jund's avatar
Thomas Jund committed
174
		forces = map.addAttribute<VEC3, VERTEX>("force") ;
175
		edgeLength = map.addAttribute<float, EDGE>("edgeLength") ;
Thomas Jund's avatar
Thomas Jund committed
176
		vertexAngle = map.addAttribute<float, DART>("vertexAngle") ;
177
	}
178

179
	for (unsigned int i = 0; i < nbVertices; ++i)
180
181
	{
#ifdef TWO_AND_HALF_DIM
182
183
		Dart d = dInside;
		parts_[i] = new CGoGN::Algo::Surface::MovingObjects::ParticleCell2DAndHalf<PFP>(sim_->envMap_.map, d, pos[i], sim_->envMap_.position);
184

185
#else
186
		Dart d = sim_->envMap_.getBelongingCell(pos[i]);
187
188
189
190
191
192
#ifdef SECURED
		parts_[i]  = new CGoGN::Algo::Surface::MovingObjects::ParticleCell2DSecured<PFP>(sim_->envMap_.map, d, pos[i], sim_->envMap_.position);
#else

		parts_[i]  = new CGoGN::Algo::Surface::MovingObjects::ParticleCell2D<PFP>(sim_->envMap_.map, d, pos[i], sim_->envMap_.position);
#endif
193
194
195
196
197
198
#endif
		center += pos[i];

		if(i==0)
			dDir = d;
	}
199

200
201
202
203
204
	center /= nbVertices;
	front=(pos[0] + pos[1]) / 2;
	
	if(!rigid_)
	{
pitiot's avatar
pitiot committed
205
#ifdef TWO_AND_HALF_DIM
206
		parts_[nbVertices] = new CGoGN::Algo::Surface::MovingObjects::ParticleCell2DAndHalf<PFP>(sim_->envMap_.map, dInside, center, sim_->envMap_.position);
pitiot's avatar
pitiot committed
207
#else
208
209
210
211
#ifdef SECURED
		parts_[nbVertices]  = new CGoGN::Algo::Surface::MovingObjects::ParticleCell2DSecured<PFP>(sim_->envMap_.map, dInside, center, sim_->envMap_.position);
#else
		parts_[nbVertices] = new CGoGN::Algo::Surface::MovingObjects::ParticleCell2D<PFP>(sim_->envMap_.map, dInside, center, sim_->envMap_.position);
pitiot's avatar
pitiot committed
212
#endif
213
214
215
#endif
	}
	
216
217
	groundFace = map.newFace(nbVertices);

pitiot's avatar
maj    
pitiot committed
218
219
	for (unsigned int i = 0; i < nbVertices; ++i)
	{
220
221
222
223
224
		float distance=(center-pos[i]).norm();
		if(distance>gravity_dist)
		{
			gravity_dist=distance;
		}
Thomas Jund's avatar
Thomas Jund committed
225
		Dart d = i;
226
227
		position[d] = pos[i];
		deformation[d] = VEC3(0);
228
229

		if(!rigid_)
Thomas Jund's avatar
Thomas Jund committed
230
		{
231
			velocity[d] = VEC3(0);
Thomas Jund's avatar
Thomas Jund committed
232
233
			forces[d] = VEC3(0);
		}
pitiot's avatar
pitiot committed
234
	}
235

236
237
	//extrude face to build a cage
	// compute edgeLength for mass-spring
238
239
240
	height=rigid_ ? 10.0f : 10.0f;
	Algo::Surface::Modelisation::extrudeFace<PFP>(map, position, groundFace, height) ;
	
241
242
243
	map.fillHole(groundFace);
	groundFace = map.phi2(groundFace);

244
245
	if(!rigid_)
	{
pitiot's avatar
pitiot committed
246
247
248
249
250
251
252
253
254
255
256
257
		Dart d = Algo::Surface::Modelisation::trianguleFace<PFP>(map,groundFace);
		position[d]=parts_[nbVertices]->getPosition();


		for (unsigned int i = 0; i < nbVertices; ++i)
		{
			Dart e =map.phi<12>(d);
			map.splitFace(map.phi_1(e),map.phi1(e));

			d=map.phi<21>(d);
		}

258
		Algo::Surface::Modelisation::EarTriangulation<PFP> et(map);
259
260
261
262
263
264
265
		et.triangule();

		TraversorE<PFP::MAP> tE(map);
		for(Dart d = tE.begin() ; d != tE.end() ; d = tE.next())
		{
			edgeLength[d] = VEC3(position[map.phi1(d)]-position[d]).norm();
		}
Thomas Jund's avatar
Thomas Jund committed
266

pitiot's avatar
merging    
pitiot committed
267
268
269
270
		Dart centerDart =map.phi<11>(groundFace);
		d = centerDart;

		do
Thomas Jund's avatar
Thomas Jund committed
271
		{
pitiot's avatar
merging    
pitiot committed
272
273
274
275
276
			Dart e = map.phi1(d);
			vertexAngle[e] = Algo::Surface::Geometry::angle<PFP>(map,d,map.phi2(map.phi_1(d)),position);
			vertexAngle[d] = Algo::Surface::Geometry::angle<PFP>(map,map.phi_1(d),map.phi2(e),position);
			vertexAngle[map.phi_1(d)]= Algo::Surface::Geometry::angle<PFP>(map,e,map.phi2(d),position);
			d=map.phi<21>(d);
Thomas Jund's avatar
Thomas Jund committed
277
		}
pitiot's avatar
merging    
pitiot committed
278
		while(d!=centerDart);
279
		map.enableQuickTraversal<VERTEX>();
280

Thomas Jund's avatar
Thomas Jund committed
281
		dDir=dInside;
pitiot's avatar
pitiot committed
282
	}
283

pitiot's avatar
merging    
pitiot committed
284

285

pitiot's avatar
maj    
pitiot committed
286
287
	for (unsigned int i = 0; i < nbVertices; ++i)
	{
pitiot's avatar
pitiot committed
288
289
		Obstacle* o = new Obstacle(parts_[i]->getPosition(),
				parts_[(i + 1) % nbVertices]->getPosition(),
Thomas Jund's avatar
merge    
Thomas Jund committed
290
				parts_[(i - 1 + nbVertices) % nbVertices]->getPosition(),
Thomas Jund's avatar
Thomas Jund committed
291
				parts_[(i + 2) % nbVertices]->getPosition(), i, (i+1)% nbVertices, this, i);
pitiot's avatar
maj    
pitiot committed
292
		obstacles_[i] = o;
pitiot's avatar
pitiot committed
293
//		CGoGNout<<" obstacle :"<< i << " num : "<< o<<CGoGNendl;
pitiot's avatar
pitiot committed
294
		sim_->envMap_.pushObstacleInCells(o);
pitiot's avatar
maj    
pitiot committed
295
296
297
	}
}

298
299
300
301
302
303
304
305
306
307
308
void MovingObstacle::initGL()
{
#ifdef EXPORTING_BOXES

	m_render = new Algo::Render::GL2::MapRender();

	m_positionVBO = new Utils::VBO();

	// using simple shader with color
	m_shader = new Utils::ShaderSimpleColor();
	m_shader->setAttributePosition(m_positionVBO);
pitiot's avatar
pitiot committed
309
	m_shader->setColor(Geom::Vec4f(0.,1.,0.,0.));
310
311
312
313
314
315
316
317
318
319
//	m_shader->setAmbiant(Geom::Vec4f(0.,1.,0.,0.));
//	m_shader->setDiffuse(Geom::Vec4f(0.,1.,0.,0.));

	m_positionVBO->updateData(position) ;

	m_render->initPrimitives<PFP>(map, Algo::Render::GL2::LINES,false) ;
	m_render->initPrimitives<PFP>(map, Algo::Render::GL2::TRIANGLES,false) ;

//	registerShader(m_shader);
#endif
Thomas Jund's avatar
Thomas Jund committed
320
321

	m_ds = new Utils::Drawer();
322
323
}

Thomas Jund's avatar
Thomas Jund committed
324
void MovingObstacle::draw(bool showPath)
325
326
327
328
329
{
#ifdef EXPORTING_BOXES
//	m_render->initPrimitives<PFP>(map, Algo::Render::GL2::LINES,false) ;
//	m_render->initPrimitives<PFP>(map, Algo::Render::GL2::TRIANGLES,false) ;
	m_positionVBO->updateData(position);
330
//	m_shader->setColor(Geom::Vec4f(movingObstacleNeighbors_.size()==0 ? 1.0f : 0,0.,0.,0.));
pitiot's avatar
merge    
pitiot committed
331

pitiot's avatar
merging    
pitiot committed
332
//	VEC3 col = Utils::color_map_BCGYR(float(index)/float(sim_->movingObstacles_.size()));
Arash HABIBI's avatar
Arash HABIBI committed
333

pitiot's avatar
up    
pitiot committed
334
//	if(movingObstacleNeighbors_.size()==0)
pitiot's avatar
merging    
pitiot committed
335
336
337
338
//	if(index==12)
//	// if(obstacleNeighbors_.size()==0)
//		m_shader->setColor(Geom::Vec4f(col[0],col[1],col[2],0));
//	else
339
		m_shader->setColor(Geom::Vec4f(0.5,0.5,0.5,0));
pitiot's avatar
merge    
pitiot committed
340

341
342
343
344
	m_render->draw(m_shader, Algo::Render::GL2::TRIANGLES);
	m_shader->setColor(Geom::Vec4f(0.,0.,0.,0.));
	m_render->draw(m_shader, Algo::Render::GL2::LINES);
#endif
Thomas Jund's avatar
Thomas Jund committed
345
346
347
348
349
350
351
352

	if(showPath)
	{
		m_ds->newList(GL_COMPILE_AND_EXECUTE);
		m_ds->begin(GL_LINE_STRIP);

		VEC3 col = Utils::color_map_BCGYR(float(index)/float(sim_->movingObstacles_.size()));
		m_ds->color3f(col[0],col[1],col[2]);
pitiot's avatar
up    
pitiot committed
353
354
		m_ds->vertex(center);
		for(unsigned int i = 0 ; i < goals_.size() ; i++)
Thomas Jund's avatar
Thomas Jund committed
355
		{
pitiot's avatar
up    
pitiot committed
356
			m_ds->vertex(goals_[(curGoal_+i)%(goals_.size())]);
Thomas Jund's avatar
Thomas Jund committed
357
358
359
360
361
		}

		m_ds->end();
		m_ds->endList();
	}
362
363
}

364
365
VEC3 MovingObstacle::getDilatedPosition(unsigned int ind)
{
366
	Dart d(ind); //WARNING : works only for one face created at start !
pitiot's avatar
pitiot committed
367
#ifndef TWO_AND_HALF_DIM
pitiot's avatar
up    
pitiot committed
368
369
370
371
372
373
//	return position[d]+deformation[d];
	if(!rigid_)
		{
			return position[d];
		}
	else return position[d]+deformation[d];
pitiot's avatar
pitiot committed
374
#else
Arash HABIBI's avatar
Arash HABIBI committed
375
	return position[d];
pitiot's avatar
pitiot committed
376
#endif
377
378
379
380
}

VEC3 MovingObstacle::getPosition(unsigned int ind)
{
381
382
	Dart d(ind);
	return position[d];
383
384
}

pitiot's avatar
maj    
pitiot committed
385
386
387
388
bool MovingObstacle::test_opposition(VEC3 o, VEC3 p1, VEC3 p2)
{
	o.normalize();
	o *= -1;
389
390
391
	VEC3 vector(p1 - p2);
	vector.normalize();
	return (o - vector).norm2() < 0.1;
pitiot's avatar
maj    
pitiot committed
392
393
394
}

// TODO Check position
pitiot's avatar
pitiot committed
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
//void MovingObstacle::contournerBatiment()
//{
//	PFP::VEC3 toto;
//	PFP::VEC3 toto_norm;
//	//for particles in the "front" of the object (to modify)
//	for(int k =0;k<2;k++)
//	{
//
//		registering_part->get_memo(vertices[k]);
//		std::vector<Obstacle*>& obst = sim_->envMap_.obstvect[registering_part->d];
//
//		//search all obstacles around
//		for(std::vector<Obstacle*>::const_iterator it = obst.begin(); it != obst.end(); ++it)
//		{
//			//only for fixed obstacles around
//			if ((*it)->mo==NULL)
//			{
//				float distSq = distSqPointLineSegment((*it)->p1, (*it)->p2, vertices[k]);
//				if(distSq < detectionFixedObst*detectionFixedObst)
//				{
//					toto= (*it)->p1 -(*it)->p2;
//					toto_norm=toto;
//					toto_norm[0]=-toto[1];
//					toto_norm[1]=toto[0];
//
//					if(test_opposition(toto_norm,front,center)) //// à changer ////////////
//					{
//						int co = rand() % 2 ;
//						if (toto[0]==0)
//						{
//							finalGoal[0]=front[0];
//							if (co == 0)
//								finalGoal[0]=sim_->envMap_.geometry.max()[1]-maxNeighbors_;
//							else
//								finalGoal[0]=sim_->envMap_.geometry.min()[1]+maxNeighbors_;
//						}
//						else
//						{
//							finalGoal[1]=front[1];
//							if (co == 0)
//								finalGoal[0]=sim_->envMap_.geometry.max()[1]-maxNeighbors_;
//							else
//								finalGoal[0]=sim_->envMap_.geometry.min()[1]+maxNeighbors_;
//						}
//
//						float angle =get_angle(finalGoal-center,front -center);
//						make_half_turn=angle*nbVertices;
//						break;
//					}
//				}
//			}
//		}
//	}
//}
pitiot's avatar
maj    
pitiot committed
449

pitiot's avatar
pitiot committed
450
void MovingObstacle::updateAgentNeighbors() // agents voisins avec distance au bord (distpointlinesq) de l'obstacle // a mettre en place si besoin
pitiot's avatar
maj    
pitiot committed
451
{
Thomas Jund's avatar
Thomas Jund committed
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
	//test for slugs : doesn't always work.. :)
//	if(!rigid_)
//	{
//		Dart d = registering_part->d;
//
//		std::list<MovingObstacle*> seen;
//		PFP::OBSTACLEVECT& obst = sim_->envMap_.obstvect[d] ;
//		PFP::OBSTACLEVECT& neighborObst = sim_->envMap_.neighborObstvect[d] ;
//
//		for (std::vector<Obstacle*>::iterator it = obst.begin(); it != obst.end(); ++it)
//		{
//
//			if ((*it)->mo!=NULL)
//			{
//				MovingObstacle* other = (*it)->mo;
//				if(other->velocity_ * velocity_<=0.0f) //stop when not in front of each other
//				{
//					if(velocity_*(other->registering_part->getPosition()-registering_part->getPosition())>0)
//					{
//						newVelocity_ = VEC3(newVelocity_[1], -newVelocity_[0], 0);
//						seen.push_back(other);
//					}
//				}
//				else if(velocity_*(other->registering_part->getPosition()-registering_part->getPosition())>0
//						&& (other->registering_part->getPosition()-registering_part->getPosition()).norm2()<2000.0f)
//					newVelocity_ *= 0.01f;
//			}
//		}
//
//		for (std::vector<Obstacle*>::iterator it = neighborObst.begin(); it != neighborObst.end(); ++it)
//		{
//
//			if ((*it)->mo!=NULL)
//			{
//				MovingObstacle* other = (*it)->mo;
//				if(std::find(seen.begin(),seen.end(), other)==seen.end())
//				{
//					if(other->velocity_ * velocity_<=0.0f
//							&& (other->registering_part->getPosition()-registering_part->getPosition()).norm2()<2000.0f)
//					{
//
//						if(velocity_*(other->registering_part->getPosition()-registering_part->getPosition())>0)
//						{
//							newVelocity_ = VEC3(newVelocity_[1], -newVelocity_[0], 0);
//						}
//					}
////					else if(velocity_*(other->registering_part->getPosition()-registering_part->getPosition())>0)
////						newVelocity_ *= 0.5f;
//				}
//			}
//		}
//	}

pitiot's avatar
pitiot committed
505
506
507
508
509
//	agentNeighbors_.clear() ;
//	Dart d;
//	float maxDist = 0.0f ;//distance max des agents eregistrés au centre
//	std::set::iterator agIt;//emplacement de l'agent en question
//	for(int i = 0;i< nbVertices;i++ )
pitiot's avatar
pitiot committed
510
//	{
pitiot's avatar
pitiot committed
511
512
513
514
515
516
//		registering_part->get_memo(vertices[i]);
//		d=registering_part->d;
//		const std::vector<Agent*>& agents = sim_->envMap_.agentvect[d] ;
//		const std::vector<Agent*>& neighborAgents = sim_->envMap_.neighborAgentvect[d] ;
//
//
pitiot's avatar
pitiot committed
517
//
pitiot's avatar
pitiot committed
518
519
520
521
//		for (std::vector<Agent*>::const_iterator it = agents.begin(); it != agents.end(); ++it)
//		{
//			if ((*it)->alive)
//			{
pitiot's avatar
pitiot committed
522
//
pitiot's avatar
pitiot committed
523
524
525
526
//				float distSq = (center - (*it)->getPosition()).norm2() ;
//				if ((agentNeighbors_.size() < maxNeighbors_ || distSq < maxDist)
//					&& distSq < neighborDistSq_)
//				{
pitiot's avatar
pitiot committed
527
//
pitiot's avatar
pitiot committed
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
//					if (distSq > maxDist)
//					{
//						maxDist = distSq ;
//						agIt=(agentNeighbors_.insert(std::make_pair(distSq, *it))).first() ;
//					}
//					else
//					{
//						agentNeighbors_.insert(std::make_pair(distSq, *it))
//					}
//				}
//
//			}
//		}
//
//		for (std::vector<Agent*>::const_iterator it = neighborAgents.begin(); it != neighborAgents.end(); ++it)
//		{
//			if ((*it)->alive)
//			{
//				float distSq = (getPosition() - (*it)->getPosition()).norm2() ;
//				if ((agentNeighbors_.size() < maxNeighbors_ || distSq < maxDist)
//					&& distSq < neighborDistSq_)
//				{
//					if (distSq > maxDist)
//					{
//						maxDist = distSq ;
//						agIt=(agentNeighbors_.insert(std::make_pair(distSq, *it))).first() ;
//					}
//					else
//					{
//						agentNeighbors_.insert(std::make_pair(distSq, *it))
//					}
//				}
//			}
//
//		}
pitiot's avatar
pitiot committed
563
//	}
pitiot's avatar
pitiot committed
564
565
566
567
}

void MovingObstacle::updateObstacleNeighbors() // obstacles voisins , distance par rapport aux centres des segments// a mettre en place si besoin
{
568
569
	obstacleNeighbors_.clear() ;
	movingObstacleNeighbors_.clear() ;
pitiot's avatar
pitiot committed
570
	for (std::vector< std::pair<Dart, int> >::iterator it2 = general_belonging.begin();it2 != general_belonging.end(); ++it2)
571
	{
pitiot's avatar
pitiot committed
572
573
		std::vector<Obstacle*>& obst = sim_->envMap_.obstvect[(*it2).first] ;
		std::vector<Obstacle*>& neighborObst = sim_->envMap_.neighborObstvect[(*it2).first] ;
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
//		float maxDistObst = 0.0f ;
//		float maxDistMovingObst = 0.0f ;
		float distance_detection=2.5* gravity_dist;
		float distance_detectionSq=distance_detection*distance_detection;
		for(std::vector<Obstacle*>::const_iterator it = obst.begin() ; it != obst.end() ; ++it)
		{
			if ((*it)->mo==NULL)
			{
				float distSq = distSqPointLineSegment((*it)->p1, (*it)->p2, center) ;
				if (/*(obstacleNeighbors_.size() < maxMovingObstacles_|| distSq < maxDistObst)
						&&*/ distSq < distance_detectionSq)
				{


//						if (distSq > maxDistObst)
//							maxDistObst = distSq ;
						obstacleNeighbors_.push_back(std::make_pair(distSq, *it)) ;



				}
			}
			else
			{
				if((*it)->mo->index!=index)
				{
					float distSq = distSqPointLineSegment((*it)->p1, (*it)->p2, center) ;
					if (/*(movingObstacleNeighbors_.size() < maxMovingObstacles_ || distSq < maxDistMovingObst) &&*/
							 distSq < distance_detectionSq)
					{
pitiot's avatar
pitiot committed
604
605
606
607
608
609
//						if (sim_->envMap_.testOrientation(parts_[nbVertices]->getPosition(), (*it)->p1, (*it)->p2, parts_[nbVertices]->d) == 1)
						{
	//						if (distSq > maxDistMovingObst)
	//							maxDistMovingObst = distSq ;
							movingObstacleNeighbors_.push_back(std::make_pair(distSq, *it)) ;
						}
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644



					}

				}
			}
		}

		for(std::vector<Obstacle*>::const_iterator it = neighborObst.begin() ; it != neighborObst.end() ; ++it)
		{
			if ((*it)->mo==NULL)
			{
				float distSq = distSqPointLineSegment((*it)->p1, (*it)->p2, center) ;
				if (/*(obstacleNeighbors_.size() < maxMovingObstacles_|| distSq < maxDistObst)
						&&*/ distSq < distance_detectionSq)
				{


//						if (distSq > maxDistObst)
//							maxDistObst = distSq ;
						obstacleNeighbors_.push_back(std::make_pair(distSq, *it)) ;



				}
			}
			else
			{
				if((*it)->mo->index!=index)
				{
					float distSq = distSqPointLineSegment((*it)->p1, (*it)->p2, center) ;
					if (/*(movingObstacleNeighbors_.size() < maxMovingObstacles_ || distSq < maxDistMovingObst) &&*/
							 distSq < distance_detectionSq)
					{
pitiot's avatar
pitiot committed
645
646
647
648
649
650
//						if (sim_->envMap_.testOrientation(parts_[nbVertices]->getPosition(), (*it)->p1, (*it)->p2, parts_[nbVertices]->d) == 1)
						{
	//						if (distSq > maxDistMovingObst)
	//							maxDistMovingObst = distSq ;
							movingObstacleNeighbors_.push_back(std::make_pair(distSq, *it)) ;
						}
651
652
653
654
655
					}
				}
			}
		}
	}
pitiot's avatar
maj    
pitiot committed
656
657
}

Arash HABIBI's avatar
unidir    
Arash HABIBI committed
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
//-------------------------------------------------------------

int matrixInverse(VEC3 v1, VEC3 v2, VEC3 v3, VEC3 *inv1, VEC3 *inv2, VEC3 *inv3)
{
	int res = 0;
	float determinant = v1[0]*v2[1]*v3[2] + v2[0]*v3[1]*v1[2] + v3[0]*v1[1]*v2[2] - v3[0]*v2[1]*v1[2] - v2[0]*v1[1]*v3[2] - v1[0]*v3[1]*v2[2];

	if(determinant==0.0)
		res=1;

	else
	{
		float un_sur = 1.0 / determinant;

		*inv1 = VEC3( v2[1]*v3[2]-v3[1]*v2[2], v2[0]*v3[2]-v3[0]*v2[2], v2[0]*v3[1]-v3[0]*v2[1] );
		*inv2 = VEC3( v1[1]*v3[2]-v3[1]*v1[2], v1[0]*v3[2]-v3[0]*v1[2], v1[0]*v3[1]-v3[0]*v1[1] );
		*inv3 = VEC3( v1[1]*v2[2]-v2[1]*v1[2], v1[0]*v2[2]-v2[0]*v1[2], v1[0]*v2[1]-v2[0]*v1[1] );
		res=0;
		*inv1 = *inv1 * un_sur;
		*inv2 = *inv2 * un_sur;
		*inv3 = *inv3 * un_sur;
	}
	return res;
}

//-------------------------------------------------------------

float distToLine(VEC3 M, VEC3 P, VEC3 u)
{
	u.normalize();
	VEC3 MP = P - M;
	return(MP*(u^(MP^u)));
}

//-------------------------------------------------------------
// Première stratégie : appliquer à p1 et à p2 une force
// colinéaire à f, mais d'intensité différente. Dans ce cas,
// il est nécessaire de calculer la somme des moments et de
// l'annuler. *f1 = f*d2/(d1+d2) et *f2 = f*d1/(d1+d2).

void getResponse1(VEC3 f, VEC3 p, VEC3 p1, VEC3 p2, VEC3 *f1, VEC3 *f2)
{
	float d1  = distToLine(p1,p,f);
	float d2  = distToLine(p2,p,f);

	*f1 = f*(-d2/(d1+d2));
	*f2 = f*(-d1/(d1+d2));
}

//-------------------------------------------------------------
// Deuxième stratégie, les forces appliquées à p1 et p2
// doivent etre colinaires respectivement à pp1 et pp2.
// Donc la somme des moments est automatiquement nulle.
// Pour calculer les intensites, il faut décomposer f
// dans la base (pp1,pp2), ce qui donnera l'intensite de
// chaque force. Problème : on peut générer des forces
// d'étirement importantes.

void getResponse2(VEC3 f, VEC3 p, VEC3 p1, VEC3 p2, VEC3 *f1, VEC3 *f2)
{
	float d1  = (p1-p).norm();
	float d2  = (p2-p).norm();
	float d12 = (p2-p1).norm();

	VEC3 ortho = (p1-p) ^ (p2-p);
	if(ortho.norm()==0.0)
	{
		if(d12==0) // comprend le cas où d1==0 et d2==0
		{
			*f2 = (-0.5)*f;
			*f1 = (-0.5)*f;
		}
		else if(d1==0)
		{
			*f2 = VEC3(0,0,0);
			*f1 = -f;
			// meilleure idee : projeter f sur p1p2 -> f2 et f1 <- f-f2
		}
		else if(d2==0)
		{
			*f1 = VEC3(0,0,0);
			*f2 = -f;
			// meilleure idee : projeter f sur p1p2 -> f1 et f2 <- f-f1
		}
		else // trois points distincts, mais alignés
		{
			// A suivre
		}
	}
	// int res = matrixInverse(p1-p,p2-p,ortho, VEC3 *inv1, VEC3 *inv2, VEC3 *inv3);
	// inv1, inv2 et inv3 sont les composantes de la matrice inverse. L'image de
	// p1-p et p2-p par cette matrice donne la valeur des forces f1 et f2.
}


//-------------------------------------------------------------

void MovingObstacle::initForces()
{
pitiot's avatar
pitiot committed
757

Arash HABIBI's avatar
unidir    
Arash HABIBI committed
758
	if(!rigid_)
pitiot's avatar
pitiot committed
759
760
761
762
	{
		Dart centerDart =map.phi<11>(groundFace);
			Dart d = centerDart;
		do
Arash HABIBI's avatar
unidir    
Arash HABIBI committed
763
		{
pitiot's avatar
pitiot committed
764
			Dart e = map.phi1(d);
Arash HABIBI's avatar
unidir    
Arash HABIBI committed
765
			//initialisation of forces
pitiot's avatar
pitiot committed
766
767
			forces[e] = VEC3(0.0);
			d=map.phi<21>(d);
Arash HABIBI's avatar
unidir    
Arash HABIBI committed
768
		}
pitiot's avatar
pitiot committed
769
770
771
		while(d!=centerDart);
		forces[d] = VEC3(0.0);
	}
Arash HABIBI's avatar
unidir    
Arash HABIBI committed
772
773
}

Arash HABIBI's avatar
Arash HABIBI committed
774
775
776

//-------------------------------------------------------------

pitiot's avatar
pitiot committed
777
VEC3 computeForce(VEC3 p, VEC3 p1, VEC3 p2, float obst_radius_infl, float obst_power, float obst_stiffness, VEC3 normFace)
Arash HABIBI's avatar
Arash HABIBI committed
778
779
780
781
782
783
784
785
786
787
788
789
790
{
	double force_value=0.0;
	double longueur2 = (p1-p2).norm2();
	double rest_sum_of_dists = 2 * sqrt(obst_radius_infl*obst_radius_infl + longueur2/4);

	double d1 = (p-p1).norm();
	double d2 = (p-p2).norm();
	double sum_of_dists = d1+d2;
	if(sum_of_dists < rest_sum_of_dists)
	{
		double collision_softening_factor = pow(1-sum_of_dists/rest_sum_of_dists,obst_power);
		force_value = obst_stiffness*collision_softening_factor*(rest_sum_of_dists - sum_of_dists);
		VEC3 v_obst = p2 - p1;
pitiot's avatar
pitiot committed
791
		VEC3 normal = normFace^v_obst;
Arash HABIBI's avatar
Arash HABIBI committed
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
		// Ajouter une composante tangentielle

		normal += v_obst * ((d1-d2)/sum_of_dists);
		// normal += v_obst * ((d1-d2)/(5*sum_of_dists));
		// Le facteur 5 est là seulement pour diminuer l'influence de la composante tangentielle
		normal.normalize();

		// force_value *= 10;
		/*
		VEC3 force_vector1, force_vector2;
		getResponse1(force_vector,p,p1,p2,&force_vector1,&force_vector2);
		Dart d1 = obst->d1;
		Dart d2 = obst->d2;
		obst->mo->forces[d1] += force_vector1;
		obst->mo->forces[d2] += force_vector2;
		*/
		return(force_value * normal);
	}
	else
		return(VEC3(0));
}


Arash HABIBI's avatar
unidir    
Arash HABIBI committed
815
816
//-------------------------------------------------------------

817
void MovingObstacle::updateForces()
pitiot's avatar
maj    
pitiot committed
818
{
pitiot's avatar
pitiot committed
819
	assert(sim_->envMap_.map.getCurrentLevel() == sim_->envMap_.map.getMaxLevel()) ;
pitiot's avatar
pitiot committed
820

pitiot's avatar
pitiot committed
821
	//pour les tests de détection///////////////
pitiot's avatar
merging    
pitiot committed
822
823
824
825
826
827
828
	if(!seen)
	{
		color1=1.0f;
		color2=1.0f;
		color3=1.0f;
	}
	seen=false;
Thomas Jund's avatar
merge    
Thomas Jund committed
829

pitiot's avatar
pitiot committed
830
	//////////////////////////
Thomas Jund's avatar
merge    
Thomas Jund committed
831

832
	PFP::VEC3 bary(0);
pitiot's avatar
maj    
pitiot committed
833
834

	Dart d;
pitiot's avatar
pitiot committed
835
836
	velocity_ = newVelocity_* velocity_factor;

pitiot's avatar
maj    
pitiot committed
837
	// MAJ des particules
pitiot's avatar
pitiot committed
838
	float abs_angle= angle > 0 ? 1 : -1;
pitiot's avatar
merge    
pitiot committed
839

pitiot's avatar
merging    
pitiot committed
840
	float rotor=0;
841

pitiot's avatar
merging    
pitiot committed
842
843
844
845
	if (index_parent==0)
		rotor = abs_angle*angle > 0.04f ? 0.04f : abs_angle*angle ;
	else
		rotor = abs_angle*angle ;
pitiot's avatar
merge    
pitiot committed
846

Arash HABIBI's avatar
03_2013    
Arash HABIBI committed
847
848
	// masse ressort pour la limace

849
	if(!rigid_)
pitiot's avatar
maj    
pitiot committed
850
	{
pitiot's avatar
pitiot committed
851
852
853
854
		Dart centerDart =map.phi<11>(groundFace);
		Dart d = centerDart;
		forces[d] += -0.9f*velocity[d];
		do
Thomas Jund's avatar
Thomas Jund committed
855
		{
pitiot's avatar
pitiot committed
856
			Dart e = map.phi1(d);
Thomas Jund's avatar
Thomas Jund committed
857
			//initialisation of forces with viscosity
pitiot's avatar
pitiot committed
858
			forces[e] += -0.9f*velocity[e];
pitiot's avatar
merging    
pitiot committed
859
			VEC3 p1Next = position[map.phi1(e)]+(velocity[map.phi1(e)] * sim_->timeStep_); // ressorts sur le bord
pitiot's avatar
pitiot committed
860
861
862
			VEC3 p2Next = position[e]+(velocity[e] * sim_->timeStep_);
			// p1Next et p2Next sont la position des extremites de l'arete.
			VEC3 v1 = (p1Next-p2Next);
863

pitiot's avatar
pitiot committed
864
865
			//stretch spring : /!\ max rigidity relative to the timestep used (unstable otherwise)
			float norm = v1.norm();
866
			float rigidity = 10.0f;
Arash HABIBI's avatar
Arash HABIBI committed
867

pitiot's avatar
merging    
pitiot committed
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
			float stretch = 4*rigidity*(edgeLength[e]-norm);
			float angularStretch = 0, angularStretch2 = 0;
			float restAngle = vertexAngle[e];
			if(restAngle!=0.0f)
			{
				float angularRig = 2*rigidity;

				float curAngle = Algo::Surface::Geometry::angle<PFP>(map, d,map.phi2(map.phi_1(d)),position);

				VEC3 v = Algo::Surface::Geometry::vectorOutOfDart<PFP>(map, d, position);
				VEC3 v2 = Algo::Surface::Geometry::vectorOutOfDart<PFP>(map, map.phi2(map.phi_1(d)), position);

				VEC3 v3 = v ^ v2;
				VEC3 vPl = Algo::Surface::Geometry::faceNormal<PFP>(map, d, position);

				if(v3 * vPl < 0.0f)
					curAngle *= -1.0f;

				angularStretch = angularRig*(restAngle-curAngle);
			}


pitiot's avatar
pitiot committed
890
891
			if(norm>0.0f)
			{
pitiot's avatar
merging    
pitiot committed
892
				VEC3 f = (stretch+angularStretch)*(v1/norm);
Thomas Jund's avatar
Thomas Jund committed
893

pitiot's avatar
pitiot committed
894
895
896
897
				//apply force symmetrically
				forces[e] -= f;
				forces[map.phi1(e)] += f;
			}
Thomas Jund's avatar
Thomas Jund committed
898

pitiot's avatar
merging    
pitiot committed
899
900

			p1Next = position[e]+(velocity[e] * sim_->timeStep_); /// ressorts vers le centre de la face
pitiot's avatar
pitiot committed
901
902
903
			p2Next = position[d]+(velocity[d] * sim_->timeStep_);
			// p1Next et p2Next sont la position des extremites de l'arete.
			v1 = (p1Next-p2Next);
Thomas Jund's avatar
Thomas Jund committed
904

pitiot's avatar
pitiot committed
905
906
			//stretch spring : /!\ max rigidity relative to the timestep used (unstable otherwise)
			norm = v1.norm();
pitiot's avatar
merging    
pitiot committed
907
908
909
910
911
912
913
914
915
916
917
918
			restAngle = vertexAngle[d];
			if(restAngle!=0.0f)
			{
				float angularRig = 2*rigidity;

				float curAngle = Algo::Surface::Geometry::angle<PFP>(map, map.phi_1(d),map.phi2(map.phi1(d)),position);

				VEC3 v = Algo::Surface::Geometry::vectorOutOfDart<PFP>(map, map.phi_1(d), position);
				VEC3 v2 = Algo::Surface::Geometry::vectorOutOfDart<PFP>(map, map.phi2(map.phi1(d)), position);

				VEC3 v3 = v ^ v2;
				VEC3 vPl = Algo::Surface::Geometry::faceNormal<PFP>(map, d, position);
Thomas Jund's avatar
Thomas Jund committed
919

pitiot's avatar
merging    
pitiot committed
920
921
				if(v3 * vPl < 0.0f)
					curAngle *= -1.0f;
922

pitiot's avatar
merging    
pitiot committed
923
924
925
926
				angularStretch = angularRig*(restAngle-curAngle);
			}

			stretch = 4*rigidity*(edgeLength[d]-norm);
pitiot's avatar
pitiot committed
927
928
			if(norm>0.0f)
			{
pitiot's avatar
merging    
pitiot committed
929
				VEC3 f = (stretch+angularStretch)*(v1/norm);
930

pitiot's avatar
pitiot committed
931
932
				//apply force symmetrically
				forces[d] -= f;
pitiot's avatar
merging    
pitiot committed
933
				forces[e] += f;
pitiot's avatar
pitiot committed
934
			}
935

pitiot's avatar
merging    
pitiot committed
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
			p1Next = position[d]+(velocity[d] * sim_->timeStep_); // ressorts sur le bord
			p2Next = position[map.phi1(e)]+(velocity[map.phi1(e)] * sim_->timeStep_);
			// p1Next et p2Next sont la position des extremites de l'arete.
			v1 = (p1Next-p2Next);
			norm = v1.norm();
			restAngle = vertexAngle[map.phi_1(d)];
			if(restAngle!=0.0f)
			{
				float angularRig = 2*rigidity;

				float curAngle = Algo::Surface::Geometry::angle<PFP>(map, e,map.phi2(d),position);

				VEC3 v = Algo::Surface::Geometry::vectorOutOfDart<PFP>(map, e, position);
				VEC3 v2 = Algo::Surface::Geometry::vectorOutOfDart<PFP>(map, map.phi2(d), position);

				VEC3 v3 = v ^ v2;
				VEC3 vPl = Algo::Surface::Geometry::faceNormal<PFP>(map, d, position);

				if(v3 * vPl < 0.0f)
					curAngle *= -1.0f;
956

pitiot's avatar
merging    
pitiot committed
957
958
959
960
961
				angularStretch2 = angularRig*(restAngle-curAngle);
			}
			if(norm>0.0f)
			{
				VEC3 f = (angularStretch2)*(v1/norm);
Thomas Jund's avatar
Thomas Jund committed
962

pitiot's avatar
merging    
pitiot committed
963
964
965
966
				//apply force symmetrically
				forces[map.phi1(e)] -= f;
				forces[d] += f;
			}
967

pitiot's avatar
pitiot committed
968
969
970
			d=map.phi<21>(d);
		}
		while(d!=centerDart);
pitiot's avatar
maj    
pitiot committed
971

Arash HABIBI's avatar
03_2013    
Arash HABIBI committed
972
973
			//-------------------------------------------------------------------------
			// ARASH : A présent on calcule les interactions avec les autres obstacles.
pitiot's avatar
pitiot committed
974
975
976
		VEC3 norm;
		double obst_stiffness = 5.0; // agent-obstacle interaction stiffness
		int obst_power = 2  ;           // the power to which elevate the agent-obstacle distance
Arash HABIBI's avatar
03_2013    
Arash HABIBI committed
977

pitiot's avatar
pitiot committed
978
		double obst_radius_infl;
pitiot's avatar
merging    
pitiot committed
979

pitiot's avatar
pitiot committed
980
981
			obst_radius_infl = 10.; // scenario 1 et 3

pitiot's avatar
merging    
pitiot committed
982
		float fixed_obst_factor = 5.0f;
Arash HABIBI's avatar
comment    
Arash HABIBI committed
983

pitiot's avatar
merging    
pitiot committed
984
985
986
		for (unsigned int i = 0; i < nbVertices; ++i)
				{
			PFP::VEC3 normFace = CGoGN::Algo::Surface::Geometry::faceNormal<PFP>(sim_->envMap_.map, parts_[i]->d, sim_->envMap_.position);
pitiot's avatar
pitiot committed
987
				Dart dd = map.phi1(d);
Arash HABIBI's avatar
03_2013    
Arash HABIBI committed
988
989
					VEC3 p = position[dd]+(velocity[dd] * sim_->timeStep_);

Arash HABIBI's avatar
Arash HABIBI committed
990
991
					// Evitement d'obstacles mobiles

Arash HABIBI's avatar
03_2013    
Arash HABIBI committed
992
993
994
995
996
997
					for(std::vector<std::pair<float, Obstacle*> >::iterator it = movingObstacleNeighbors_.begin() ;
						it != movingObstacleNeighbors_.end() ; ++it)
					{
						Obstacle * obst = it->second;
						VEC3 p1=obst->p1 ;
						VEC3 p2=obst->p2 ;
Arash HABIBI's avatar
unidir    
Arash HABIBI committed
998

pitiot's avatar
pitiot committed
999
						forces[dd] += computeForce(p,p1,p2,obst_radius_infl,obst_power,obst_stiffness,normFace);
Arash HABIBI's avatar
Arash HABIBI committed
1000
					}
Arash HABIBI's avatar
unidir    
Arash HABIBI committed
1001

pitiot's avatar
pitiot committed
1002
					//	Evitement d'obstacles fixes
Arash HABIBI's avatar
03_2013    
Arash HABIBI committed
1003

Arash HABIBI's avatar
Arash HABIBI committed
1004
1005
1006
1007
					for(std::vector<std::pair<float, Obstacle*> >::iterator it = obstacleNeighbors_.begin() ;
						it != obstacleNeighbors_.end() ; ++it)
					{
						Obstacle * obst = it->second;
pitiot's avatar
pitiot committed
1008
1009
						VEC3 p1=obst->p2 ;
						VEC3 p2=obst->p1 ;
Arash HABIBI's avatar
Arash HABIBI committed
1010

pitiot's avatar
merging    
pitiot committed
1011
						forces[dd] += computeForce(p,p1,p2,fixed_obst_factor*obst_radius_infl,fixed_obst_factor*obst_power,fixed_obst_factor*obst_stiffness,normFace);
Arash HABIBI's avatar
03_2013    
Arash HABIBI committed
1012
1013
					}

pitiot's avatar
pitiot committed
1014
				d = map.phi<21>(d);
pitiot's avatar
merging    
pitiot committed
1015
			}
pitiot's avatar
pitiot committed
1016
1017


1018
1019

		//guiding vertex = first vertex (set the displacement)
1020
		// forces[groundFace] = VEC3(0);
1021
		velocity[groundFace] = velocity_;
Arash HABIBI's avatar
Arash HABIBI committed
1022

1023
		//apply force to each vertex
1024
		/*
1025
1026
		d = groundFace;
		for (unsigned int i = 0; i < nbVertices; ++i)
pitiot's avatar
pitiot committed
1027
		{
Thomas Jund's avatar
Thomas Jund committed
1028
			velocity[d] += forces[d] * sim_->timeStep_;
1029
1030
1031
1032
			position[d] += (velocity[d] * sim_->timeStep_);
			position[map.phi<211>(d)] += (velocity[d] * sim_->timeStep_);
			bary += position[d];
			map.next(d);
pitiot's avatar
pitiot committed
1033
		}
1034
		*/
1035
	}
pitiot's avatar
pitiot committed
1036
1037
	else
	{
1038
1039
1040
1041
1042
1043
	//	CGoGNout << "Obstacle "<< index << CGoGNendl;
//		CGoGNout << "vitesse : "<< velocity_ << CGoGNendl;
		//	on fait tourner l'obstacle
		Dart d = groundFace;
		for (unsigned int i = 0; i < nbVertices; ++i)
		{
pitiot's avatar
pitiot committed
1044
#ifdef TWO_AND_HALF_DIM
pitiot's avatar
up    
pitiot committed
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054

			//// rotation pour les obstacles rectangulaires
			VEC3 x = parts_[i]->getPosition()-center;
			VEC3 normale = (parts_[(i+1)%nbVertices]->getPosition()-center)^(x);
			normale.normalize();
			VEC3 y = normale ^x;
			y.normalize();
			VEC3 nouvpos = rotate2D(VEC3 (1,0,0),(0,0,0),angle);

			position[d] += nouvpos[0]*x+nouvpos[1]*y;
pitiot's avatar
pitiot committed
1055
1056
1057
#else
			position[d] += rotate2D(position[d], center, abs_angle*rotor);
#endif
1058
1059
			position[d] += (velocity_ * sim_->timeStep_);

1060
#ifdef EXPORTING_BOXES
1061
1062

#ifndef TWO_AND_HALF_DIM
pitiot's avatar
up    
pitiot committed
1063
			position[map.phi<211>(d)] += rotate2D(position[map.phi<211>(d)], center, abs_angle*rotor);
1064
1065
1066
			position[map.phi<211>(d)] += (velocity_ * sim_->timeStep_);
#endif

1067
1068
#endif

1069
1070
1071
//			position[map.phi<211>(d)] += (velocity_ * sim_->timeStep_);

			bary += position[d];
Thomas Jund's avatar
Thomas Jund committed
1072
1073


1074
1075
1076
			map.next(d);
		}

pitiot's avatar
pitiot committed
1077
		front=(position[0] + position[1]) / 2;
1078
1079
1080
1081
		if(angle >0)
			angle -= rotor;
		else
			angle += rotor;
pitiot's avatar
pitiot committed
1082
	}
pitiot's avatar
maj    
pitiot committed
1083

pitiot's avatar
pitiot committed
1084
	center = bary / nbVertices;
pitiot's avatar
maj    
pitiot committed
1085

1086
1087
	//computing deformation vector on vertices :
	//depending on the velocity, extend the perceived shape
1088
	VEC3 vel = velocity_.normalized();
1089
1090
1091

	d = groundFace;
	for (unsigned int i = 0; i < nbVertices; ++i)
1092
	{
1093
		VEC3 v(position[d] - center);
1094
1095
		VEC3 vN = v.normalized();
		float dot = vN * vel;
1096
1097
		deformation[d] = v * 2.0f * (dot+1.0f)/2.0f;
		map.next(d);
1098
1099
	}

Thomas Jund's avatar
Thomas Jund committed
1100
1101
//	if(!rigid_)
//		center = position[groundFace];
1102
1103
1104
}

//-------------------------------------------------------------------------
1105

1106
1107
void MovingObstacle::applyForces()
{
pitiot's avatar
pitiot committed
1108
1109

	Dart centerDart =map.phi<11>(groundFace);
1110
1111
1112

	if(!rigid_)
	{
pitiot's avatar
pitiot committed
1113
		Dart d = centerDart;
1114
1115
		for (unsigned int i = 0; i < nbVertices; ++i)
		{
pitiot's avatar
pitiot committed
1116
1117
1118
1119
1120
			Dart e = map.phi_1(d);
			velocity[e] += forces[e] * sim_->timeStep_;
			position[e] += (velocity[e] * sim_->timeStep_);

			d=map.phi<21>(d);
1121
		}
pitiot's avatar
pitiot committed
1122
1123
1124
		velocity[centerDart] +=forces[centerDart] * sim_->timeStep_;
		position[centerDart] += (velocity[centerDart] * sim_->timeStep_);
	}
1125

pitiot's avatar
pitiot committed
1126
}
1127

pitiot's avatar
pitiot committed
1128
1129
1130
void MovingObstacle::updateRegistration()
{
	PFP::VEC3 bary(0);
1131
	Dart centerDart =map.phi<11>(groundFace);
pitiot's avatar
pitiot committed
1132

1133
1134
1135
1136
	if(!rigid_)
	{
		Dart d = centerDart;
		for (unsigned int i = 0; i < nbVertices; ++i)
pitiot's avatar
pitiot committed
1137
		{
1138
			Dart e = map.phi_1(d);
pitiot's avatar
pitiot committed
1139
1140


1141
			parts_[i]->move(position[e]);
pitiot's avatar
pitiot committed
1142

1143
#ifdef TWO_AND_HALF_DIM
pitiot's avatar
pitiot committed
1144

1145
			position[e] = parts_[i]->getPosition(); //recalage de l'obstacle sur ses particules (qui elles ont bien suivi la carte au sol)
pitiot's avatar
pitiot committed
1146

1147
1148
			PFP::VEC3 normal = CGoGN::Algo::Surface::Geometry::faceNormal<PFP>(sim_->envMap_.map, parts_[i]->d, sim_->envMap_.position);
			normal *= height;
pitiot's avatar
pitiot committed
1149

1150
			position[map.phi_1(map.phi<12>(d))] = position[e]+normal;
pitiot's avatar
pitiot committed
1151

1152
1153
1154
1155
#endif
			bary += position[e];
			d=map.phi<21>(d);
		}
pitiot's avatar
pitiot committed
1156
1157


1158
1159
		center = bary / nbVertices;
		parts_[nbVertices]->move(position[centerDart]);
pitiot's avatar
pitiot committed
1160

1161
1162
1163
#ifdef TWO_AND_HALF_DIM
			position[centerDart] = parts_[nbVertices]->getPosition(); //recalage de l'obstacle sur ses particules (qui elles ont bien suivi la carte au sol)
#endif
pitiot's avatar
pitiot committed
1164

1165
	}
pitiot's avatar
pitiot committed
1166
	else
1167
1168
	{
		for (unsigned int i = 0; i < nbVertices; ++i)
pitiot's avatar
pitiot committed
1169
1170
		{

1171
1172
			VEC3 pos = getDilatedPosition(i);
			parts_[i]->move(pos);
pitiot's avatar
pitiot committed
1173

1174
#ifdef TWO_AND_HALF_DIM
pitiot's avatar
pitiot committed
1175
1176


1177
1178
			Dart d(i);
			position[d] = parts_[i]->getPosition(); //recalage de l'obstacle sur ses particules (qui elles ont bien suivi la carte au sol)
pitiot's avatar
pitiot committed
1179

1180
			PFP::VEC3 normal = CGoGN::Algo::Surface::Geometry::faceNormal<PFP>(sim_->envMap_.map, parts_[i]->d, sim_->envMap_.position);
Thomas Jund's avatar
Thomas Jund committed
1181
				normal *= height;
1182
1183
//					std::cout << " phi11 d : " <<  map.phi<112>(d) <<" || d : "<<d<< std::endl;
			position[map.phi_1(d)] = position[d]+normal;
pitiot's avatar
pitiot committed
1184

1185
#endif
pitiot's avatar
pitiot committed
1186
		}
1187
	}
pitiot's avatar
pitiot committed
1188
	for (unsigned int i = 0; i < nbVertices; ++i)
Thomas Jund's avatar