Paste Code
Paste Blends
Paste Images 
diff -r /home/raul/Escritorio/blenderSVN/source/blender/blenkernel/intern/effect.c /home/raul/Documentos/BlenderSPH/blender/source/blender/blenkernel/intern/effect.c
131a132
> 	pd->f_restlength = 1.0f;
833a835,837
> 	
> 	float restlength= pd->f_restlength;		
> 	float len=0.f;
885c889,893
< 			VecMulf(force, -strength * efd->falloff);
---
> 			VECSUB(force,efd->loc,point->loc);
> 			len=VecLength(force);			
> 			Normalize(force);			
> 			VecMulf(force,-strength*(restlength-len)*efd->falloff);	   		
> 			
887c895
< 			VecMulf(temp, -damp * 2.0f * (float)sqrt(fabs(strength)) * point->vel_to_sec);
---
> 			VecMulf(temp, -damp * fabs(strength) * point->vel_to_sec);
926c934
< 			break;
---
> 			break;	


diff -r /home/raul/Escritorio/blenderSVN/source/blender/editors/space_view3d/drawobject.c /home/raul/Documentos/BlenderSPH/blender/source/blender/editors/space_view3d/drawobject.c
4882a4883,4942
> void drawspring(int mode, float *cent, float size, float tmat[][4])
>  {
>  	float vec[3];		
>  		
>  	glBegin(mode);
>  	
>  	vec[0]= cent[0] + 0.56*size;
>  	vec[1]= cent[1] - 1*size;
>  	vec[2]= cent[2];
>  	glVertex3fv(vec);
>  	
>  	vec[0]= cent[0] - 0.56*size ;
>  	vec[1]= cent[1] - 0.67*size ;
>  	vec[2]= cent[2];
>  	glVertex3fv(vec);
>  		
>  	vec[0]= cent[0] - 0.56*size;
>  	vec[1]= cent[1] - 0.67*size;
>  	vec[2]= cent[2] ;
>  	glVertex3fv(vec);
>  	
>  	vec[0]= cent[0] + 0.56*size;
>  	vec[1]= cent[1] - 0.22*size ;
>  	vec[2]= cent[2];
>  	glVertex3fv(vec);
>  	
>  	vec[0]= cent[0] + 0.56*size ;
>  	vec[1]= cent[1] - 0.22*size ;
>  	vec[2]= cent[2] ;
>  	glVertex3fv(vec);
>  	
>  	vec[0]= cent[0] - 0.56*size ;
>  	vec[1]= cent[1] + 0.11*size ;
>  	vec[2]= cent[2];
>  	glVertex3fv(vec);
>  	
>  	vec[0]= cent[0] - 0.56*size ;
>  	vec[1]= cent[1] + 0.11*size ;
>  	vec[2]= cent[2];
>  	glVertex3fv(vec);
>  	
>  	vec[0]= cent[0] + 0.56*size;
>  	vec[1]= cent[1] + 0.56*size;
>  	vec[2]= cent[2] ;
>  	glVertex3fv(vec);
>  	
>  	vec[0]= cent[0] + 0.56*size ;
>  	vec[1]= cent[1] + 0.56*size ;
>  	vec[2]= cent[2];
>  	glVertex3fv(vec);
>  	
>  	vec[0]= cent[0] - 0.56*size ;
>  	vec[1]= cent[1] + 1*size ;
>  	vec[2]= cent[2] ;
>  	glVertex3fv(vec);
>  	
>  	glEnd();
>  }
>  
> 
4920c4980
< 			force_val = pd->f_strength;
---
> 		force_val = pd->f_strength;
4963,4964c5023,5024
< 			drawspiral(vec, size*1.0, tmat, 1);
< 			drawspiral(vec, size*1.0, tmat, 16);
---
> 			drawspiral(vec, size, tmat, 1);
> 			drawspiral(vec, size, tmat, 16);
4967,4968c5027,5028
< 			drawspiral(vec, size*1.0, tmat, -1);
< 			drawspiral(vec, size*1.0, tmat, -16);
---
> 			drawspiral(vec, size, tmat, -1);
> 			drawspiral(vec, size, tmat, -16);
4970a5031,5037
> 	// Spring force
>  	else if (pd->forcefield == PFIELD_HARMONIC) {
>  	
>  		UI_ThemeColorBlend(curcol, TH_BACK, 0.5);
>  		drawspring(GL_LINE, vec, size, imat);	
>  	}
> 	

diff -r /home/raul/Escritorio/blenderSVN/source/blender/makesdna/DNA_object_force.h /home/raul/Documentos/BlenderSPH/blender/source/blender/makesdna/DNA_object_force.h
54c54
< 	PFIELD_DRAG,		/* Linear & quadratic drag												*/
---
> 	PFIELD_DRAG,		/* Linear & quadratic drag					*/	
74a75
> 	float f_restlength;
91c92
< 	float absorption, pad;	/* used for forces */
---
> 	float absorption;	/* used for forces */

diff -r /home/raul/Escritorio/blenderSVN/source/blender/makesrna/intern/rna_object_force.c /home/raul/Documentos/BlenderSPH/blender/source/blender/makesrna/intern/rna_object_force.c
1079a1087,1093
> 	
> 	prop= RNA_def_property(srna, "rest_length", PROP_FLOAT, PROP_NONE);
> 	RNA_def_property_float_sdna(prop, NULL, "f_restlength");
> 	RNA_def_property_range(prop, 0.0f, 10.0f);
> 	RNA_def_property_ui_text(prop, "Rest Length", "Rest length of the harmonic force");
> 	RNA_def_property_update(prop, 0, "rna_FieldSettings_update");
> 
  1. diff -r /home/raul/Escritorio/blenderSVN/source/blender/blenkernel/intern/effect.c /home/raul/Documentos/BlenderSPH/blender/source/blender/blenkernel/intern/effect.c
  2. 131a132
  3. >       pd->f_restlength = 1.0f;
  4. 833a835,837
  5. >       
  6. >       float restlength= pd->f_restlength;             
  7. >       float len=0.f;
  8. 885c889,893
  9. <                       VecMulf(force, -strength * efd->falloff);
  10. ---
  11. >                       VECSUB(force,efd->loc,point->loc);
  12. >                       len=VecLength(force);                   
  13. >                       Normalize(force);                       
  14. >                       VecMulf(force,-strength*(restlength-len)*efd->falloff);                 
  15. >                       
  16. 887c895
  17. <                       VecMulf(temp, -damp * 2.0f * (float)sqrt(fabs(strength)) * point->vel_to_sec);
  18. ---
  19. >                       VecMulf(temp, -damp * fabs(strength) * point->vel_to_sec);
  20. 926c934
  21. <                       break;
  22. ---
  23. >                       break;  
  24.  
  25.  
  26. diff -r /home/raul/Escritorio/blenderSVN/source/blender/editors/space_view3d/drawobject.c /home/raul/Documentos/BlenderSPH/blender/source/blender/editors/space_view3d/drawobject.c
  27. 4882a4883,4942
  28. > void drawspring(int mode, float *cent, float size, float tmat[][4])
  29. >  {
  30. >       float vec[3];           
  31. >               
  32. >       glBegin(mode);
  33. >       
  34. >       vec[0]= cent[0] + 0.56*size;
  35. >       vec[1]= cent[1] - 1*size;
  36. >       vec[2]= cent[2];
  37. >       glVertex3fv(vec);
  38. >       
  39. >       vec[0]= cent[0] - 0.56*size ;
  40. >       vec[1]= cent[1] - 0.67*size ;
  41. >       vec[2]= cent[2];
  42. >       glVertex3fv(vec);
  43. >               
  44. >       vec[0]= cent[0] - 0.56*size;
  45. >       vec[1]= cent[1] - 0.67*size;
  46. >       vec[2]= cent[2] ;
  47. >       glVertex3fv(vec);
  48. >       
  49. >       vec[0]= cent[0] + 0.56*size;
  50. >       vec[1]= cent[1] - 0.22*size ;
  51. >       vec[2]= cent[2];
  52. >       glVertex3fv(vec);
  53. >       
  54. >       vec[0]= cent[0] + 0.56*size ;
  55. >       vec[1]= cent[1] - 0.22*size ;
  56. >       vec[2]= cent[2] ;
  57. >       glVertex3fv(vec);
  58. >       
  59. >       vec[0]= cent[0] - 0.56*size ;
  60. >       vec[1]= cent[1] + 0.11*size ;
  61. >       vec[2]= cent[2];
  62. >       glVertex3fv(vec);
  63. >       
  64. >       vec[0]= cent[0] - 0.56*size ;
  65. >       vec[1]= cent[1] + 0.11*size ;
  66. >       vec[2]= cent[2];
  67. >       glVertex3fv(vec);
  68. >       
  69. >       vec[0]= cent[0] + 0.56*size;
  70. >       vec[1]= cent[1] + 0.56*size;
  71. >       vec[2]= cent[2] ;
  72. >       glVertex3fv(vec);
  73. >       
  74. >       vec[0]= cent[0] + 0.56*size ;
  75. >       vec[1]= cent[1] + 0.56*size ;
  76. >       vec[2]= cent[2];
  77. >       glVertex3fv(vec);
  78. >       
  79. >       vec[0]= cent[0] - 0.56*size ;
  80. >       vec[1]= cent[1] + 1*size ;
  81. >       vec[2]= cent[2] ;
  82. >       glVertex3fv(vec);
  83. >       
  84. >       glEnd();
  85. >  }
  86. >  
  87. > 
  88. 4920c4980
  89. <                       force_val = pd->f_strength;
  90. ---
  91. >               force_val = pd->f_strength;
  92. 4963,4964c5023,5024
  93. <                       drawspiral(vec, size*1.0, tmat, 1);
  94. <                       drawspiral(vec, size*1.0, tmat, 16);
  95. ---
  96. >                       drawspiral(vec, size, tmat, 1);
  97. >                       drawspiral(vec, size, tmat, 16);
  98. 4967,4968c5027,5028
  99. <                       drawspiral(vec, size*1.0, tmat, -1);
  100. <                       drawspiral(vec, size*1.0, tmat, -16);
  101. ---
  102. >                       drawspiral(vec, size, tmat, -1);
  103. >                       drawspiral(vec, size, tmat, -16);
  104. 4970a5031,5037
  105. >       // Spring force
  106. >       else if (pd->forcefield == PFIELD_HARMONIC) {
  107. >       
  108. >               UI_ThemeColorBlend(curcol, TH_BACK, 0.5);
  109. >               drawspring(GL_LINE, vec, size, imat);   
  110. >       }
  111. >       
  112.  
  113. diff -r /home/raul/Escritorio/blenderSVN/source/blender/makesdna/DNA_object_force.h /home/raul/Documentos/BlenderSPH/blender/source/blender/makesdna/DNA_object_force.h
  114. 54c54
  115. <       PFIELD_DRAG,            /* Linear & quadratic drag                                                                                              */
  116. ---
  117. >       PFIELD_DRAG,            /* Linear & quadratic drag                                      */      
  118. 74a75
  119. >       float f_restlength;
  120. 91c92
  121. <       float absorption, pad;  /* used for forces */
  122. ---
  123. >       float absorption;       /* used for forces */
  124.  
  125. diff -r /home/raul/Escritorio/blenderSVN/source/blender/makesrna/intern/rna_object_force.c /home/raul/Documentos/BlenderSPH/blender/source/blender/makesrna/intern/rna_object_force.c
  126. 1079a1087,1093
  127. >       
  128. >       prop= RNA_def_property(srna, "rest_length", PROP_FLOAT, PROP_NONE);
  129. >       RNA_def_property_float_sdna(prop, NULL, "f_restlength");
  130. >       RNA_def_property_range(prop, 0.0f, 10.0f);
  131. >       RNA_def_property_ui_text(prop, "Rest Length", "Rest length of the harmonic force");
  132. >       RNA_def_property_update(prop, 0, "rna_FieldSettings_update");
  133. > 
  134.  
go to heaven