[Bf-blender-cvs] [ce4d31c] fluid-mantaflow: cleanup function names

[Sebastián Barschkis]

Commit: ce4d31cf3d026ffcfb48f005acdb06bfb85ce4da
Author: Sebastián Barschkis
Date:   Thu Jun 30 00:09:15 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBce4d31cf3d026ffcfb48f005acdb06bfb85ce4da

cleanup function names

===================================================================

M	intern/mantaflow/extern/manta_smoke_API.h
M	intern/mantaflow/intern/SMOKE.h
M	intern/mantaflow/intern/manta_smoke_API.cpp
M	source/blender/blenkernel/intern/smoke.c

===================================================================

diff --git a/intern/mantaflow/extern/manta_smoke_API.h b/intern/mantaflow/extern/manta_smoke_API.h
index c884cdc..d07cc81 100644
--- a/intern/mantaflow/extern/manta_smoke_API.h
+++ b/intern/mantaflow/extern/manta_smoke_API.h
@@ -95,9 +95,9 @@ void liquid_save_mesh(struct SMOKE *liquid, char *filename);
 int liquid_get_num_verts(struct SMOKE *liquid);
 int liquid_get_num_normals(struct SMOKE *liquid);
 int liquid_get_num_triangles(struct SMOKE *liquid);
-float liquid_get_vertice_x_at(struct SMOKE *liquid, int i);
-float liquid_get_vertice_y_at(struct SMOKE *liquid, int i);
-float liquid_get_vertice_z_at(struct SMOKE *liquid, int i);
+float liquid_get_vertex_x_at(struct SMOKE *liquid, int i);
+float liquid_get_vertex_y_at(struct SMOKE *liquid, int i);
+float liquid_get_vertex_z_at(struct SMOKE *liquid, int i);
 float liquid_get_normal_x_at(struct SMOKE *liquid, int i);
 float liquid_get_normal_y_at(struct SMOKE *liquid, int i);
 float liquid_get_normal_z_at(struct SMOKE *liquid, int i);
diff --git a/intern/mantaflow/intern/SMOKE.h b/intern/mantaflow/intern/SMOKE.h
index 5aa4b58..fb647d2 100644
--- a/intern/mantaflow/intern/SMOKE.h
+++ b/intern/mantaflow/intern/SMOKE.h
@@ -121,9 +121,9 @@ public:
 	inline int getNumNormals()   { return mNumNormals; }
 	inline int getNumTriangles() { return mNumTriangles; }
 	
-	inline int getVerticeXAt(int i)  { return mVerticesX[i]; }
-	inline int getVerticeYAt(int i)  { return mVerticesY[i]; }
-	inline int getVerticeZAt(int i)  { return mVerticesZ[i]; }
+	inline float getVertexXAt(int i)  { return mVerticesX[i]; }
+	inline float getVertexYAt(int i)  { return mVerticesY[i]; }
+	inline float getVertexZAt(int i)  { return mVerticesZ[i]; }
 
 	inline int getNormalXAt(int i)   { return mNormalsX[i]; }
 	inline int getNormalYAt(int i)   { return mNormalsY[i]; }
diff --git a/intern/mantaflow/intern/manta_smoke_API.cpp b/intern/mantaflow/intern/manta_smoke_API.cpp
index 45f7c15..8b94842 100644
--- a/intern/mantaflow/intern/manta_smoke_API.cpp
+++ b/intern/mantaflow/intern/manta_smoke_API.cpp
@@ -519,19 +519,19 @@ extern "C" int liquid_get_num_triangles(SMOKE *liquid)
 	return liquid->getNumTriangles();
 }
 
-extern "C" float liquid_get_vertice_x_at(SMOKE *liquid, int i)
+extern "C" float liquid_get_vertex_x_at(SMOKE *liquid, int i)
 {
-	return liquid->getVerticeXAt(i);
+	return liquid->getVertexXAt(i);
 }
 
-extern "C" float liquid_get_vertice_y_at(SMOKE *liquid, int i)
+extern "C" float liquid_get_vertex_y_at(SMOKE *liquid, int i)
 {
-	return liquid->getVerticeYAt(i);
+	return liquid->getVertexYAt(i);
 }
 
-extern "C" float liquid_get_vertice_z_at(SMOKE *liquid, int i)
+extern "C" float liquid_get_vertex_z_at(SMOKE *liquid, int i)
 {
-	return liquid->getVerticeZAt(i);
+	return liquid->getVertexZAt(i);
 }
 
 extern "C" float liquid_get_normal_x_at(SMOKE *liquid, int i)
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index bc25542..d371bc2 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2869,16 +2869,15 @@ static DerivedMesh *createLiquidMesh(SmokeDomainSettings *sds, DerivedMesh *orgd
 	// Vertices
 	for (i = 0; i < num_verts; i++, mverts++)
 	{
-	
-		mverts->co[0] = liquid_get_vertice_x_at(sds->fluid, i);
-		mverts->co[1] = liquid_get_vertice_y_at(sds->fluid, i);
-		mverts->co[2] = liquid_get_vertice_z_at(sds->fluid, i);
+		mverts->co[0] = liquid_get_vertex_x_at(sds->fluid, i);
+		mverts->co[1] = liquid_get_vertex_y_at(sds->fluid, i);
+		mverts->co[2] = liquid_get_vertex_z_at(sds->fluid, i);
 		
 //		printf("mverts->co[0]: %f, mverts->co[1]: %f, mverts->co[2]: %f\n", mverts->co[0], mverts->co[1], mverts->co[2]);
 	}
 	
 	// Normals
-	normals = MEM_callocN(sizeof(short) * num_normals * 3, "fluid_tmp_normals");
+	normals = MEM_callocN(sizeof(short) * num_normals * 3, "liquid_tmp_normals");
 	
 	for (i = num_normals, no_s = normals; i > 0; i--, no_s += 3)
 	{
@@ -2912,7 +2911,6 @@ static DerivedMesh *createLiquidMesh(SmokeDomainSettings *sds, DerivedMesh *orgd
 	CDDM_apply_vert_normals(dm, (short (*)[3])normals);
 	
 	MEM_freeN(normals);
-	printf("returning derived mesh\n");
 
 	return dm;
 }