From 6ca7d8293228e821695a3149e8fb91b0d305daeb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 25 Feb 2012 16:04:03 +0000 Subject: code cleanup: white space, spelling & ';;' end of lines. --- intern/boolop/intern/BOP_BSPNode.cpp | 4 ++-- intern/boolop/intern/BOP_Face2Face.cpp | 30 +++++++++++++-------------- intern/boolop/intern/BOP_Merge2.h | 2 +- intern/boolop/intern/BOP_Mesh.cpp | 14 ++++++------- intern/boolop/intern/BOP_Mesh.h | 2 +- intern/bsp/intern/BSP_MeshPrimitives.h | 2 +- intern/bsp/test/BSP_GhostTest/BSP_TMesh.h | 4 ++-- intern/cycles/device/device_network.h | 6 +++--- intern/cycles/kernel/osl/nodes/node_texture.h | 2 +- intern/cycles/kernel/osl/osl_services.h | 2 +- intern/cycles/kernel/svm/svm_texture.h | 2 +- 11 files changed, 35 insertions(+), 35 deletions(-) (limited to 'intern') diff --git a/intern/boolop/intern/BOP_BSPNode.cpp b/intern/boolop/intern/BOP_BSPNode.cpp index 7d9071b3132..3588e80c28e 100644 --- a/intern/boolop/intern/BOP_BSPNode.cpp +++ b/intern/boolop/intern/BOP_BSPNode.cpp @@ -89,10 +89,10 @@ unsigned int BOP_BSPNode::addFace(const BOP_BSPPoints& pts, else { m_outChild = new BOP_BSPNode(plane); newDeep = 2; - } + } } else { // face lies in both half-spaces: split it BOP_BSPPoints inside, outside; - MT_Point3 lpoint= pts[pts.size()-1]; + MT_Point3 lpoint= pts[pts.size()-1]; BOP_TAG ltag = testPoint(lpoint); BOP_TAG tstate = ltag; diff --git a/intern/boolop/intern/BOP_Face2Face.cpp b/intern/boolop/intern/BOP_Face2Face.cpp index de9fa7b8508..f88a271bfdb 100644 --- a/intern/boolop/intern/BOP_Face2Face.cpp +++ b/intern/boolop/intern/BOP_Face2Face.cpp @@ -538,10 +538,10 @@ void BOP_mergeSort(MT_Point3 *points, unsigned int *face, unsigned int &size, bo for(i=0;igetEdge(face,BOP_Segment::getEdge(s.m_cfg1)); - BOP_triangulateD(mesh, faces, face, s.m_v1, s.m_v2, - BOP_Segment::getEdge(s.m_cfg1)); + BOP_triangulateD(mesh, faces, face, s.m_v1, s.m_v2, + BOP_Segment::getEdge(s.m_cfg1)); BOP_Face *opposite = BOP_getOppositeFace(mesh,faces,face,edge); if (opposite != NULL) { - unsigned int e; - opposite->getEdgeIndex(edge->getVertex1(), edge->getVertex2(),e); - BOP_triangulateD(mesh, faces, opposite, s.m_v1, s.m_v2, e); + unsigned int e; + opposite->getEdgeIndex(edge->getVertex1(), edge->getVertex2(),e); + BOP_triangulateD(mesh, faces, opposite, s.m_v1, s.m_v2, e); } - } + } else { // EDGE(v1) != EDGE(v2) BOP_Edge *edge1 = mesh->getEdge(face,BOP_Segment::getEdge(s.m_cfg1)); BOP_Edge *edge2 = mesh->getEdge(face,BOP_Segment::getEdge(s.m_cfg2)); diff --git a/intern/boolop/intern/BOP_Merge2.h b/intern/boolop/intern/BOP_Merge2.h index 1e26a2576be..71ec0702a0b 100644 --- a/intern/boolop/intern/BOP_Merge2.h +++ b/intern/boolop/intern/BOP_Merge2.h @@ -78,7 +78,7 @@ class BOP_Merge2 { BOP_Index X, BOP_Index I, BOP_Index P, BOP_Index N ); BOP_Face *find4Neighbor(BOP_Face *faceI, BOP_Face *faceJ, BOP_Index X, BOP_Index I, BOP_Index P, BOP_Index N, - BOP_Face **faceL, BOP_Index &O); + BOP_Face **faceL, BOP_Index &O); BOP_Face3 *collapse(BOP_Face4 *faceC, BOP_Index X); void mergeFaces(BOP_Face *A, BOP_Face *B, BOP_Index X, BOP_Index I, BOP_Index N, BOP_Index P, BOP_Faces &newFaces ); diff --git a/intern/boolop/intern/BOP_Mesh.cpp b/intern/boolop/intern/BOP_Mesh.cpp index e35b5437f68..673caa3e921 100644 --- a/intern/boolop/intern/BOP_Mesh.cpp +++ b/intern/boolop/intern/BOP_Mesh.cpp @@ -252,8 +252,8 @@ BOP_Index BOP_Mesh::addFace(BOP_Face3 *face) BOP_Index index2 = face->getVertex(1); BOP_Index index3 = face->getVertex(2); - m_faces.push_back((BOP_Face *)face); - + m_faces.push_back((BOP_Face *)face); + BOP_Index edge; if (!getIndexEdge(index1,index2,edge)) { @@ -261,7 +261,7 @@ BOP_Index BOP_Mesh::addFace(BOP_Face3 *face) getVertex(index1)->addEdge(edge); getVertex(index2)->addEdge(edge); } - + getEdge(edge)->addFace(indexface); if (!getIndexEdge(index2,index3,edge)) { @@ -269,7 +269,7 @@ BOP_Index BOP_Mesh::addFace(BOP_Face3 *face) getVertex(index2)->addEdge(edge); getVertex(index3)->addEdge(edge); } - + getEdge(edge)->addFace(indexface); if (!getIndexEdge(index3,index1,edge)) { @@ -277,13 +277,13 @@ BOP_Index BOP_Mesh::addFace(BOP_Face3 *face) getVertex(index3)->addEdge(edge); getVertex(index1)->addEdge(edge); } - + getEdge(edge)->addFace(indexface); if ((index1 == index2) || (index1 == index3) || (index2 == index3)) face->setTAG(BROKEN); - return indexface; + return indexface; } /** @@ -452,7 +452,7 @@ bool BOP_Mesh::getIndexEdge(BOP_Index v1, BOP_Index v2, BOP_Index &e) #ifdef HASH_PRINTF_DEBUG printf ("found edge (%d %d)\n",v1,v2); #endif - e = edge->index; + e = edge->index; #ifdef BOP_NEW_MERGE if( m_edges[e]->getUsed() == false ) { m_edges[e]->setUsed(true); diff --git a/intern/boolop/intern/BOP_Mesh.h b/intern/boolop/intern/BOP_Mesh.h index 381557ec58b..9c1b4ad04ea 100644 --- a/intern/boolop/intern/BOP_Mesh.h +++ b/intern/boolop/intern/BOP_Mesh.h @@ -100,7 +100,7 @@ public: BOP_Index replaceVertexIndex(BOP_Index oldIndex, BOP_Index newIndex); #ifdef HASH void rehashVertex(BOP_Index oldIndex, BOP_Index newIndex, - BOP_Index otherIndex); + BOP_Index otherIndex); #endif bool isClosedMesh(); diff --git a/intern/bsp/intern/BSP_MeshPrimitives.h b/intern/bsp/intern/BSP_MeshPrimitives.h index 018677327f4..f4d04d8863e 100644 --- a/intern/bsp/intern/BSP_MeshPrimitives.h +++ b/intern/bsp/intern/BSP_MeshPrimitives.h @@ -189,7 +189,7 @@ public : BSP_FaceInd new_f ); - BSP_VertexInd + BSP_VertexInd OpVertex( BSP_VertexInd vi ) const; diff --git a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h index ca4ab106664..793fb47f73b 100644 --- a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h @@ -84,9 +84,9 @@ public : f.m_verts[1] = verts[i-1]; f.m_verts[2] = verts[i]; - m_faces.push_back(f); + m_faces.push_back(f); - BuildNormal(m_faces.back()); + BuildNormal(m_faces.back()); } } diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h index 3cdb70bb4df..591216a77b9 100644 --- a/intern/cycles/device/device_network.h +++ b/intern/cycles/device/device_network.h @@ -109,7 +109,7 @@ typedef struct RPCReceive { : socket(socket_), archive_stream(NULL), archive(NULL) { /* read head with fixed size */ - vector header(8); + vector header(8); size_t len = boost::asio::read(socket, boost::asio::buffer(header)); /* verify if we got something */ @@ -170,7 +170,7 @@ public: : listen_socket(io_service), collect_servers(false) { /* setup listen socket */ - listen_endpoint.address(boost::asio::ip::address_v4::any()); + listen_endpoint.address(boost::asio::ip::address_v4::any()); listen_endpoint.port(DISCOVER_PORT); listen_socket.open(listen_endpoint.protocol()); @@ -178,7 +178,7 @@ public: boost::asio::socket_base::reuse_address option(true); listen_socket.set_option(option); - listen_socket.bind(listen_endpoint); + listen_socket.bind(listen_endpoint); /* setup receive callback */ async_receive(); diff --git a/intern/cycles/kernel/osl/nodes/node_texture.h b/intern/cycles/kernel/osl/nodes/node_texture.h index 8adb0e8aeb5..e0ec8038ee4 100644 --- a/intern/cycles/kernel/osl/nodes/node_texture.h +++ b/intern/cycles/kernel/osl/nodes/node_texture.h @@ -190,7 +190,7 @@ float noise_wave(string wave, float a) float result = 0.0; if(wave == "Sine") { - result = 0.5 + 0.5*sin(a); + result = 0.5 + 0.5*sin(a); } else if(wave == "Saw") { float b = 2*M_PI; diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index e5003074822..85a01e54e5c 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -66,7 +66,7 @@ public: void *renderstate, void *val); bool has_userdata(ustring name, TypeDesc type, void *renderstate); - void *get_pointcloud_attr_query(ustring *attr_names, + void *get_pointcloud_attr_query(ustring *attr_names, TypeDesc *attr_types, int nattrs); int pointcloud(ustring filename, const OSL::Vec3 ¢er, float radius, int max_points, void *attr_query, void **attr_outdata); diff --git a/intern/cycles/kernel/svm/svm_texture.h b/intern/cycles/kernel/svm/svm_texture.h index 82797018d74..448132bff46 100644 --- a/intern/cycles/kernel/svm/svm_texture.h +++ b/intern/cycles/kernel/svm/svm_texture.h @@ -191,7 +191,7 @@ __device float noise_basis_hard(float3 p, NodeNoiseBasis basis, int hard) __device float noise_wave(NodeWaveType wave, float a) { if(wave == NODE_WAVE_SINE) { - return 0.5f + 0.5f*sin(a); + return 0.5f + 0.5f*sin(a); } else if(wave == NODE_WAVE_SAW) { float b = 2.0f*M_PI_F; -- cgit v1.2.3