Revision: 49339
http://brlcad.svn.sourceforge.net/brlcad/?rev=49339&view=rev
Author: brlcad
Date: 2012-02-08 19:17:40 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
eliminate trailing ws
Modified Paths:
--------------
brlcad/trunk/src/libgcv/wfobj/obj_grammar.yy
brlcad/trunk/src/libgcv/wfobj/obj_parser.cpp
brlcad/trunk/src/libgcv/wfobj/obj_parser.h
brlcad/trunk/src/libgcv/wfobj/obj_parser_state.h
brlcad/trunk/src/libgcv/wfobj/obj_rules.h
brlcad/trunk/src/libgcv/wfobj/tri_face.c
Modified: brlcad/trunk/src/libgcv/wfobj/obj_grammar.yy
===================================================================
--- brlcad/trunk/src/libgcv/wfobj/obj_grammar.yy 2012-02-08 19:15:14 UTC
(rev 49338)
+++ brlcad/trunk/src/libgcv/wfobj/obj_grammar.yy 2012-02-08 19:17:40 UTC
(rev 49339)
@@ -51,7 +51,7 @@
#include <stdio.h>
#include <stddef.h>
#include <string.h>
-
+
#include <vector>
#include <set>
#include <string>
@@ -377,7 +377,7 @@
if (obj::index_check(C.reference[0], gindex, num_gvertices,
obj::vertex_ref_err, scanner))
{
- YYERROR;
+ YYERROR;
}
A.index = B.index;
@@ -412,9 +412,9 @@
if (obj::index_check(B.reference[0], gindex, num_gvertices,
obj::vertex_ref_err, scanner))
{
- YYERROR;
+ YYERROR;
}
-
+
A.index = obj::get_contents(scanner).line_v_indexlist.size();
obj::get_contents(scanner).line_v_indexlist.push_back(gindex);
}
@@ -429,7 +429,7 @@
if (obj::index_check(C.integer, gindex, num_gvertices,
obj::vertex_ref_err, scanner))
{
- YYERROR;
+ YYERROR;
}
A.index = B.index;
@@ -497,7 +497,7 @@
{
YYERROR;
}
-
+
A.index = B.index;
obj::get_contents(scanner).line_tv_indexlist.push_back(tv_index);
}
@@ -749,8 +749,8 @@
line ::= LINE l_v_reference_list(A).
{
if (obj::get_contents(scanner).line_v_indexlist.size() - A.index < 2) {
- obj_parser_error(scanner, obj::line_length_err);
- YYERROR;
+ obj_parser_error(scanner, obj::line_length_err);
+ YYERROR;
}
if (obj::get_state(scanner).polyattributes_dirty) {
@@ -910,10 +910,10 @@
YYERROR;
}
- if (obj::get_state(scanner).working_polyattributes.smooth_group !=
+ if (obj::get_state(scanner).working_polyattributes.smooth_group !=
static_cast<unsigned int>(A.integer))
{
- obj::get_state(scanner).working_polyattributes.smooth_group =
+ obj::get_state(scanner).working_polyattributes.smooth_group =
static_cast<unsigned int>(A.integer);
obj::get_state(scanner).polyattributes_dirty = true;
@@ -961,7 +961,7 @@
{
obj::set_working_texmaplib(obj::get_extra(scanner));
}
-
+
shadow_obj ::= SHADOW_OBJ ID.
{
obj::set_working_shadow_obj(obj::get_extra(scanner));
@@ -1002,9 +1002,9 @@
obj_parser_error(scanner, obj::lod_range_err);
YYERROR;
}
-
+
unsigned char tmp = A.integer;
-
+
if (obj::get_state(scanner).working_polyattributes.lod != tmp) {
obj::get_state(scanner).working_polyattributes.lod = tmp;
obj::get_state(scanner).polyattributes_dirty = true;
Modified: brlcad/trunk/src/libgcv/wfobj/obj_parser.cpp
===================================================================
--- brlcad/trunk/src/libgcv/wfobj/obj_parser.cpp 2012-02-08 19:15:14 UTC
(rev 49338)
+++ brlcad/trunk/src/libgcv/wfobj/obj_parser.cpp 2012-02-08 19:17:40 UTC
(rev 49339)
@@ -209,7 +209,7 @@
yyscan_t scanner;
- scanner =
perplexFileScanner(state.parser_state.file_stack.back().file.get());
+ scanner =
perplexFileScanner(state.parser_state.file_stack.back().file.get());
setScannerExtra(scanner, &state);
state.parser = NULL;
Modified: brlcad/trunk/src/libgcv/wfobj/obj_parser.h
===================================================================
--- brlcad/trunk/src/libgcv/wfobj/obj_parser.h 2012-02-08 19:15:14 UTC (rev
49338)
+++ brlcad/trunk/src/libgcv/wfobj/obj_parser.h 2012-02-08 19:17:40 UTC (rev
49339)
@@ -204,7 +204,7 @@
*
* Return:
* 0 - The previous parse attempt succeeded and no warnings generated.
- * !0 - A null terminated string containing information about the last parse
+ * !0 - A null terminated string containing information about the last parse
*/
const char * obj_parse_error(obj_parser_t parser);
@@ -219,7 +219,7 @@
/**
* Obtain a list of all vertices contained in 'contents'.
*
- * Copy a pointer to a multidimensional array of vertices contained in
+ * Copy a pointer to a multidimensional array of vertices contained in
* 'contents' to the location pointed to by val_arr and return its length.
*
* The vertices are contained in an array of type const float[][4] and must
@@ -234,7 +234,7 @@
/**
* Obtain a list of all texture vertices contained in 'contents'.
*
- * Copy a pointer to a multidimensional array of texture vertices contained
in
+ * Copy a pointer to a multidimensional array of texture vertices contained in
* 'contents' to the location pointed to by val_arr and return its length.
*
* The vertices are contained in an array of type const float[][3] and must
@@ -249,7 +249,7 @@
/**
* Obtain a list of all normals contained in 'contents'.
*
- * Copy a pointer to a multidimensional array of normals contained in
+ * Copy a pointer to a multidimensional array of normals contained in
* 'contents' to the location pointed to by val_arr and return its length.
*
* The normals are contained in an array of type const float[][3] and must
@@ -269,7 +269,7 @@
* its length.
*
* Group names are guaranteed to be a unique set.
- *
+ *
* If an element has not been explicitly tagged as being part of a particular
* group, per the wavefront obj spec, the element is placed in the "default"
* group.
@@ -295,7 +295,7 @@
* its length.
*
* Group sets are guaranteed to be a unique set.
- *
+ *
* When an element references a groupset index of 'n', calling obj_groupset
* with the 'n'th set will obtain a unique set of indices that can be used
* to obtain the group name.
@@ -314,7 +314,7 @@
* return its length.
*
* Object names are guaranteed to be a unique set.
- *
+ *
* The wavefront obj spec does not specify the default behavior for elements
* not explicitly being defined as being a part of an object. Therefore,
* for this implementation, if an element has not been explicitly tagged as
@@ -338,7 +338,7 @@
* return its length.
*
* Material names are guaranteed to be a unique set.
- *
+ *
* The wavefront obj spec does not specify the default behavior for elements
* not explicitly being defined as having a material trait. Therefore,
* for this implementation, if an element has not been explicitly tagged as
@@ -361,7 +361,7 @@
* and return its length.
*
* Material library names are guaranteed to be a unique set.
- *
+ *
* The wavefront obj spec does not specify the default behavior for elements
* not explicitly being defined as using a material library. Therefore,
* for this implementation, if an element has not been explicitly tagged as
@@ -394,7 +394,7 @@
* return its length.
*
* Material library sets are guaranteed to be a unique set.
- *
+ *
* When an element references a materiallibset index of 'n', calling
* obj_materiallibset with the 'n'th set will obtain a unique set of indices
* that can be used to obtain the material library name.
@@ -413,7 +413,7 @@
* return its length.
*
* Texture map names are guaranteed to be a unique set.
- *
+ *
* The wavefront obj spec does not specify the default behavior for elements
* not explicitly being defined as having a texture map. Therefore,
* for this implementation, if an element has not been explicitly tagged as
@@ -437,7 +437,7 @@
* and return its length.
*
* Texture map library names are guaranteed to be a unique set.
- *
+ *
* The wavefront obj spec does not specify the default behavior for elements
* not explicitly being defined as using a texture map library. Therefore,
* for this implementation, if an element has not been explicitly tagged as
@@ -470,7 +470,7 @@
* return its length.
*
* Texture map library sets are guaranteed to be a unique set.
- *
+ *
* When an element references a texmaplibset index of 'n', calling
* obj_textmaplibset with the 'n'th set will obtain a unique set of indices
* that can be used to obtain the texture map library name.
@@ -489,7 +489,7 @@
* and return its length.
*
* Shadow object names are guaranteed to be a unique set.
- *
+ *
* The wavefront obj spec does not specify the default behavior for elements
* not explicitly being defined as having a shadow object. Therefore,
* for this implementation, if an element has not been explicitly tagged as
@@ -513,7 +513,7 @@
* and return its length.
*
* Trace object names are guaranteed to be a unique set.
- *
+ *
* The wavefront obj spec does not specify the default behavior for elements
* not explicitly being defined as having a trace object. Therefore,
* for this implementation, if an element has not been explicitly tagged as
@@ -633,12 +633,12 @@
* polygonal line in 'contents'
*
* Copy a pointer to the 'n'th multidimensional index array to the location
- * pointed to by 'index_arr' and return the length of the array.
+ * pointed to by 'index_arr' and return the length of the array.
*
* The line indices are contained in an array of type const size_t[][2] and
* must not be modified by the caller. The format of the second dimension is:
* {vertex_index, texture_coordinate_index}
- *
+ *
* Return value
* The number of vertices that make up the 'n'th polygonal line
*/
@@ -698,12 +698,12 @@
* polygonal face in 'contents'
*
* Copy a pointer to the 'n'th multidimensional index array to the location
- * pointed to by 'index_arr' and return the length of the array.
+ * pointed to by 'index_arr' and return the length of the array.
*
* The face indices are contained in an array of type const size_t[][2] and
* must not be modified by the caller. The format of the second dimension is:
* {vertex_index, texture_coordinate_index}
- *
+ *
* Return value
* The number of vertices that make up the 'n'th polygonal face
*/
@@ -732,12 +732,12 @@
* in 'contents'
*
* Copy a pointer to the 'n'th multidimensional index array to the location
- * pointed to by 'index_arr' and return the length of the array.
+ * pointed to by 'index_arr' and return the length of the array.
*
* The face indices are contained in an array of type const size_t[][2] and
* must not be modified by the caller. The format of the second dimension is:
* {vertex_index, normal_index}
- *
+ *
* Return value
* The number of vertices that make up the 'n'th polygonal face
*/
@@ -766,12 +766,12 @@
* textured and oriented polygonal face in 'contents'
*
* Copy a pointer to the 'n'th multidimensional index array to the location
- * pointed to by 'index_arr' and return the length of the array.
+ * pointed to by 'index_arr' and return the length of the array.
*
* The face indices are contained in an array of type const size_t[][3] and
* must not be modified by the caller. The format of the second dimension is:
* {vertex_index, texture_coordinate_index, normal_index}
- *
+ *
* Return value
* The number of vertices that make up the 'n'th polygonal face
*/
Modified: brlcad/trunk/src/libgcv/wfobj/obj_parser_state.h
===================================================================
--- brlcad/trunk/src/libgcv/wfobj/obj_parser_state.h 2012-02-08 19:15:14 UTC
(rev 49338)
+++ brlcad/trunk/src/libgcv/wfobj/obj_parser_state.h 2012-02-08 19:17:40 UTC
(rev 49339)
@@ -343,7 +343,7 @@
/**
* Composition object for dealing with lex/lacc reentrant interface.
*
- * Lifetime is only until the parse completion of a single file and
+ * Lifetime is only until the parse completion of a single file and
* it's includes.
*/
template<typename PrecisionT,
@@ -437,7 +437,7 @@
extra.parser_state.working_stringset.clear();
- extra.parser_state.working_polyattributes.groupset_index =
+ extra.parser_state.working_polyattributes.groupset_index =
extra.parser_state.current_groupset;
extra.parser_state.polyattributes_dirty = true;
@@ -598,7 +598,7 @@
extra.parser_state.working_stringset.clear();
- extra.parser_state.working_polyattributes.materiallibset_index =
+ extra.parser_state.working_polyattributes.materiallibset_index =
extra.parser_state.current_materiallib;
extra.parser_state.polyattributes_dirty = true;
@@ -718,7 +718,7 @@
extra.parser_state.working_stringset.clear();
- extra.parser_state.working_polyattributes.texmaplibset_index =
+ extra.parser_state.working_polyattributes.texmaplibset_index =
extra.parser_state.current_texmaplib;
extra.parser_state.polyattributes_dirty = true;
Modified: brlcad/trunk/src/libgcv/wfobj/obj_rules.h
===================================================================
--- brlcad/trunk/src/libgcv/wfobj/obj_rules.h 2012-02-08 19:15:14 UTC (rev
49338)
+++ brlcad/trunk/src/libgcv/wfobj/obj_rules.h 2012-02-08 19:17:40 UTC (rev
49339)
@@ -54,7 +54,7 @@
struct extra_t {
void *state;
YYSTYPE tokenData;
-};
+};
void obj_parser_lex_destroy(yyscan_t scanner);
void *obj_parser_get_state(yyscan_t scanner);
Modified: brlcad/trunk/src/libgcv/wfobj/tri_face.c
===================================================================
--- brlcad/trunk/src/libgcv/wfobj/tri_face.c 2012-02-08 19:15:14 UTC (rev
49338)
+++ brlcad/trunk/src/libgcv/wfobj/tri_face.c 2012-02-08 19:17:40 UTC (rev
49339)
@@ -75,7 +75,7 @@
GET_VERTEX(v, model);
v->magic = NMG_VERTEX_MAGIC;
-
+
BU_LIST_INIT(&v->vu_hd);
v->vg_p = make_nmg_vertex_g(model, x, y, z, index);
v->index = index;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
