comparison native/PhantomOmni/HapticManager.cpp @ 8:ea7885bd9bff tip

fixed bug : render solid line as dotted/dashed when moving the stylus from dotted/dashed to solid

 										 HLcache *cache, void *userdata)
 {
 	HapticManager *pThis = static_cast<HapticManager*>(userdata);
 	if(object == pThis->wall1Id||object == pThis->wall2Id) // no event is associated to the wall 
 		return;
+
 	if(pThis->lastMovedElement == object){
 		pThis->stillTouchingLastMovedElement = true;
 	}
 	
 	try{
 		// check if the touched object is an edge
 		if(pThis->collectionsManager->isEdge(object)){
 			CollectionsManager::EdgeData & ed = pThis->collectionsManager->getEdgeDataFromID(object);
 			pThis->lastTouchedEdgeID = object;
 			pThis->lastTouchedEdgeIsUntouched = false;
+
 			pThis->lastTouchedEdgeStipplePattern = ed.stipplePattern;
 			// check if the proxy is still touching the edge's node, in that case only play the sound
 			HLboolean isTouching = HL_FALSE;
 			if(pThis->lastTouchedNodeID != HL_OBJECT_ANY){
 				hlGetShapeBooleanv(pThis->lastTouchedNodeID,HL_PROXY_IS_TOUCHING,&isTouching);

 										   HLcache *cache, void *userdata)
 {
 	HapticManager *pThis = static_cast<HapticManager*>(userdata);
 	if(object == pThis->wall1Id||object == pThis->wall2Id) // no event is associated to the wall 
 		return;
-	
+
 	if(object == pThis->lastMovedElement){
 		pThis->lastMovedElement = HL_OBJECT_ANY;
 		pThis->stillTouchingLastMovedElement = false;
 	}
 	if(pThis->lastHighlightElementID == object){
 		pThis->lastHighlightElementID = HL_OBJECT_ANY;
 		pThis->executeCommand('u',0,0,0,0,0);
 	}
+
 	if(pThis->lastTouchedEdgeID == object){
 		pThis->lastTouchedEdgeIsUntouched = true;
 	}
 }
 

 	/* ---  FORCES --- */
 	/* friction */
 	if(lastTouchedEdgeID != HL_OBJECT_ANY){
 		/* check if the edge is still there, it might not as the tab could be changed */
 		if(collectionsManager->isEdge(lastTouchedEdgeID)){
-			//hlGetShapeBooleanv(lastTouchedEdgeID,HL_PROXY_IS_TOUCHING,&isTouching); FIXME to remove
-			if(frictionDisabled||lastTouchedEdgeIsUntouched/*(isTouching == HL_FALSE)*/){
-					hlEffectd(HL_EFFECT_PROPERTY_MAGNITUDE, 0);
+			if(frictionDisabled||lastTouchedEdgeIsUntouched){
+					hlEffectd(HL_EFFECT_PROPERTY_MAGNITUDE, 0); // none 
 					hlEffectd(HL_EFFECT_PROPERTY_GAIN, 0);
 				}else{
 					if(lastTouchedEdgeStipplePattern == 0xAAAA){ // dotted
 						hlEffectd(HL_EFFECT_PROPERTY_MAGNITUDE, 0.4f);
 						hlEffectd(HL_EFFECT_PROPERTY_GAIN, 1);
 					}else if(lastTouchedEdgeStipplePattern == 0xF0F0){ // dashed
 						hlEffectd(HL_EFFECT_PROPERTY_MAGNITUDE, 0.6);
 						hlEffectd(HL_EFFECT_PROPERTY_GAIN, 0.6);
+					}else{
+						hlEffectd(HL_EFFECT_PROPERTY_MAGNITUDE, 0); // solid
+					    hlEffectd(HL_EFFECT_PROPERTY_GAIN, 0);
 					}
 			}
 		}else{
 			lastTouchedEdgeID = HL_OBJECT_ANY;
 			hlEffectd(HL_EFFECT_PROPERTY_MAGNITUDE, 0);