From patchwork Wed Nov 16 18:19:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 5171 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id EBA6223E0D for ; Wed, 16 Nov 2011 18:19:16 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id D4F27A18459 for ; Wed, 16 Nov 2011 18:19:16 +0000 (UTC) Received: by faaa26 with SMTP id a26so2691982faa.11 for ; Wed, 16 Nov 2011 10:19:16 -0800 (PST) Received: by 10.152.134.116 with SMTP id pj20mr21182459lab.5.1321467556625; Wed, 16 Nov 2011 10:19:16 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs100070lal; Wed, 16 Nov 2011 10:19:15 -0800 (PST) Received: by 10.216.221.21 with SMTP id q21mr980902wep.104.1321467554360; Wed, 16 Nov 2011 10:19:14 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id v6si14914936weq.31.2011.11.16.10.19.14 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Nov 2011 10:19:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RQk4n-0007c1-Q2 for ; Wed, 16 Nov 2011 18:19:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id AEFC2E01E9 for ; Wed, 16 Nov 2011 18:19:13 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 169 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 169: Mesh, Model: Remove trailing whitespace. Message-Id: <20111116181913.17247.40379.launchpad@ackee.canonical.com> Date: Wed, 16 Nov 2011 18:19:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14291"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 171ee50ed106a620bfd705d7c644f51cf6593bf9 ------------------------------------------------------------ revno: 169 committer: Alexandros Frantzis branch nick: trunk timestamp: Wed 2011-11-16 12:07:47 +0200 message: Mesh,Model: Remove trailing whitespace. modified: src/mesh.cpp src/mesh.h src/model.cpp src/model.h --- lp:glmark2 https://code.launchpad.net/~glmark2-dev/glmark2/trunk You are subscribed to branch lp:glmark2. To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription === modified file 'src/mesh.cpp' --- src/mesh.cpp 2011-11-09 10:14:02 +0000 +++ src/mesh.cpp 2011-11-16 10:07:47 +0000 @@ -79,12 +79,12 @@ } -/** +/** * Checks that an attribute is of the correct dimensionality. * * @param pos the position/index of the attribute to check * @param dim the size of the attribute (in #floats) - * + * * @return whether the check succeeded */ bool @@ -104,9 +104,9 @@ } -/** +/** * Ensures that we have a vertex to process. - * + * * @return the vertex to process */ std::vector & @@ -237,7 +237,7 @@ interleave_ = interleave; } -/** +/** * Resets a Mesh object to its initial, empty state. */ void @@ -254,7 +254,7 @@ vertex_stride_ = 0; } -/** +/** * Builds a vertex array containing the mesh vertex data. * * The way the vertex array is constructed is affected by the current @@ -309,7 +309,7 @@ } } -/** +/** * Builds a vertex buffer object containing the mesh vertex data. * * The way the VBO is constructed is affected by the current interleave @@ -505,7 +505,7 @@ } -/** +/** * Deletes all resources associated with built vertex arrays. */ void @@ -518,7 +518,7 @@ vertex_arrays_.clear(); } -/** +/** * Deletes all resources associated with built VBOs. */ void @@ -533,7 +533,7 @@ } -/** +/** * Renders a mesh using vertex arrays. * * The vertex arrays must have been previously initialized using @@ -556,7 +556,7 @@ } } -/** +/** * Renders a mesh using vertex buffer objects. * * The vertex buffer objects must have been previously initialized using @@ -580,9 +580,9 @@ } } -/** +/** * Creates a grid mesh. - * + * * @param n_x the number of grid cells on the X axis * @param n_y the number of grid cells on the Y axis * @param width the width X of the grid (normalized) === modified file 'src/mesh.h' --- src/mesh.h 2011-11-09 10:14:02 +0000 +++ src/mesh.h 2011-11-16 10:07:47 +0000 @@ -29,7 +29,7 @@ #include "vec.h" #include "gl-headers.h" -/** +/** * A mesh of vertices. */ class Mesh === modified file 'src/model.cpp' --- src/model.cpp 2011-11-11 14:38:08 +0000 +++ src/model.cpp 2011-11-16 10:07:47 +0000 @@ -48,9 +48,9 @@ } \ } while(0); -/** +/** * Computes the bounding box for a Model::Object. - * + * * @param object the Model object */ void @@ -94,9 +94,9 @@ minVec_ = vec3(minX, minY, minZ); } -/** +/** * Appends the vertices of a Model::Object to a Mesh. - * + * * @param object the object to append * @param mesh the mesh to append to * @param p_pos the attribute position to use for the 'position' attribute @@ -155,11 +155,11 @@ } } -/** +/** * Converts a model to a mesh using the default attributes bindings. * * The default attributes and their order is: Position, Normal, Texcoord - * + * * @param mesh the mesh to populate */ void @@ -174,7 +174,7 @@ convert_to_mesh(mesh, attribs); } -/** +/** * Converts a model to a mesh using custom attribute bindings. * * The attribute bindings are pairs of . @@ -222,7 +222,7 @@ } } -/** +/** * Calculates the normal vectors of the model vertices. */ void @@ -294,11 +294,11 @@ } } -/** +/** * Load a model from a 3DS file. - * + * * @param filename the name of the file - * + * * @return whether loading succeeded */ bool @@ -471,9 +471,9 @@ return true; } -/** +/** * Parse vec3 values from an OBJ file. - * + * * @param source the source line to parse * @param v the vec3 to populate */ @@ -528,9 +528,9 @@ v.z(z); } -/** +/** * Parse uvec3 values from an OBJ file. - * + * * @param source the source line to parse * @param v the uvec3 to populate */ @@ -585,11 +585,11 @@ v.z(z); } -/** +/** * Load a model from an OBJ file. - * + * * @param filename the name of the file - * + * * @return whether loading succeeded */ bool @@ -671,13 +671,13 @@ ModelMap modelMap; } -/** +/** * Locate all available models. * * This method scans the built-in data paths and build a database of usable * models available to scenes. Map is available on a read-only basis to scenes * that might find it useful for listing models, etc. - * + * * @return a map containing information about the located models */ const ModelMap& @@ -738,14 +738,14 @@ return ModelPrivate::modelMap; } -/** +/** * Load a model by name. * * You must initialize the available model collection using * Model::find_models() before using this method. - * + * * @param modelName the model name - * + * * @return whether the operation succeeded */ bool === modified file 'src/model.h' --- src/model.h 2011-11-11 14:38:08 +0000 +++ src/model.h 2011-11-16 10:07:47 +0000 @@ -39,7 +39,7 @@ MODEL_OBJ }; -/** +/** * A descriptor for a model file. */ class ModelDescriptor @@ -61,7 +61,7 @@ typedef std::map ModelMap; -/** +/** * A model as loaded from a 3D object data file. */ class Model