Menu
▾
▴
openvrml-commit — Changes to OpenVRML's source revision repository
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(128) |
Dec
(65) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(132) |
Mar
(95) |
Apr
(47) |
May
(54) |
Jun
(2) |
Jul
(57) |
Aug
(109) |
Sep
(131) |
Oct
(186) |
Nov
(105) |
Dec
(78) |
| 2007 |
Jan
(125) |
Feb
(105) |
Mar
(52) |
Apr
(104) |
May
(63) |
Jun
(116) |
Jul
(76) |
Aug
|
Sep
(18) |
Oct
(93) |
Nov
(110) |
Dec
(169) |
| 2008 |
Jan
(90) |
Feb
(64) |
Mar
(41) |
Apr
(23) |
May
(6) |
Jun
(18) |
Jul
(10) |
Aug
(61) |
Sep
(139) |
Oct
(50) |
Nov
(55) |
Dec
(2) |
| 2009 |
Jan
|
Feb
(1) |
Mar
(62) |
Apr
(22) |
May
(17) |
Jun
(19) |
Jul
(40) |
Aug
(21) |
Sep
|
Oct
(40) |
Nov
(23) |
Dec
|
| 2010 |
Jan
(14) |
Feb
(40) |
Mar
(9) |
Apr
(11) |
May
(19) |
Jun
(4) |
Jul
(10) |
Aug
(22) |
Sep
(15) |
Oct
|
Nov
(2) |
Dec
|
| 2011 |
Jan
(13) |
Feb
(10) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(33) |
May
(20) |
Jun
|
Jul
(8) |
Aug
(7) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Braden M. <br...@us...> - 2006-02-26 18:00:32
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5407 Modified Files: ChangeLog Log Message: Override identifyTerminalSymbol in X3DVrmlScanner to identify ':'. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1163 retrieving revision 1.1164 diff -C2 -d -r1.1163 -r1.1164 *** ChangeLog 26 Feb 2006 17:48:17 -0000 1.1163 --- ChangeLog 26 Feb 2006 18:00:29 -0000 1.1164 *************** *** 1,4 **** --- 1,15 ---- 2006-02-26 Braden McDaniel <br...@en...> + Override identifyTerminalSymbol in X3DVrmlScanner to identify ':'. + From Andrew Grieve <sg...@us...> + + * src/libopenvrml/openvrml/Vrml97Parser.g + (Vrml97Scanner): Made identifyTerminalSymbol virtual and + protected. + * src/libopenvrml/openvrml/X3DVrmlParser.g + (X3DVrmlParser): Override identifyTerminalSymbol to identify ':'. + + 2006-02-26 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/X3DVrmlParser.g (X3DVrmlScanner::identifyKeyword(antlr::Token &)): Treat |
|
From: Braden M. <br...@us...> - 2006-02-26 17:48:21
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31562 Modified Files: ChangeLog Log Message: Treat "inputOnly" the same as "eventIn", "outputOnly" the same as "eventOut", "inputOutput" the same as "exposedField", and "initializeOnly" the same as "field". From Andrew Grieve <sg...@us...> Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1162 retrieving revision 1.1163 diff -C2 -d -r1.1162 -r1.1163 *** ChangeLog 26 Feb 2006 09:57:34 -0000 1.1162 --- ChangeLog 26 Feb 2006 17:48:17 -0000 1.1163 *************** *** 1,4 **** --- 1,13 ---- 2006-02-26 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/X3DVrmlParser.g + (X3DVrmlScanner::identifyKeyword(antlr::Token &)): Treat + "inputOnly" the same as "eventIn", "outputOnly" the same as + "eventOut", "inputOutput" the same as "exposedField", and + "initializeOnly" the same as "field". + From Andrew Grieve <sg...@us...> + + 2006-02-26 Braden McDaniel <br...@en...> + Use atof, atol, strtol to convert numeric values in the parser. These are sufficient (given the validation done implicitly in the |
|
From: Braden M. <br...@us...> - 2006-02-26 17:48:21
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31562/src/libopenvrml/openvrml Modified Files: X3DVrmlParser.g Log Message: Treat "inputOnly" the same as "eventIn", "outputOnly" the same as "eventOut", "inputOutput" the same as "exposedField", and "initializeOnly" the same as "field". From Andrew Grieve <sg...@us...> Index: X3DVrmlParser.g =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/X3DVrmlParser.g,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** X3DVrmlParser.g 26 Feb 2006 08:32:31 -0000 1.11 --- X3DVrmlParser.g 26 Feb 2006 17:48:17 -0000 1.12 *************** *** 122,135 **** } else if (token_text == "inputOnly") { this->expectFieldType(); ! token.setType(KEYWORD_INPUTONLY); } else if (token_text == "outputOnly") { this->expectFieldType(); ! token.setType(KEYWORD_OUTPUTONLY); } else if (token_text == "inputOutput") { this->expectFieldType(); ! token.setType(KEYWORD_INPUTOUTPUT); } else if (token_text == "initializeOnly") { this->expectFieldType(); ! token.setType(KEYWORD_INITIALIZEONLY); } else { return false; --- 122,135 ---- } else if (token_text == "inputOnly") { this->expectFieldType(); ! token.setType(KEYWORD_EVENTIN); } else if (token_text == "outputOnly") { this->expectFieldType(); ! token.setType(KEYWORD_EVENTOUT); } else if (token_text == "inputOutput") { this->expectFieldType(); ! token.setType(KEYWORD_EXPOSEDFIELD); } else if (token_text == "initializeOnly") { this->expectFieldType(); ! token.setType(KEYWORD_FIELD); } else { return false; |
|
From: Braden M. <br...@us...> - 2006-02-26 09:57:40
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29927/src/libopenvrml/openvrml Modified Files: Vrml97Parser.g Log Message: Use atof, atol, strtol to convert numeric values in the parser. These are sufficient (given the validation done implicitly in the scanner) and faster than using stringstreams. From Andrew Grieve <sg...@us...> Index: Vrml97Parser.g =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Vrml97Parser.g 26 Feb 2006 08:32:31 -0000 1.47 --- Vrml97Parser.g 26 Feb 2006 09:57:35 -0000 1.48 *************** *** 1851,1856 **** floatValue returns [float val] options { defaultErrorHandler=false; } ! : f0:REAL { std::istringstream(f0->getText()) >> val; } ! | f1:INTEGER { std::istringstream(f1->getText()) >> val; } ; --- 1851,1856 ---- floatValue returns [float val] options { defaultErrorHandler=false; } ! : f0:REAL { val = float(atof(f0->getText().c_str())); } ! | f1:INTEGER { val = float(atol(f1->getText().c_str())); } ; *************** *** 1915,1925 **** intValue returns [int32 val] options { defaultErrorHandler=false; } ! : i0:INTEGER { ! std::istringstream(i0->getText()) >> val; } | i1:HEX_INTEGER { ! unsigned long unsigned_val; ! std::istringstream(i1->getText()) >> std::hex >> unsigned_val; ! val = int32(unsigned_val); } ; --- 1915,1923 ---- intValue returns [int32 val] options { defaultErrorHandler=false; } ! : i0:INTEGER { ! val = atol(i0->getText().c_str()); } | i1:HEX_INTEGER { ! val = int32(strtoul(i1->getText().c_str() + 2, 0, 16)); } ; *************** *** 2157,2162 **** doubleValue returns [double val = 0.0] options { defaultErrorHandler=false; } ! : d0:REAL { std::istringstream(d0->getText()) >> val; } ! | d1:INTEGER { std::istringstream(d1->getText()) >> val; } ; --- 2155,2160 ---- doubleValue returns [double val = 0.0] options { defaultErrorHandler=false; } ! : d0:REAL { val = atof(d0->getText().c_str()); } ! | d1:INTEGER { val = double(atol(d1->getText().c_str())); } ; |
|
From: Braden M. <br...@us...> - 2006-02-26 09:57:40
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29927 Modified Files: ChangeLog Log Message: Use atof, atol, strtol to convert numeric values in the parser. These are sufficient (given the validation done implicitly in the scanner) and faster than using stringstreams. From Andrew Grieve <sg...@us...> Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1161 retrieving revision 1.1162 diff -C2 -d -r1.1161 -r1.1162 *** ChangeLog 26 Feb 2006 08:32:31 -0000 1.1161 --- ChangeLog 26 Feb 2006 09:57:34 -0000 1.1162 *************** *** 1,4 **** --- 1,16 ---- 2006-02-26 Braden McDaniel <br...@en...> + Use atof, atol, strtol to convert numeric values in the parser. + These are sufficient (given the validation done implicitly in the + scanner) and faster than using stringstreams. + From Andrew Grieve <sg...@us...> + + * src/libopenvrml/openvrml/Vrml97Parser.g + (floatValue): Use atof and atol instead of std::istringstream. + (intValue): Use atol and strtoul instead of std::istringstream. + (doubleValue): Use atof and atol instead of std::istringstream. + + 2006-02-26 Braden McDaniel <br...@en...> + Modified token identification functions to return a bool value indicating success or failure. |
|
From: Braden M. <br...@us...> - 2006-02-26 08:32:34
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21121/src/libopenvrml/openvrml Modified Files: Vrml97Parser.g X3DVrmlParser.g Log Message: Modified token identification functions to return a bool value indicating success or failure. From Andrew Grieve <sg...@us...> Index: X3DVrmlParser.g =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/X3DVrmlParser.g,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** X3DVrmlParser.g 25 Feb 2006 19:36:15 -0000 1.10 --- X3DVrmlParser.g 26 Feb 2006 08:32:31 -0000 1.11 *************** *** 55,62 **** protected: ! virtual void identifyFieldType(antlr::Token &); ! ! private: ! virtual void identifyKeyword(antlr::Token &); }; } --- 55,60 ---- protected: ! virtual bool identifyKeyword(antlr::Token &); ! virtual bool identifyFieldType(antlr::Token &); }; } *************** *** 105,112 **** {} ! inline void X3DVrmlScanner::identifyKeyword(antlr::Token & token) { ! this->Vrml97Scanner::identifyKeyword(token); ! if (token.getType() == antlr::Token::INVALID_TYPE) { const std::string token_text(token.getText()); if (token_text == "AS") { --- 103,110 ---- {} ! inline bool X3DVrmlScanner::identifyKeyword(antlr::Token & token) { ! if (!this->Vrml97Scanner::identifyKeyword(token)) { ! assert(token.getType() == antlr::Token::INVALID_TYPE); const std::string token_text(token.getText()); if (token_text == "AS") { *************** *** 134,146 **** this->expectFieldType(); token.setType(KEYWORD_INITIALIZEONLY); } } } ! inline void X3DVrmlScanner::identifyFieldType(antlr::Token & token) { ! this->Vrml97Scanner::identifyFieldType(token); ! ! if (token.getType() == antlr::Token::INVALID_TYPE) { const std::string token_text(token.getText()); if (token_text == "SFColorRGBA") { --- 132,146 ---- this->expectFieldType(); token.setType(KEYWORD_INITIALIZEONLY); + } else { + return false; } } + return true; } ! inline bool X3DVrmlScanner::identifyFieldType(antlr::Token & token) { ! if (!this->Vrml97Scanner::identifyFieldType(token)) { ! assert(token.getType() == antlr::Token::INVALID_TYPE); const std::string token_text(token.getText()); if (token_text == "SFColorRGBA") { *************** *** 164,169 **** --- 164,172 ---- } else if (token_text == "MFVec3d") { token.setType(FIELDTYPE_MFVEC3D); + } else { + return false; } } + return true; } Index: Vrml97Parser.g =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Vrml97Parser.g 12 Feb 2006 04:20:51 -0000 1.46 --- Vrml97Parser.g 26 Feb 2006 08:32:31 -0000 1.47 *************** *** 92,101 **** protected: void expectFieldType(); ! virtual void identifyKeyword(antlr::Token &); ! virtual void identifyFieldType(antlr::Token &); private: void getNextChar(); ! void identifyTerminalSymbol(antlr::Token &); std::istream & in_; --- 92,101 ---- protected: void expectFieldType(); ! virtual bool identifyKeyword(antlr::Token &); ! virtual bool identifyFieldType(antlr::Token &); private: void getNextChar(); ! bool identifyTerminalSymbol(antlr::Token &); std::istream & in_; *************** *** 460,464 **** } ! inline void Vrml97Scanner::identifyKeyword(antlr::Token & token) { std::string const token_text(token.getText()); --- 460,464 ---- } ! inline bool Vrml97Scanner::identifyKeyword(antlr::Token & token) { std::string const token_text(token.getText()); *************** *** 481,487 **** else if (token_text == "TRUE") { token.setType(KEYWORD_TRUE); } else if (token_text == "USE") { token.setType(KEYWORD_USE); } } ! inline void Vrml97Scanner::identifyFieldType(antlr::Token & token) { assert(this->expecting_field_type_); --- 481,489 ---- else if (token_text == "TRUE") { token.setType(KEYWORD_TRUE); } else if (token_text == "USE") { token.setType(KEYWORD_USE); } + else { return false; } + return true; } ! inline bool Vrml97Scanner::identifyFieldType(antlr::Token & token) { assert(this->expecting_field_type_); *************** *** 507,513 **** else if (token_text == "MFVec2f") { token.setType(FIELDTYPE_MFVEC2F); } else if (token_text == "MFVec3f") { token.setType(FIELDTYPE_MFVEC3F); } } ! inline void Vrml97Scanner::identifyTerminalSymbol(antlr::Token & token) { std::string const token_text(token.getText()); --- 509,517 ---- else if (token_text == "MFVec2f") { token.setType(FIELDTYPE_MFVEC2F); } else if (token_text == "MFVec3f") { token.setType(FIELDTYPE_MFVEC3F); } + else { return false; } + return true; } ! inline bool Vrml97Scanner::identifyTerminalSymbol(antlr::Token & token) { std::string const token_text(token.getText()); *************** *** 516,519 **** --- 520,525 ---- else if (token_text == "{") { token.setType(LBRACE); } else if (token_text == "}") { token.setType(RBRACE); } + else { return false; } + return true; } |
|
From: Braden M. <br...@us...> - 2006-02-26 08:32:34
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21121 Modified Files: ChangeLog Log Message: Modified token identification functions to return a bool value indicating success or failure. From Andrew Grieve <sg...@us...> Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1160 retrieving revision 1.1161 diff -C2 -d -r1.1160 -r1.1161 *** ChangeLog 25 Feb 2006 21:02:05 -0000 1.1160 --- ChangeLog 26 Feb 2006 08:32:31 -0000 1.1161 *************** *** 1,2 **** --- 1,21 ---- + 2006-02-26 Braden McDaniel <br...@en...> + + Modified token identification functions to return a bool value + indicating success or failure. + From Andrew Grieve <sg...@us...> + + * src/libopenvrml/openvrml/Vrml97Parser.g + (Vrml97Scanner::identifyKeyword(antlr::Token &)): Return a bool + value indicating success or failure. + (Vrml97Scanner::identifyFieldType(antlr::Token &)): Return a bool + value indicating success or failure. + (Vrml97Scanner::identifyTerminalSymbol(antlr::Token &)): Return a + bool value indicating success or failure. + * src/libopenvrml/openvrml/X3DVrmlParser.g + (X3DVrmlScanner::identifyKeyword(antlr::Token &)): Return a bool + value indicating success or failure. + (X3DVrmlScanner::identifyFieldType(antlr::Token &)): Return a bool + value indicating success or failure. + 2006-02-25 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-02-25 21:02:08
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3630/src/libopenvrml/openvrml Modified Files: browser.h Log Message: Removed erroneously committed function declaration. Index: browser.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** browser.h 25 Feb 2006 19:36:15 -0000 1.45 --- browser.h 25 Feb 2006 21:02:05 -0000 1.46 *************** *** 380,385 **** virtual void scene_loaded(); }; - - OPENVRML_API const scope * root_scope(const scene & s) OPENVRML_NOTHROW; } --- 380,383 ---- |
|
From: Braden M. <br...@us...> - 2006-02-25 21:02:08
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3630 Modified Files: ChangeLog Log Message: Removed erroneously committed function declaration. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1159 retrieving revision 1.1160 diff -C2 -d -r1.1159 -r1.1160 *** ChangeLog 25 Feb 2006 20:30:32 -0000 1.1159 --- ChangeLog 25 Feb 2006 21:02:05 -0000 1.1160 *************** *** 1,4 **** --- 1,9 ---- 2006-02-25 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.h: Removed erroneously + committed function declaration. + + 2006-02-25 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp: Updated doc-comment for openvrml::browser::create_vrml_from_stream. |
|
From: Braden M. <br...@us...> - 2006-02-25 20:30:43
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22056 Modified Files: ChangeLog Log Message: Updated doc-comment for openvrml::browser::create_vrml_from_stream. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1158 retrieving revision 1.1159 diff -C2 -d -r1.1158 -r1.1159 *** ChangeLog 25 Feb 2006 19:36:14 -0000 1.1158 --- ChangeLog 25 Feb 2006 20:30:32 -0000 1.1159 *************** *** 1,4 **** --- 1,9 ---- 2006-02-25 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp: Updated doc-comment for + openvrml::browser::create_vrml_from_stream. + + 2006-02-25 Braden McDaniel <br...@en...> + Removed openvrml::profile_id enumeration. (Identification of X3D profiles will be done another way.) |
|
From: Braden M. <br...@us...> - 2006-02-25 20:30:39
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22056/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Updated doc-comment for openvrml::browser::create_vrml_from_stream. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** browser.cpp 25 Feb 2006 19:36:15 -0000 1.133 --- browser.cpp 25 Feb 2006 20:30:33 -0000 1.134 *************** *** 8127,8137 **** * * @param[in,out] in an input stream. * * @return the root nodes generated from @p in. * ! * @exception invalid_profile if the root scene does not have a valid ! * profile. ! * @exception invalid_vrml if @p in has invalid VRML syntax. ! * @exception std::bad_alloc if memory allocation fails. */ const std::vector<boost::intrusive_ptr<openvrml::node> > --- 8127,8138 ---- * * @param[in,out] in an input stream. + * @param[in] type MIME content type of @p in. * * @return the root nodes generated from @p in. * ! * @exception invalid_vrml if @p in has invalid VRML syntax. ! * @exception std::invalid_argument if @p type refers to an unsupported content ! * type. ! * @exception std::bad_alloc if memory allocation fails. */ const std::vector<boost::intrusive_ptr<openvrml::node> > |
|
From: Braden M. <br...@us...> - 2006-02-25 19:36:23
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27965 Modified Files: ChangeLog Log Message: Removed openvrml::profile_id enumeration. (Identification of X3D profiles will be done another way.) Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1157 retrieving revision 1.1158 diff -C2 -d -r1.1157 -r1.1158 *** ChangeLog 25 Feb 2006 08:37:27 -0000 1.1157 --- ChangeLog 25 Feb 2006 19:36:14 -0000 1.1158 *************** *** 1,4 **** --- 1,37 ---- 2006-02-25 Braden McDaniel <br...@en...> + Removed openvrml::profile_id enumeration. (Identification of X3D + profiles will be done another way.) + + * src/libopenvrml/openvrml/X3DVrmlParser.g + (vrmlScene): Removed code that set the scene profile. + (profileStatement): Removed placeholder code to pick an + openvrml::profile_id. + * src/libopenvrml/openvrml/browser.cpp + (openvrml::invalid_profile::invalid_profile()): Removed. + (openvrml::invalid_profile::~invalid_profile()): Removed. + (openvrml::browser::browser(profile_id, std::ostream &, + std::ostream &): Removed. + (openvrml::browser::create_vrml_from_stream(std::istream &, const + std::string &)): Added string parameter to specify the MIME + content type; defaults to "model/vrml". + (openvrml::scene::scene(openvrml::browser &, profile_id, scene*)): + Removed. + (openvrml::scene::profile() const): Removed. + (openvrml::scene::load(resource_istream &)): Removed code setting + openvrml::scene::profile_. + * src/libopenvrml/openvrml/browser.h + (openvrml::profile_id): Removed. + (openvrml::invalid_profile): Removed. + (openvrml::browser): Removed constructor taking an + openvrml::profile_id; added string parameter to + create_vrml_from_stream to specify the MIME content type; defaults + to "model/vrml". + (openvrml::scene): Removed friend declaration for X3DVrmlParser; + removed profile_ member; removed constructor taking an + openvrml::profile_id; removed profile accessor. + + 2006-02-25 Braden McDaniel <br...@en...> + Doc-comment improvements; added direction (in, out) to param directives. |
|
From: Braden M. <br...@us...> - 2006-02-25 19:36:19
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27965/src/libopenvrml/openvrml Modified Files: X3DVrmlParser.g browser.cpp browser.h Log Message: Removed openvrml::profile_id enumeration. (Identification of X3D profiles will be done another way.) Index: X3DVrmlParser.g =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/X3DVrmlParser.g,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** X3DVrmlParser.g 8 Dec 2005 06:50:12 -0000 1.9 --- X3DVrmlParser.g 25 Feb 2006 19:36:15 -0000 1.10 *************** *** 199,208 **** options { defaultErrorHandler=false; } { - profile_id profile = invalid_profile_id; std::auto_ptr<openvrml::scope> root_scope_auto_ptr = create_root_scope(scene.browser(), this->uri); const boost::shared_ptr<openvrml::scope> root_scope(root_scope_auto_ptr); } ! : profile=profileStatement { scene.profile_ = profile; } (componentStatement)* (metaStatement)* (statement[scene, nodes, root_scope])* --- 199,207 ---- options { defaultErrorHandler=false; } { std::auto_ptr<openvrml::scope> root_scope_auto_ptr = create_root_scope(scene.browser(), this->uri); const boost::shared_ptr<openvrml::scope> root_scope(root_scope_auto_ptr); } ! : profileStatement (componentStatement)* (metaStatement)* (statement[scene, nodes, root_scope])* *************** *** 210,228 **** profileStatement ! returns [openvrml::profile_id profile = invalid_profile_id] ! : KEYWORD_PROFILE id:ID { ! std::string profile_id = id->getText(); ! // XXX ! // XXX Checks for supported profiles should go here. ! // XXX ! if (false) { ! } else { ! throw antlr::SemanticException("unsupported profile \"" ! + id->getText() + "\"", ! this->uri, ! id->getLine(), ! id->getColumn()); ! } ! } ; --- 209,213 ---- profileStatement ! : KEYWORD_PROFILE id:ID ; Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** browser.cpp 25 Feb 2006 08:37:27 -0000 1.132 --- browser.cpp 25 Feb 2006 19:36:15 -0000 1.133 *************** *** 6830,6853 **** /** - * @class openvrml::invalid_profile - * - * @brief Thrown to indicate that a <code>scene</code> has an invalid profile. - */ - - /** - * @brief Construct. - */ - openvrml::invalid_profile::invalid_profile() OPENVRML_NOTHROW: - std::logic_error("invalid profile") - {} - - /** - * @brief Destroy. - */ - openvrml::invalid_profile::~invalid_profile() throw () - {} - - - /** * @class openvrml::node_class_id * --- 6830,6833 ---- *************** *** 7451,7491 **** null_node_type_(new null_node_type(*null_node_class_)), script_node_class_(*this), ! scene_(new scene(*this, invalid_profile_id)), ! default_viewpoint_(new default_viewpoint(*null_node_type_)), ! active_viewpoint_(node_cast<viewpoint_node *>(default_viewpoint_.get())), ! default_navigation_info_(new default_navigation_info(*null_node_type_)), ! active_navigation_info_( ! node_cast<navigation_info_node *>(default_navigation_info_.get())), ! new_view(false), ! delta_time(DEFAULT_DELTA), ! viewer_(0), ! modified_(false), ! frame_rate_(0.0), ! out(out), ! err(err), ! flags_need_updating(false) ! { ! assert(this->active_viewpoint_); ! assert(this->active_navigation_info_); ! register_node_classes(*this); ! } ! ! /** ! * @brief Constructor. ! * ! * @param[in] profile the profile of the root scene. ! * @param[in] out output stream for console output. ! * @param[in] err output stream for error console output. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! openvrml::browser::browser(profile_id profile, ! std::ostream & out, ! std::ostream & err) ! OPENVRML_THROW1(std::bad_alloc): ! null_node_class_(new null_node_class(*this)), ! null_node_type_(new null_node_type(*null_node_class_)), ! script_node_class_(*this), ! scene_(new scene(*this, profile)), default_viewpoint_(new default_viewpoint(*null_node_type_)), active_viewpoint_(node_cast<viewpoint_node *>(default_viewpoint_.get())), --- 7431,7435 ---- null_node_type_(new null_node_type(*null_node_class_)), script_node_class_(*this), ! scene_(new scene(*this)), default_viewpoint_(new default_viewpoint(*null_node_type_)), active_viewpoint_(node_cast<viewpoint_node *>(default_viewpoint_.get())), *************** *** 8192,8196 **** */ const std::vector<boost::intrusive_ptr<openvrml::node> > ! openvrml::browser::create_vrml_from_stream(std::istream & in) { using std::string; --- 8136,8141 ---- */ const std::vector<boost::intrusive_ptr<openvrml::node> > ! openvrml::browser::create_vrml_from_stream(std::istream & in, ! const std::string & type) { using std::string; *************** *** 8208,8234 **** std::vector<boost::intrusive_ptr<node> > nodes; try { assert(this->scene_); ! switch (this->scene_->profile()) { ! case vrml97_profile_id: ! { Vrml97Scanner scanner(in); Vrml97Parser parser(scanner, stream_id); parser.vrmlScene(*this->scene_, nodes); ! } ! break; ! case x3d_core_profile_id: ! case x3d_interchange_profile_id: ! case x3d_interactive_profile_id: ! case x3d_mpeg4_interactive_profile_id: ! case x3d_immersive_profile_id: ! case x3d_full_profile_id: ! { X3DVrmlScanner scanner(in); X3DVrmlParser parser(scanner, stream_id); parser.vrmlScene(*this->scene_, nodes); ! } ! break; ! case invalid_profile_id: ! throw invalid_profile(); } } catch (antlr::RecognitionException & ex) { --- 8153,8172 ---- std::vector<boost::intrusive_ptr<node> > nodes; try { + using boost::algorithm::iequals; + assert(this->scene_); ! ! if (iequals(type, "model/vrml") ! || iequals(type, "x-world/x-vrml")) { Vrml97Scanner scanner(in); Vrml97Parser parser(scanner, stream_id); parser.vrmlScene(*this->scene_, nodes); ! } else if (iequals(type, "model/x3d+vrml")) { X3DVrmlScanner scanner(in); X3DVrmlParser parser(scanner, stream_id); parser.vrmlScene(*this->scene_, nodes); ! } else { ! throw std::invalid_argument("unrecognized content type \"" ! + type + "\""); } } catch (antlr::RecognitionException & ex) { *************** *** 8817,8828 **** * @internal * - * @var openvrml::profile_id openvrml::scene::profile_ - * - * @brief The profile to which the scene conforms. - */ - - /** - * @internal - * * @var boost::recursive_mutex openvrml::scene::nodes_mutex_ * --- 8755,8758 ---- *************** *** 8949,8973 **** OPENVRML_NOTHROW: browser_(&browser), ! parent_(parent), ! profile_(invalid_profile_id) ! {} ! ! /** ! * @brief Construct. ! * ! * If @p profile is <code>openvrml::invalid_profile_id</code>, the profile of ! * the scene will be set according to the resource loaded by ! * <code>scene::load</code>. ! * ! * @param[in] browser the browser associated with the scene. ! * @param[in] profile the profile for the scene. ! * @param[in] parent the parent scene. ! */ ! openvrml::scene::scene(openvrml::browser & browser, ! const profile_id profile, ! scene * parent) OPENVRML_NOTHROW: ! browser_(&browser), ! parent_(parent), ! profile_(profile) {} --- 8879,8883 ---- OPENVRML_NOTHROW: browser_(&browser), ! parent_(parent) {} *************** *** 8999,9018 **** } - /** - * @brief Get the profile for the <code>scene</code>. - * - * The profile can be set when constructing the <code>scene</code>. It is - * overridden by calls to <code>scene::load</code> with the profile of the - * loaded resource. If the <code>scene</code> is not constructed with a - * profile and no resource has been loaded, this function returns - * <code>invalid_profile_id</code>. - * - * @return the profile for the scene. - */ - openvrml::profile_id openvrml::scene::profile() const OPENVRML_NOTHROW - { - return this->profile_; - } - struct OPENVRML_LOCAL openvrml::scene::load_scene { --- 8909,8912 ---- *************** *** 9023,9027 **** {} ! void operator()() const OPENVRML_NOTHROW try { using std::endl; using std::string; --- 8917,8922 ---- {} ! void operator()() const OPENVRML_NOTHROW ! try { using std::endl; using std::string; *************** *** 9105,9114 **** if (iequals(in.type(), "model/vrml") || iequals(in.type(), "x-world/x-vrml")) { - this->profile_ = vrml97_profile_id; Vrml97Scanner scanner(in); Vrml97Parser parser(scanner, this->url_); parser.vrmlScene(*this, this->nodes_); } else if (iequals(in.type(), "model/x3d+vrml")) { - this->profile_ = x3d_full_profile_id; X3DVrmlScanner scanner(in); X3DVrmlParser parser(scanner, this->url_); --- 9000,9007 ---- Index: browser.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** browser.h 20 Feb 2006 03:39:46 -0000 1.44 --- browser.h 25 Feb 2006 19:36:15 -0000 1.45 *************** *** 160,182 **** - enum profile_id { - invalid_profile_id, - vrml97_profile_id, - x3d_core_profile_id, - x3d_interchange_profile_id, - x3d_interactive_profile_id, - x3d_mpeg4_interactive_profile_id, - x3d_immersive_profile_id, - x3d_full_profile_id - }; - - - class OPENVRML_API invalid_profile : public std::logic_error { - public: - invalid_profile() OPENVRML_NOTHROW; - virtual ~invalid_profile() throw (); - }; - - class OPENVRML_API node_class_id { std::string id_; --- 160,163 ---- *************** *** 270,275 **** browser(std::ostream & out, std::ostream & err) OPENVRML_THROW1(std::bad_alloc); - browser(profile_id profile, std::ostream & out, std::ostream & err) - OPENVRML_THROW1(std::bad_alloc); virtual ~browser() OPENVRML_NOTHROW; --- 251,254 ---- *************** *** 313,317 **** virtual void description(const std::string & description); const std::vector<boost::intrusive_ptr<node> > ! create_vrml_from_stream(std::istream & in); void create_vrml_from_url(const std::vector<std::string> & url, const boost::intrusive_ptr<node> & node, --- 292,297 ---- virtual void description(const std::string & description); const std::vector<boost::intrusive_ptr<node> > ! create_vrml_from_stream(std::istream & in, ! const std::string & type = "model/vrml"); void create_vrml_from_url(const std::vector<std::string> & url, const boost::intrusive_ptr<node> & node, *************** *** 360,365 **** class OPENVRML_API scene : boost::noncopyable { - friend class X3DVrmlParser; - struct load_scene; --- 340,343 ---- *************** *** 367,372 **** scene * const parent_; - profile_id profile_; - mutable boost::recursive_mutex nodes_mutex_; std::vector<boost::intrusive_ptr<node> > nodes_; --- 345,348 ---- *************** *** 376,389 **** public: ! explicit scene(openvrml::browser & browser, ! profile_id profile = invalid_profile_id, ! scene * parent = 0) OPENVRML_NOTHROW; - scene(openvrml::browser & browser, scene * parent) OPENVRML_NOTHROW; virtual ~scene() OPENVRML_NOTHROW; openvrml::browser & browser() const OPENVRML_NOTHROW; scene * parent() const OPENVRML_NOTHROW; - profile_id profile() const OPENVRML_NOTHROW; void load(const std::vector<std::string> & url) OPENVRML_THROW2(boost::thread_resource_error, std::bad_alloc); --- 352,361 ---- public: ! explicit scene(openvrml::browser & browser, scene * parent = 0) OPENVRML_NOTHROW; virtual ~scene() OPENVRML_NOTHROW; openvrml::browser & browser() const OPENVRML_NOTHROW; scene * parent() const OPENVRML_NOTHROW; void load(const std::vector<std::string> & url) OPENVRML_THROW2(boost::thread_resource_error, std::bad_alloc); |
|
From: Braden M. <br...@us...> - 2006-02-25 08:37:32
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20660/src/libopenvrml-gl/openvrml/gl Modified Files: viewer.cpp Log Message: Doc-comment improvements; added direction (in, out) to param directives. Index: viewer.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** viewer.cpp 12 Feb 2006 09:40:17 -0000 1.42 --- viewer.cpp 25 Feb 2006 08:37:28 -0000 1.43 *************** *** 1023,1028 **** * retain hint is ignored. * ! * @param id not used. ! * @param retain not used. * * @return 0. --- 1023,1028 ---- * retain hint is ignored. * ! * @param[in] id not used. ! * @param[in] retain not used. * * @return 0. *************** *** 1143,1156 **** * @brief Insert a background into a display list. * ! * @param groundAngle ground angles. ! * @param groundColor ground colors. ! * @param skyAngle sky angles. ! * @param skyColor sky colors. ! * @param front front texture. ! * @param back back texture. ! * @param left left texture. ! * @param right right texture. ! * @param top top texture. ! * @param bottom bottom texture. * * @return display object identifier. --- 1143,1156 ---- * @brief Insert a background into a display list. * ! * @param[in] groundAngle ground angles. ! * @param[in] groundColor ground colors. ! * @param[in] skyAngle sky angles. ! * @param[in] skyColor sky colors. ! * @param[in] front front texture. ! * @param[in] back back texture. ! * @param[in] left left texture. ! * @param[in] right right texture. ! * @param[in] top top texture. ! * @param[in] bottom bottom texture. * * @return display object identifier. *************** *** 1423,1427 **** * @brief Insert a box into a display list. * ! * @param size box dimensions. * * @return display object identifier. --- 1423,1427 ---- * @brief Insert a box into a display list. * ! * @param[in] size box dimensions. * * @return display object identifier. *************** *** 1502,1508 **** * @brief Build a cylinder object. * ! * @param height the height for the cylinder. ! * @param radius the radius for the cylinder. ! * @param numFacets the number of facets for the sides of the cylinder. * @retval c the coordinates. * @retval tc the texture coordinates. --- 1502,1508 ---- * @brief Build a cylinder object. * ! * @param[in] height the height for the cylinder. ! * @param[in] radius the radius for the cylinder. ! * @param[in] numFacets the number of facets for the sides of the cylinder. * @retval c the coordinates. * @retval tc the texture coordinates. *************** *** 1562,1569 **** * @brief Insert a cone into a display list. * ! * @param height height. ! * @param radius radius at base. ! * @param bottom show the bottom. ! * @param side show the side. * * @return display object identifier. --- 1562,1569 ---- * @brief Insert a cone into a display list. * ! * @param[in] height height. ! * @param[in] radius radius at base. ! * @param[in] bottom show the bottom. ! * @param[in] side show the side. * * @return display object identifier. *************** *** 1646,1654 **** * @brief Insert a cylinder into a display list. * ! * @param height height. ! * @param radius radius. ! * @param bottom show the bottom. ! * @param side show the side. ! * @param top show the top. * * @return display object identifier. --- 1646,1654 ---- * @brief Insert a cylinder into a display list. * ! * @param[in] height height. ! * @param[in] radius radius. ! * @param[in] bottom show the bottom. ! * @param[in] side show the side. ! * @param[in] top show the top. * * @return display object identifier. *************** *** 1789,1801 **** * @brief Insert an elevation grid into a display list. * ! * @param mask ! * @param height height field. ! * @param xDimension vertices in the x direction. ! * @param zDimension vertices in the z direction. ! * @param xSpacing distance between vertices in the x direction. ! * @param zSpacing distance between vertices in the z direction. ! * @param color colors. ! * @param normal normals. ! * @param texCoord texture coordinates. */ viewer::object_t --- 1789,1801 ---- * @brief Insert an elevation grid into a display list. * ! * @param[in] mask ! * @param[in] height height field. ! * @param[in] xDimension vertices in the x direction. ! * @param[in] zDimension vertices in the z direction. ! * @param[in] xSpacing distance between vertices in the x direction. ! * @param[in] zSpacing distance between vertices in the z direction. ! * @param[in] color colors. ! * @param[in] normal normals. ! * @param[in] texCoord texture coordinates. */ viewer::object_t *************** *** 2126,2133 **** * @brief Build an extrusion. * ! * @param orientation ! * @param scale ! * @param crossSection ! * @param spine * @retval c * @retval tc --- 2126,2133 ---- * @brief Build an extrusion. * ! * @param[in] orientation ! * @param[in] scale ! * @param[in] crossSection ! * @param[in] spine * @retval c * @retval tc *************** *** 2311,2318 **** * @brief Build an extrusion. * ! * @param orientation ! * @param scale ! * @param crossSection ! * @param spine * @retval c * @retval tc --- 2311,2318 ---- * @brief Build an extrusion. * ! * @param[in] orientation ! * @param[in] scale ! * @param[in] crossSection ! * @param[in] spine * @retval c * @retval tc *************** *** 2352,2360 **** * @brief Insert an extrusion into a display list. * ! * @param mask ! * @param spine spine points. ! * @param crossSection cross-sections. ! * @param orientation cross-section orientations. ! * @param scale cross-section scales. * * @return display object identifier. --- 2352,2360 ---- * @brief Insert an extrusion into a display list. * ! * @param[in] mask ! * @param[in] spine spine points. ! * @param[in] crossSection cross-sections. ! * @param[in] orientation cross-section orientations. ! * @param[in] scale cross-section scales. * * @return display object identifier. *************** *** 2426,2434 **** * @brief Insert a line set into a display list. * ! * @param coord coordinates. ! * @param coordIndex coordinate indices. ! * @param colorPerVertex whether colors are applied per-vertex or per-face. ! * @param color colors. ! * @param colorIndex color indices. * * @return display object identifier. --- 2426,2434 ---- * @brief Insert a line set into a display list. * ! * @param[in] coord coordinates. ! * @param[in] coordIndex coordinate indices. ! * @param[in] colorPerVertex whether colors are applied per-vertex or per-face. ! * @param[in] color colors. ! * @param[in] colorIndex color indices. * * @return display object identifier. *************** *** 2507,2512 **** * @brief Insert a point set into a display list. * ! * @param coord points. ! * @param color colors. * * @return display object identifier. --- 2507,2512 ---- * @brief Insert a point set into a display list. * ! * @param[in] coord points. ! * @param[in] color colors. * * @return display object identifier. *************** *** 2778,2790 **** * @brief Insert a shell into a display list. * ! * @param mask ! * @param coord coordinates. ! * @param coord_index coordinate indices. ! * @param color colors. ! * @param color_index color indices. ! * @param normal normals. ! * @param normal_index normal indices. ! * @param tex_coord texture coordinates. ! * @param tex_coord_index texture coordinate indices. * * @return display object identifier. --- 2778,2790 ---- * @brief Insert a shell into a display list. * ! * @param[in] mask ! * @param[in] coord coordinates. ! * @param[in] coord_index coordinate indices. ! * @param[in] color colors. ! * @param[in] color_index color indices. ! * @param[in] normal normals. ! * @param[in] normal_index normal indices. ! * @param[in] tex_coord texture coordinates. ! * @param[in] tex_coord_index texture coordinate indices. * * @return display object identifier. *************** *** 2983,2987 **** * @brief Insert a sphere into a display list. * ! * @param radius sphere radius. * * @return display object identifier. --- 2983,2987 ---- * @brief Insert a sphere into a display list. * ! * @param[in] radius sphere radius. * * @return display object identifier. *************** *** 3042,3049 **** * @brief Insert a directional light into a display list. * ! * @param ambientIntensity ambient intensity. ! * @param intensity intensity. ! * @param color color. ! * @param direction direction. * * @return display object identifier. --- 3042,3049 ---- * @brief Insert a directional light into a display list. * ! * @param[in] ambientIntensity ambient intensity. ! * @param[in] intensity intensity. ! * @param[in] color color. ! * @param[in] direction direction. * * @return display object identifier. *************** *** 3094,3103 **** * @brief Insert a point light into a display list. * ! * @param ambientIntensity ambient intensity. ! * @param attenuation attenuation. ! * @param color color. ! * @param intensity intensity. ! * @param location location. ! * @param radius radius. * * @return display object identifier. --- 3094,3103 ---- * @brief Insert a point light into a display list. * ! * @param[in] ambientIntensity ambient intensity. ! * @param[in] attenuation attenuation. ! * @param[in] color color. ! * @param[in] intensity intensity. ! * @param[in] location location. ! * @param[in] radius radius. * * @return display object identifier. *************** *** 3158,3170 **** * @brief Insert a point light into a display list. * ! * @param ambientIntensity ambient intensity. ! * @param attenuation attenuation. ! * @param beamWidth beam width. ! * @param color color. ! * @param cutOffAngle cut-off angle. ! * @param direction direction. ! * @param intensity intensity. ! * @param location location. ! * @param radius radius. * * @return 0. --- 3158,3170 ---- * @brief Insert a point light into a display list. * ! * @param[in] ambientIntensity ambient intensity. ! * @param[in] attenuation attenuation. ! * @param[in] beamWidth beam width. ! * @param[in] color color. ! * @param[in] cutOffAngle cut-off angle. ! * @param[in] direction direction. ! * @param[in] intensity intensity. ! * @param[in] location location. ! * @param[in] radius radius. * * @return 0. *************** *** 3239,3243 **** * @brief Remove an object from the display list. * ! * @param ref object handle. */ void viewer::remove_object(const object_t ref) --- 3239,3243 ---- * @brief Remove an object from the display list. * ! * @param[in] ref object handle. */ void viewer::remove_object(const object_t ref) *************** *** 3249,3253 **** * @brief Enable/disable lighting. * ! * @param val whether lighting should be enabled. */ void viewer::enable_lighting(const bool val) --- 3249,3253 ---- * @brief Enable/disable lighting. * ! * @param[in] val whether lighting should be enabled. */ void viewer::enable_lighting(const bool val) *************** *** 3265,3270 **** * @brief Set the color. * ! * @param rgb red, green, and blue components. ! * @param a alpha (transparency) component. */ void viewer::set_color(const color & rgb, const float a) --- 3265,3270 ---- * @brief Set the color. * ! * @param[in] rgb red, green, and blue components. ! * @param[in] a alpha (transparency) component. */ void viewer::set_color(const color & rgb, const float a) *************** *** 3278,3285 **** * @brief Set the fog. * ! * @param color fog color. ! * @param visibilityRange the distance at which objects are fully obscured by * fog. ! * @param type fog type. */ void viewer::set_fog(const color & color, --- 3278,3285 ---- * @brief Set the fog. * ! * @param[in] color fog color. ! * @param[in] visibilityRange the distance at which objects are fully obscured by * fog. ! * @param[in] type fog type. */ void viewer::set_fog(const color & color, *************** *** 3303,3312 **** * @brief Set the material. * ! * @param ambientIntensity ambient intensity. ! * @param diffuseColor diffuse color. ! * @param emissiveColor emissive color. ! * @param shininess shininess. ! * @param specularColor specular color. ! * @param transparency transparency. */ void viewer::set_material(const float ambientIntensity, --- 3303,3312 ---- * @brief Set the material. * ! * @param[in] ambientIntensity ambient intensity. ! * @param[in] diffuseColor diffuse color. ! * @param[in] emissiveColor emissive color. ! * @param[in] shininess shininess. ! * @param[in] specularColor specular color. ! * @param[in] transparency transparency. */ void viewer::set_material(const float ambientIntensity, *************** *** 3361,3366 **** * or geometry node is USE'd with a different context. * ! * @param tex_components texture components. ! * @param geometry_color geometry color. */ void viewer::set_material_mode(const size_t tex_components, --- 3361,3366 ---- * or geometry node is USE'd with a different context. * ! * @param[in] tex_components texture components. ! * @param[in] geometry_color geometry color. */ void viewer::set_material_mode(const size_t tex_components, *************** *** 3392,3396 **** * @brief Indicate that a node should be sensitive to the pointing device. * ! * @param object a node. */ void viewer::set_sensitive(node * object) --- 3392,3396 ---- * @brief Indicate that a node should be sensitive to the pointing device. * ! * @param[in] object a node. */ void viewer::set_sensitive(node * object) *************** *** 3423,3430 **** * @brief Create a texture object. * ! * @param img image. ! * @param repeat_s repeat in the S direction. ! * @param repeat_t repeat in the T direction. ! * @param retainHint whether the texture is likely to be reused. * * @return a handle to the inserted texture. --- 3423,3430 ---- * @brief Create a texture object. * ! * @param[in] img image. ! * @param[in] repeat_s repeat in the S direction. ! * @param[in] repeat_t repeat in the T direction. ! * @param[in] retainHint whether the texture is likely to be reused. * * @return a handle to the inserted texture. *************** *** 3537,3542 **** * @brief Insert a texture into the display list from an existing handle. * ! * @param ref texture handle. ! * @param components number of components. */ void viewer::insert_texture_reference(const texture_object_t ref, --- 3537,3542 ---- * @brief Insert a texture into the display list from an existing handle. * ! * @param[in] ref texture handle. ! * @param[in] components number of components. */ void viewer::insert_texture_reference(const texture_object_t ref, *************** *** 3556,3560 **** * @brief Remove a texture from the display list. * ! * @param ref texture handle. */ void viewer::remove_texture_object(const texture_object_t ref) --- 3556,3560 ---- * @brief Remove a texture from the display list. * ! * @param[in] ref texture handle. */ void viewer::remove_texture_object(const texture_object_t ref) *************** *** 3572,3579 **** * Tc' = -C x S x R x C x T x Tc * ! * @param center center. ! * @param rotation rotation. ! * @param scale scale. ! * @param translation translation. */ void viewer::set_texture_transform(const vec2f & center, --- 3572,3579 ---- * Tc' = -C x S x R x C x T x Tc * ! * @param[in] center center. ! * @param[in] rotation rotation. ! * @param[in] scale scale. ! * @param[in] translation translation. */ void viewer::set_texture_transform(const vec2f & center, *************** *** 3636,3644 **** * @brief Set the viewpoint. * ! * @param position position. ! * @param orientation orientation. ! * @param fieldOfView field of view. ! * @param avatarSize avatar size. ! * @param visibilityLimit visiblity limit. */ void viewer::set_viewpoint(const vec3f & position, --- 3636,3644 ---- * @brief Set the viewpoint. * ! * @param[in] position position. ! * @param[in] orientation orientation. ! * @param[in] fieldOfView field of view. ! * @param[in] avatarSize avatar size. ! * @param[in] visibilityLimit visiblity limit. */ void viewer::set_viewpoint(const vec3f & position, *************** *** 3680,3685 **** * @brief Transform @p points by the current modelview matrix. * ! * @param nPoints number of points. ! * @param point pointer to the first point in an array. */ void viewer::transform_points(const size_t nPoints, vec3f * point) const --- 3680,3685 ---- * @brief Transform @p points by the current modelview matrix. * ! * @param[in] nPoints number of points. ! * @param[in] point pointer to the first point in an array. */ void viewer::transform_points(const size_t nPoints, vec3f * point) const *************** *** 3694,3698 **** * @brief Multiply the current modelview matrix by @p mat. * ! * @param mat a matrix. */ void viewer::transform(const mat4f & mat) --- 3694,3698 ---- * @brief Multiply the current modelview matrix by @p mat. * ! * @param[in] mat a matrix. */ void viewer::transform(const mat4f & mat) *************** *** 3706,3710 **** * update is called from a timer callback and from checkSensitive. * ! * @param time current time. */ void viewer::update(const double time) --- 3706,3710 ---- * update is called from a timer callback and from checkSensitive. * ! * @param[in] time current time. */ void viewer::update(const double time) *************** *** 3771,3776 **** * @brief Resize the viewport. * ! * @param width new width. ! * @param height new height. */ void viewer::resize(size_t width, size_t height) --- 3771,3776 ---- * @brief Resize the viewport. * ! * @param[in] width new width. ! * @param[in] height new height. */ void viewer::resize(size_t width, size_t height) *************** *** 3786,3790 **** * @brief Handle an event generated from user input. * ! * @param e event data. */ void viewer::input(event_info * e) --- 3786,3790 ---- * @brief Handle an event generated from user input. * ! * @param[in] e event data. */ void viewer::input(event_info * e) *************** *** 3810,3814 **** * @brief Rotate the user view. * ! * @param rot rotation. */ void viewer::rotate(const openvrml::rotation & rot) OPENVRML_NOTHROW --- 3810,3814 ---- * @brief Rotate the user view. * ! * @param[in] rot rotation. */ void viewer::rotate(const openvrml::rotation & rot) OPENVRML_NOTHROW *************** *** 3849,3855 **** * @brief Translate the user view. * ! * @param x translation vector x component. ! * @param y translation vector y component. ! * @param z translation vector z component. */ void viewer::step(const float x, const float y, const float z) --- 3849,3855 ---- * @brief Translate the user view. * ! * @param[in] x translation vector x component. ! * @param[in] y translation vector y component. ! * @param[in] z translation vector z component. */ void viewer::step(const float x, const float y, const float z) *************** *** 3867,3871 **** * @brief Zoom. * ! * @param z amount to zoom. */ void viewer::zoom(const float z) --- 3867,3871 ---- * @brief Zoom. * ! * @param[in] z amount to zoom. */ void viewer::zoom(const float z) *************** *** 3923,3927 **** * @brief Handle keypresses. * ! * @param key key identifier. */ void viewer::handleKey(int key) --- 3923,3927 ---- * @brief Handle keypresses. * ! * @param[in] key key identifier. */ void viewer::handleKey(int key) *************** *** 4085,4089 **** * @brief Handle mouse button up/down. * ! * @param e event data. */ void viewer::handleButton(event_info * e) --- 4085,4089 ---- * @brief Handle mouse button up/down. * ! * @param[in] e event data. */ void viewer::handleButton(event_info * e) *************** *** 4131,4136 **** * @brief Handle mouse dragging. * ! * @param x pointer x-coordinate. ! * @param y pointer y-coordinate. */ void viewer::handleMouseDrag(int x, int y) --- 4131,4136 ---- * @brief Handle mouse dragging. * ! * @param[in] x pointer x-coordinate. ! * @param[in] y pointer y-coordinate. */ void viewer::handleMouseDrag(int x, int y) *************** *** 4375,4380 **** * handle axis_aligned_bounding_boxes as well. * ! * @param bs a bounding sphere; if max, will not be drawn ! * @param intersection one of the bvolume intersection test constants, or 4 * to draw in unique way. (useful for debugging) */ --- 4375,4380 ---- * handle axis_aligned_bounding_boxes as well. * ! * @param[in] bs a bounding sphere; if max, will not be drawn ! * @param[in] intersection one of the bvolume intersection test constants, or 4 * to draw in unique way. (useful for debugging) */ *************** *** 4456,4460 **** * @brief Called to set the cursor style. * ! * @param c cursor style identifier. */ --- 4456,4460 ---- * @brief Called to set the cursor style. * ! * @param[in] c cursor style identifier. */ *************** *** 4471,4475 **** * @brief Set a delay. * ! * @param interval milliseconds to delay. */ --- 4471,4475 ---- * @brief Set a delay. * ! * @param[in] interval milliseconds to delay. */ |
|
From: Braden M. <br...@us...> - 2006-02-25 08:37:31
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20660/src/libopenvrml/openvrml Modified Files: ScriptJDK.cpp basetypes.cpp bounding_volume.cpp browser.cpp event.cpp exposedfield.cpp field_value.cpp frustum.cpp node.cpp node_impl_util.cpp node_impl_util.h scope.cpp script.cpp viewer.cpp vrml97node.cpp Log Message: Doc-comment improvements; added direction (in, out) to param directives. Index: node_impl_util.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node_impl_util.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** node_impl_util.cpp 21 Feb 2006 06:09:16 -0000 1.11 --- node_impl_util.cpp 25 Feb 2006 08:37:27 -0000 1.12 *************** *** 96,100 **** * @brief Construct. * ! * @param ptr_to_mem pointer-to-member. */ --- 96,100 ---- * @brief Construct. * ! * @param[in] ptr_to_mem pointer-to-member. */ *************** *** 136,141 **** * @brief Construct. * ! * @param node_class the <code>node_class</code>. ! * @param id the <code>node_type</code> identifier. */ openvrml::node_impl_util::abstract_node_type:: --- 136,141 ---- * @brief Construct. * ! * @param[in] node_class the <code>node_class</code>. ! * @param[in] id the <code>node_type</code> identifier. */ openvrml::node_impl_util::abstract_node_type:: *************** *** 157,163 **** * @brief @p node's field_value corresponding to @p id. * ! * @param node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::field_value</code>. ! * @param id field identifier. * * @return @p node's <code>openvrml::field_value</code> corresponding to --- 157,163 ---- * @brief @p node's field_value corresponding to @p id. * ! * @param[in] node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::field_value</code>. ! * @param[in] id field identifier. * * @return @p node's <code>openvrml::field_value</code> corresponding to *************** *** 174,180 **** * the eventIn identifier @p id. * ! * @param node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_listener</code>. ! * @param id eventIn identifier. * * @return @p node's <code>openvrml::event_listener</code> corresponding to --- 174,180 ---- * the eventIn identifier @p id. * ! * @param[in] node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_listener</code>. ! * @param[in] id eventIn identifier. * * @return @p node's <code>openvrml::event_listener</code> corresponding to *************** *** 191,197 **** * the eventOut identifier @p id. * ! * @param node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_emitter</code>. ! * @param id eventOut identifier. * * @return @p node's <code>openvrml::event_emitter</code> corresponding to --- 191,197 ---- * the eventOut identifier @p id. * ! * @param[in] node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_emitter</code>. ! * @param[in] id eventOut identifier. * * @return @p node's <code>openvrml::event_emitter</code> corresponding to *************** *** 338,342 **** * @brief Construct. * ! * @param listener the <code>event_listener</code>. */ --- 338,342 ---- * @brief Construct. * ! * @param[in] listener the <code>event_listener</code>. */ *************** *** 354,359 **** * @brief Construct. * ! * @param n the <code>node</code> associated with the ! * <code>event_listener</code>. */ --- 354,359 ---- * @brief Construct. * ! * @param[in] n the <code>node</code> associated with the ! * <code>event_listener</code>. */ *************** *** 423,427 **** * @brief Construct. * ! * @param emitter the <code>event_emitter</code>. */ --- 423,427 ---- * @brief Construct. * ! * @param[in] emitter the <code>event_emitter</code>. */ *************** *** 439,446 **** * @brief Construct. * ! * @param n the <code>node</code> associated with the ! * <code>event_emitter</code>. ! * @param value the field value associated with the ! * <code>event_emitter</code>. */ --- 439,446 ---- * @brief Construct. * ! * @param[in] n the <code>node</code> associated with the ! * <code>event_emitter</code>. ! * @param[in] value the field value associated with the ! * <code>event_emitter</code>. */ *************** *** 642,647 **** * @brief Construct. * ! * @param node node from which events will be emitted. ! * @param value associated field value. */ --- 642,647 ---- * @brief Construct. * ! * @param[in] node node from which events will be emitted. ! * @param[in] value associated field value. */ *************** *** 813,818 **** * @brief Construct. * ! * @param node the node. ! * @param value the initial value. */ --- 813,818 ---- * @brief Construct. * ! * @param[in] node the node. ! * @param[in] value the initial value. */ *************** *** 822,826 **** * @brief Construct a copy. * ! * @param obj the instance to copy. */ --- 822,826 ---- * @brief Construct a copy. * ! * @param[in] obj the instance to copy. */ *************** *** 848,853 **** * @brief Construct. * ! * @param type the node_type associated with this node. ! * @param scope the scope to which the node belongs. */ --- 848,853 ---- * @brief Construct. * ! * @param[in] type the node_type associated with this node. ! * @param[in] scope the scope to which the node belongs. */ *************** *** 863,867 **** * @brief Get a field value for a node. * ! * @param id a field name. * * @exception unsupported_interface if the node has no field @p id. --- 863,867 ---- * @brief Get a field value for a node. * ! * @param[in] id a field name. * * @exception unsupported_interface if the node has no field @p id. *************** *** 875,879 **** * This method is called by node::event_listener. * ! * @param id eventIn identifier. * * @return the event listener. --- 875,879 ---- * This method is called by node::event_listener. * ! * @param[in] id eventIn identifier. * * @return the event listener. *************** *** 889,893 **** * This method is called by node::event_emitter. * ! * @param id eventOut identifier. * * @return the event emitter. --- 889,893 ---- * This method is called by node::event_emitter. * ! * @param[in] id eventOut identifier. * * @return the event emitter. *************** *** 907,912 **** * @brief Construct. * ! * @param ptr_to_mem a pointer to an <code>openvrml::field_value</code> ! * member. */ --- 907,912 ---- * @brief Construct. * ! * @param[in] ptr_to_mem a pointer to an <code>openvrml::field_value</code> ! * member. */ *************** *** 922,927 **** * @brief Construct * ! * @param ptr_to_mem a pointer to an ! * <code>openvrml::event_listener</code> member. */ --- 922,927 ---- * @brief Construct * ! * @param[in] ptr_to_mem a pointer to an ! * <code>openvrml::event_listener</code> member. */ *************** *** 937,942 **** * @brief Construct * ! * @param ptr_to_mem a pointer to an ! * <code>openvrml::event_emitter</code> member. */ --- 937,942 ---- * @brief Construct * ! * @param[in] ptr_to_mem a pointer to an ! * <code>openvrml::event_emitter</code> member. */ *************** *** 946,951 **** * @brief Construct. * ! * @param node_class the <code>node_class</code>. ! * @param id the <code>node_type</code> identifier. */ --- 946,951 ---- * @brief Construct. * ! * @param[in] node_class the <code>node_class</code>. ! * @param[in] id the <code>node_type</code> identifier. */ *************** *** 961,968 **** * @brief Add an eventIn. * ! * @param type the field value type. ! * @param id the eventIn identifier. ! * @param event_listener the <code>openvrml::event_listener</code> ! * associated with the eventIn. * * @exception std::invalid_argument if an interface with a conflicting --- 961,968 ---- * @brief Add an eventIn. * ! * @param[in] type the field value type. ! * @param[in] id the eventIn identifier. ! * @param[in] event_listener the <code>openvrml::event_listener</code> ! * associated with the eventIn. * * @exception std::invalid_argument if an interface with a conflicting *************** *** 977,984 **** * @brief Add an eventOut. * ! * @param type the field value type. ! * @param id the eventOut identifier. ! * @param event_emitter the <code>openvrml::event_emitter</code> ! * associated with the eventOut. * * @exception std::invalid_argument if an interface with a conflicting --- 977,984 ---- * @brief Add an eventOut. * ! * @param[in] type the field value type. ! * @param[in] id the eventOut identifier. ! * @param[in] event_emitter the <code>openvrml::event_emitter</code> ! * associated with the eventOut. * * @exception std::invalid_argument if an interface with a conflicting *************** *** 993,1004 **** * @brief Add an exposedField. * ! * @param type the field value type. ! * @param id the exposedField identifier. ! * @param event_listener the <code>openvrml::event_listener</code> ! * associated with the exposedField. ! * @param field the <code>openvrml::field_value</code> ! * associated with the exposedField. ! * @param event_emitter the <code>openvrml::event_emitter</code> ! * associated with the exposedField. * * @exception std::invalid_argument if an interface with a conflicting --- 993,1004 ---- * @brief Add an exposedField. * ! * @param[in] type the field value type. ! * @param[in] id the exposedField identifier. ! * @param[in] event_listener the <code>openvrml::event_listener</code> ! * associated with the exposedField. ! * @param[in] field the <code>openvrml::field_value</code> ! * associated with the exposedField. ! * @param[in] event_emitter the <code>openvrml::event_emitter</code> ! * associated with the exposedField. * * @exception std::invalid_argument if an interface with a conflicting *************** *** 1009,1020 **** /** ! * @fn void openvrml::node_impl_util::node_type_impl::add_field(const openvrml::field_value::type_id type, const std::string & id, const field_ptr_ptr & nodeFieldPtrPtr) * * @brief Add a field. * ! * @param type the field value type. ! * @param id the field identifier. ! * @param field the <code>openvrml::field_value</code> ! * associated with the field. * * @exception std::invalid_argument if an interface with a conflicting --- 1009,1020 ---- /** ! * @fn void openvrml::node_impl_util::node_type_impl::add_field(const openvrml::field_value::type_id type, const std::string & id, const field_ptr_ptr & field) * * @brief Add a field. * ! * @param[in] type the field value type. ! * @param[in] id the field identifier. ! * @param[in] field the <code>openvrml::field_value</code> associated with the ! * field. * * @exception std::invalid_argument if an interface with a conflicting *************** *** 1032,1038 **** * Delegates to <code>node_type_impl<Node>::do_field_value</code>. * ! * @param node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::field_value</code>. ! * @param id field identifier. * * @return @p node's <code>openvrml::field_value</code> corresponding to --- 1032,1038 ---- * Delegates to <code>node_type_impl<Node>::do_field_value</code>. * ! * @param[in] node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::field_value</code>. ! * @param[in] id field identifier. * * @return @p node's <code>openvrml::field_value</code> corresponding to *************** *** 1049,1055 **** * field identifier @p id. * ! * @param node the node for which to return the ! * <code>openvrml::field_value</code>. ! * @param id field identifier. * * @return @p node's <code>openvrml::field_value</code> corresponding to --- 1049,1055 ---- * field identifier @p id. * ! * @param[in] node the node for which to return the ! * <code>openvrml::field_value</code>. ! * @param[in] id field identifier. * * @return @p node's <code>openvrml::field_value</code> corresponding to *************** *** 1069,1075 **** * <code>node_type_impl<Node>::do_event_listener</code>. * ! * @param node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_listener</code>. ! * @param id eventIn identifier. * * @return @p node's <code>openvrml::event_listener</code> corresponding to --- 1069,1075 ---- * <code>node_type_impl<Node>::do_event_listener</code>. * ! * @param[in] node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_listener</code>. ! * @param[in] id eventIn identifier. * * @return @p node's <code>openvrml::event_listener</code> corresponding to *************** *** 1086,1092 **** * the eventIn identifier @p id. * ! * @param node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_listener</code>. ! * @param id eventIn identifier. * * @return @p node's <code>openvrml::event_listener</code> corresponding to --- 1086,1092 ---- * the eventIn identifier @p id. * ! * @param[in] node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_listener</code>. ! * @param[in] id eventIn identifier. * * @return @p node's <code>openvrml::event_listener</code> corresponding to *************** *** 1105,1111 **** * Delegates to <code>node_type_impl<Node>::do_event_emitter</code>. * ! * @param node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_emitter</code>. ! * @param id eventOut identifier. * * @return @p node's <code>openvrml::event_emitter</code> corresponding to --- 1105,1111 ---- * Delegates to <code>node_type_impl<Node>::do_event_emitter</code>. * ! * @param[in] node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_emitter</code>. ! * @param[in] id eventOut identifier. * * @return @p node's <code>openvrml::event_emitter</code> corresponding to *************** *** 1124,1130 **** * Delegates to <code>node_type_impl<Node>::do_event_emitter</code>. * ! * @param node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_emitter</code>. ! * @param id eventOut identifier. * * @return @p node's <code>openvrml::event_emitter</code> corresponding to --- 1124,1130 ---- * Delegates to <code>node_type_impl<Node>::do_event_emitter</code>. * ! * @param[in] node the <code>openvrml::node</code> for which to return the ! * <code>openvrml::event_emitter</code>. ! * @param[in] id eventOut identifier. * * @return @p node's <code>openvrml::event_emitter</code> corresponding to *************** *** 1150,1155 **** * @brief Create a node instance. * ! * @param scope the <code>scope</code> the new node will belong to. ! * @param initial_values initial values for the new node's fields. * * @return a new node instance. --- 1150,1156 ---- * @brief Create a node instance. * ! * @param[in] scope the <code>scope</code> the new node will belong ! * to. ! * @param[in] initial_values initial values for the new node's fields. * * @return a new node instance. Index: node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node.cpp,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** node.cpp 12 Feb 2006 09:40:17 -0000 1.74 --- node.cpp 25 Feb 2006 08:37:27 -0000 1.75 *************** *** 55,59 **** * @brief Construct. * ! * @param interface a node_interface. */ openvrml::unsupported_interface:: --- 55,59 ---- * @brief Construct. * ! * @param[in] interface a node_interface. */ [...1638 lines suppressed...] void openvrml::node_traverser::on_entering(node &) --- 4689,4693 ---- * traversing the its descendants. * ! * @param[in,out] n the <code>node</code> currently being traversed. */ void openvrml::node_traverser::on_entering(node &) *************** *** 4690,4694 **** * traversing the its descendants. * ! * @param n the <code>node</code> currently being traversed. */ void openvrml::node_traverser::on_leaving(node &) --- 4698,4702 ---- * traversing the its descendants. * ! * @param[in,out] n the <code>node</code> currently being traversed. */ void openvrml::node_traverser::on_leaving(node &) Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.131 retrieving revision 1.132 diff -C2 -d -r1.131 -r1.132 *** browser.cpp 20 Feb 2006 16:47:02 -0000 1.131 --- browser.cpp 25 Feb 2006 08:37:27 -0000 1.132 *************** *** 1038,1043 **** * @brief Construct. * ! * @param impl_node a node in the PROTO implementation. ! * @param impl_node_interface an interface of @p impl_node. */ proto_node_class:: --- 1038,1043 ---- * @brief Construct. * ! * @param[in] impl_node a node in the PROTO implementation. [...1197 lines suppressed...] * @return the resource. --- 9295,9299 ---- * <code>scene</code>. * ! * @param[in] url a list of alternative URIs. * * @return the resource. *************** *** 9355,9359 **** * This function @b must be called before the scene is destroyed. * ! * @param timestamp the current time. */ void openvrml::scene::shutdown(const double timestamp) OPENVRML_NOTHROW --- 9353,9357 ---- * This function @b must be called before the scene is destroyed. * ! * @param[in] timestamp the current time. */ void openvrml::scene::shutdown(const double timestamp) OPENVRML_NOTHROW Index: field_value.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** field_value.cpp 12 Feb 2006 09:40:17 -0000 1.23 --- field_value.cpp 25 Feb 2006 08:37:27 -0000 1.24 *************** *** 40,45 **** * @brief Stream output. * ! * @param out an output stream. ! * @param value a field value. * * @return @p out. --- 40,45 ---- * @brief Stream output. * ! * @param[in,out] out an output stream. [...4277 lines suppressed...] --- 7059,7064 ---- * Does not throw. * ! * @param[in,out] a ! * @param[in,out] b */ *************** *** 7072,7076 **** * Does not throw. * ! * @param a ! * @param b */ --- 7072,7076 ---- * Does not throw. * ! * @param[in,out] a ! * @param[in,out] b */ Index: ScriptJDK.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/ScriptJDK.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ScriptJDK.cpp 8 Dec 2005 06:50:12 -0000 1.15 --- ScriptJDK.cpp 25 Feb 2006 08:37:27 -0000 1.16 *************** *** 196,202 **** * given classDir or somewhere within the CLASSPATH. * ! * @param scriptNode Reference to the ScriptNode that uses this Script. ! * @param className Name of the Java class. ! * @param classDir Location of Java class. */ ScriptJDK::ScriptJDK(script_node & node, --- 196,202 ---- * given classDir or somewhere within the CLASSPATH. * [...3997 lines suppressed...] ! * @param[in] jParameterArray Array of parameters to load URL with * * @todo This method should throw an InvalidVRMLSyntaxException *************** *** 9816,9822 **** * @brief JNI implementation of Browser::setDescription. * ! * @param env JNI environment ! * @param obj JNI version of a Java Browser object. ! * @param jDescription Desired description of Browser. */ void JNICALL Java_vrml_Browser_setDescription --- 9816,9822 ---- * @brief JNI implementation of Browser::setDescription. * ! * @param[in] env JNI environment ! * @param[in,out] obj JNI version of a Java Browser object. ! * @param[in] jDescription Desired description of Browser. */ void JNICALL Java_vrml_Browser_setDescription Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** vrml97node.cpp 21 Feb 2006 06:09:16 -0000 1.98 --- vrml97node.cpp 25 Feb 2006 08:37:27 -0000 1.99 *************** *** 141,150 **** /** - * @typedef background_class::bound_nodes_t - * - * @brief A bound Background node stack. - */ - - /** * @var background_node * background_class::first * --- 141,144 ---- *************** *** 153,157 **** /** ! * @var background_class::bound_nodes_t background_class::bound_nodes * * @brief The bound Background node stack. --- 147,151 ---- /** ! * @var openvrml::node_impl_util::bound_node_stack<background_node> background_class::bound_nodes * * @brief The bound Background node stack. *************** *** 400,409 **** /** - * @typedef fog_class::bound_nodes_t - * - * @brief A bound Fog node stack. - */ - - /** * @var fog_node * fog_class::first * --- 394,397 ---- *************** *** 412,416 **** /** ! * @var fog_class::bound_nodes_t fog_class::bound_nodes * * @brief The bound Fog node stack. --- 400,404 ---- /** ! * @var openvrml::node_impl_util::bound_node_stack<fog_node> fog_class::bound_nodes * * @brief The bound Fog node stack. *************** *** 15195,15204 **** /** - * @typedef navigation_info_class::bound_nodes_t - * - * @brief A bound NavigationInfo node stack. - */ - - /** * @var navigation_info_node * navigation_info_class::first * --- 15183,15186 ---- *************** *** 15207,15211 **** /** ! * @var navigation_info_class::bound_nodes_t navigation_info_class::bound_nodes * * @brief The bound NavigationInfo node stack. --- 15189,15193 ---- /** ! * @var openvrml::node_impl_util::bound_node_stack<navigation_info_node> navigation_info_class::bound_nodes * * @brief The bound NavigationInfo node stack. *************** *** 25313,25322 **** /** - * @typedef viewpoint_class::bound_nodes_t - * - * @brief A stack of bound Viewpoint nodes. - */ - - /** * @var viewpoint_node * viewpoint_class::first * --- 25295,25298 ---- *************** *** 25325,25329 **** /** ! * @var viewpoint_class::bound_nodes_t viewpoint_class::bound_nodes * * @brief The stack of bound Viewpoint nodes. --- 25301,25305 ---- /** ! * @var openvrml::node_impl_util::bound_node_stack<viewpoint_node> viewpoint_class::bound_nodes * * @brief The stack of bound Viewpoint nodes. Index: viewer.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/viewer.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** viewer.cpp 12 Feb 2006 09:40:17 -0000 1.12 --- viewer.cpp 25 Feb 2006 08:37:27 -0000 1.13 *************** *** 169,174 **** * @brief Begin a display list. * ! * @param id object identifier. ! * @param retain whether the object should be retained for reuse. * * @return the display object identifier. --- 169,174 ---- * @brief Begin a display list. * ! * @param[in] id object identifier. ! * @param[in] retain whether the object should be retained for reuse. * * @return the display object identifier. *************** *** 186,199 **** * @brief Insert a background into a display list. * ! * @param ground_angle ground angles. ! * @param ground_color ground colors. ! * @param sky_angle sky angles. ! * @param sky_color sky colors. ! * @param front front texture. ! * @param back back texture. ! * @param left left texture. ! * @param right right texture. ! * @param top top texture. ! * @param bottom bottom texture. * * @return display object identifier. --- 186,199 ---- * @brief Insert a background into a display list. * ! * @param[in] ground_angle ground angles. ! * @param[in] ground_color ground colors. ! * @param[in] sky_angle sky angles. ! * @param[in] sky_color sky colors. ! * @param[in] front front texture. ! * @param[in] back back texture. ! * @param[in] left left texture. ! * @param[in] right right texture. ! * @param[in] top top texture. ! * @param[in] bottom bottom texture. * * @return display object identifier. *************** *** 205,209 **** * @brief Insert a box into a display list. * ! * @param size box dimensions. * * @return display object identifier. --- 205,209 ---- * @brief Insert a box into a display list. * ! * @param[in] size box dimensions. * * @return display object identifier. *************** *** 215,222 **** * @brief Insert a cone into a display list. * ! * @param height height. ! * @param radius radius at base. ! * @param bottom show the bottom. ! * @param side show the side. * * @return display object identifier. --- 215,222 ---- * @brief Insert a cone into a display list. * ! * @param[in] height height. ! * @param[in] radius radius at base. ! * @param[in] bottom show the bottom. ! * @param[in] side show the side. * * @return display object identifier. *************** *** 228,236 **** * @brief Insert a cylinder into a display list. * ! * @param height height. ! * @param radius radius. ! * @param bottom show the bottom. ! * @param side show the side. ! * @param top show the top. * * @return display object identifier. --- 228,236 ---- * @brief Insert a cylinder into a display list. * ! * @param[in] height height. ! * @param[in] radius radius. ! * @param[in] bottom show the bottom. ! * @param[in] side show the side. ! * @param[in] top show the top. * * @return display object identifier. *************** *** 242,254 **** * @brief Insert an elevation grid into a display list. * ! * @param mask ! * @param height height field. ! * @param x_dimension vertices in the x direction. ! * @param z_dimension vertices in the z direction. ! * @param x_spacing distance between vertices in the x direction. ! * @param z_spacing distance between vertices in the z direction. ! * @param color colors. ! * @param normal normals. ! * @param tex_coord texture coordinates. * * @return display object identifier. --- 242,254 ---- * @brief Insert an elevation grid into a display list. * ! * @param[in] mask ! * @param[in] height height field. ! * @param[in] x_dimension vertices in the x direction. ! * @param[in] z_dimension vertices in the z direction. ! * @param[in] x_spacing distance between vertices in the x direction. ! * @param[in] z_spacing distance between vertices in the z direction. ! * @param[in] color colors. ! * @param[in] normal normals. ! * @param[in] tex_coord texture coordinates. * * @return display object identifier. *************** *** 260,268 **** * @brief Insert an extrusion into a display list. * ! * @param mask ! * @param spine spine points. ! * @param cross_section cross-sections. ! * @param orientation cross-section orientations. ! * @param scale cross-section scales. * * @return display object identifier. --- 260,268 ---- * @brief Insert an extrusion into a display list. * ! * @param[in] mask ! * @param[in] spine spine points. ! * @param[in] cross_section cross-sections. ! * @param[in] orientation cross-section orientations. ! * @param[in] scale cross-section scales. * * @return display object identifier. *************** *** 274,282 **** * @brief Insert a line set into a display list. * ! * @param coord coordinates. ! * @param coord_index coordinate indices. ! * @param color_per_vertex whether colors are applied per-vertex or per-face. ! * @param color colors. ! * @param color_index color indices. * * @return display object identifier. --- 274,282 ---- * @brief Insert a line set into a display list. * ! * @param[in] coord coordinates. ! * @param[in] coord_index coordinate indices. ! * @param[in] color_per_vertex whether colors are applied per-vertex or per-face. ! * @param[in] color colors. ! * @param[in] color_index color indices. * * @return display object identifier. *************** *** 288,293 **** * @brief Insert a point set into a display list. * ! * @param coord points. ! * @param color colors. * * @return display object identifier. --- 288,293 ---- * @brief Insert a point set into a display list. * ! * @param[in] coord points. ! * @param[in] color colors. * * @return display object identifier. *************** *** 299,311 **** * @brief Insert a shell into a display list. * ! * @param mask ! * @param coord coordinates. ! * @param coord_index coordinate indices. ! * @param color colors. ! * @param color_index color indices. ! * @param normal normals. ! * @param normal_index normal indices. ! * @param tex_coord texture coordinates. ! * @param tex_coord_index texture coordinate indices. * * @return display object identifier. --- 299,311 ---- * @brief Insert a shell into a display list. * ! * @param[in] mask ! * @param[in] coord coordinates. ! * @param[in] coord_index coordinate indices. ! * @param[in] color colors. ! * @param[in] color_index color indices. ! * @param[in] normal normals. ! * @param[in] normal_index normal indices. ! * @param[in] tex_coord texture coordinates. ! * @param[in] tex_coord_index texture coordinate indices. * * @return display object identifier. *************** *** 317,321 **** * @brief Insert a sphere into a display list. * ! * @param radius sphere radius. * * @return display object identifier. --- 317,321 ---- * @brief Insert a sphere into a display list. * ! * @param[in] radius sphere radius. * * @return display object identifier. *************** *** 327,334 **** * @brief Insert a directional light into a display list. * ! * @param ambient_intensity ambient intensity. ! * @param intensity intensity. ! * @param color color. ! * @param direction direction. * * @return display object identifier. --- 327,334 ---- * @brief Insert a directional light into a display list. * ! * @param[in] ambient_intensity ambient intensity. ! * @param[in] intensity intensity. ! * @param[in] color color. ! * @param[in] direction direction. * * @return display object identifier. *************** *** 340,349 **** * @brief Insert a point light into a display list. * ! * @param ambient_intensity ambient intensity. ! * @param attenuation attenuation. ! * @param color color. ! * @param intensity intensity. ! * @param location location. ! * @param radius radius. * * @return display object identifier. --- 340,349 ---- * @brief Insert a point light into a display list. * ! * @param[in] ambient_intensity ambient intensity. ! * @param[in] attenuation attenuation. ! * @param[in] color color. ! * @param[in] intensity intensity. ! * @param[in] location location. ! * @param[in] radius radius. * * @return display object identifier. *************** *** 355,367 **** * @brief Insert a point light into a display list. * ! * @param ambient_intensity ambient intensity. ! * @param attenuation attenuation. ! * @param beam_width beam width. ! * @param color color. ! * @param cut_off_angle cut-off angle. ! * @param direction direction. ! * @param intensity intensity. ! * @param location location. ! * @param radius radius. * * @return display object identifier. --- 355,367 ---- * @brief Insert a point light into a display list. * ! * @param[in] ambient_intensity ambient intensity. ! * @param[in] attenuation attenuation. ! * @param[in] beam_width beam width. ! * @param[in] color color. ! * @param[in] cut_off_angle cut-off angle. ! * @param[in] direction direction. ! * @param[in] intensity intensity. ! * @param[in] location location. ! * @param[in] radius radius. * * @return display object identifier. *************** *** 381,385 **** * @brief Remove an object from the display list. * ! * @param ref object handle. */ --- 381,385 ---- * @brief Remove an object from the display list. * ! * @param[in] ref object handle. */ *************** *** 389,393 **** * @brief Enable/disable lighting. * ! * @param val whether lighting should be enabled. */ --- 389,393 ---- * @brief Enable/disable lighting. * ! * @param[in] val whether lighting should be enabled. */ *************** *** 397,404 **** * @brief Set the fog. * ! * @param color fog color. ! * @param visibility_range the distance at which objects are fully obscured by * fog. ! * @param type fog type. */ --- 397,404 ---- * @brief Set the fog. * ! * @param[in] color fog color. ! * @param[in] visibility_range the distance at which objects are fully obscured by * fog. ! * @param[in] type fog type. */ *************** *** 408,413 **** * @brief Set the color. * ! * @param rgb red, green, and blue components. ! * @param a alpha (transparency) component. */ --- 408,413 ---- * @brief Set the color. * ! * @param[in] rgb red, green, and blue components. ! * @param[in] a alpha (transparency) component. */ *************** *** 417,426 **** * @brief Set the material. * ! * @param ambient_intensity ambient intensity. ! * @param diffuse_color diffuse color. ! * @param emissive_color emissive color. ! * @param shininess shininess. ! * @param specular_color specular color. ! * @param transparency transparency. */ --- 417,426 ---- * @brief Set the material. * ! * @param[in] ambient_intensity ambient intensity. ! * @param[in] diffuse_color diffuse color. ! * @param[in] emissive_color emissive color. ! * @param[in] shininess shininess. ! * @param[in] specular_color specular color. ! * @param[in] transparency transparency. */ *************** *** 430,435 **** * @brief Set the material mode. * ! * @param tex_components texture components. ! * @param geometry_color geometry color. */ --- 430,435 ---- * @brief Set the material mode. * ! * @param[in] tex_components texture components. ! * @param[in] geometry_color geometry color. */ *************** *** 439,443 **** * @brief Indicate that a node should be sensitive to the pointing device. * ! * @param object a node. */ --- 439,443 ---- * @brief Indicate that a node should be sensitive to the pointing device. * ! * @param[in] object a node. */ *************** *** 447,454 **** * @brief Create a texture object. * ! * @param img image. ! * @param repeat_s repeat in the S direction. ! * @param repeat_t repeat in the T direction. ! * @param retainHint whether the texture is likely to be reused. * * @return a handle to the inserted texture. --- 447,454 ---- * @brief Create a texture object. * ! * @param[in] img image. ! * @param[in] repeat_s repeat in the S direction. ! * @param[in] repeat_t repeat in the T direction. ! * @param[in] retainHint whether the texture is likely to be reused. * * @return a handle to the inserted texture. *************** *** 460,465 **** * @brief Insert a texture into the display list from an existing handle. * ! * @param ref texture handle. ! * @param components number of components. */ --- 460,465 ---- * @brief Insert a texture into the display list from an existing handle. * ! * @param[in] ref texture handle. ! * @param[in] components number of components. */ *************** *** 469,473 **** * @brief Remove a texture from the display list. * ! * @param ref texture handle. */ --- 469,473 ---- * @brief Remove a texture from the display list. * ! * @param[in] ref texture handle. */ *************** *** 477,484 **** * @brief Set the texture transform. * ! * @param center center. ! * @param rotation rotation. ! * @param scale scale. ! * @param translation translation. */ --- 477,484 ---- * @brief Set the texture transform. * ! * @param[in] center center. ! * @param[in] rotation rotation. ! * @param[in] scale scale. ! * @param[in] translation translation. */ *************** *** 488,496 **** * @brief Set the viewpoint. * ! * @param position position. ! * @param orientation orientation. ! * @param field_of_view field of view. ! * @param avatar_size avatar size. ! * @param visibility_limit visiblity limit. */ --- 488,496 ---- * @brief Set the viewpoint. * ! * @param[in] position position. ! * @param[in] orientation orientation. ! * @param[in] field_of_view field of view. ! * @param[in] avatar_size avatar size. ! * @param[in] visibility_limit visiblity limit. */ *************** *** 503,507 **** * modelview matrix. * ! * @param mat transformation matrix. */ --- 503,507 ---- * modelview matrix. * ! * @param[in] mat transformation matrix. */ *************** *** 511,516 **** * @brief Transform @p points by the current modelview matrix. * ! * @param nPoints number of points. ! * @param point pointer to the first point in an array. */ --- 511,516 ---- * @brief Transform @p points by the current modelview matrix. * ! * @param[in] nPoints number of points. ! * @param[in] point pointer to the first point in an array. */ *************** *** 523,527 **** * always return bounding_volume::inside. * ! * @param bvolume the bounding volume to intersect with the view volume. * * @return bounding_volume::inside, bounding_volume::outside, or --- 523,527 ---- * always return bounding_volume::inside. * ! * @param[in] bvolume the bounding volume to intersect with the view volume. * * @return bounding_volume::inside, bounding_volume::outside, or *************** *** 551,556 **** * handle axis_aligned_bounding_boxes as well. * ! * @param bs a bounding sphere; if max, will not be drawn ! * @param intersection one of the bvolume intersection test constants, or 4 * to draw in unique way. (useful for debugging) */ --- 551,556 ---- * handle axis_aligned_bounding_boxes as well. * ! * @param[in] bs a bounding sphere; if max, will not be drawn ! * @param[in] intersection one of the bvolume intersection test constants, or 4 * to draw in unique way. (useful for debugging) */ *************** *** 572,576 **** * @brief Set the frustum. * ! * @param f new frustum value. */ void openvrml::viewer::frustum(const openvrml::frustum & f) --- 572,576 ---- * @brief Set the frustum. * ! * @param[in] f new frustum value. */ void openvrml::viewer::frustum(const openvrml::frustum & f) Index: script.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** script.cpp 22 Feb 2006 15:35:08 -0000 1.66 --- script.cpp 25 Feb 2006 08:37:27 -0000 1.67 *************** *** 65,69 **** * @brief Construct. * ! * @param node a reference to the script_node that uses this script object. */ openvrml::script::script(script_node & node): --- 65,69 ---- * @brief Construct. * ! * @param[in] node a reference to the script_node that uses this script object. */ openvrml::script::script(script_node & node): *************** *** 82,86 **** * Delegates to <code>script::do_initialize</code>. * ! * @param timestamp the current time. */ void openvrml::script::initialize(double timestamp) --- 82,86 ---- * Delegates to <code>script::do_initialize</code>. * ! * @param[in] timestamp the current time. */ void openvrml::script::initialize(double timestamp) *************** *** 95,99 **** * @brief Initialize the Script node. * ! * @param timestamp the current time. */ --- 95,99 ---- * @brief Initialize the Script node. * ! * @param[in] timestamp the current time. */ *************** *** 103,109 **** * Delegates to <code>script::do_process_event</code>. * ! * @param id eventIn identifier. ! * @param value event value. ! * @param timestamp the current time. */ void openvrml::script::process_event(const std::string & id, --- 103,109 ---- * Delegates to <code>script::do_process_event</code>. * ! * @param[in] id eventIn identifier. ! * @param[in] value event value. ! * @param[in] timestamp the current time. */ void openvrml::script::process_event(const std::string & id, *************** *** 120,126 **** * @brief Process an event. * ! * @param id eventIn identifier. ! * @param value event value. ! * @param timestamp the current time. */ --- 120,126 ---- * @brief Process an event. * ! * @param[in] id eventIn identifier. ! * @param[in] value event value. ! * @param[in] timestamp the current time. */ *************** *** 130,134 **** * Delegates to <code>script::do_events_processed</code>. * ! * @param timestamp the current time. */ void openvrml::script::events_processed(double timestamp) --- 130,134 ---- * Delegates to <code>script::do_events_processed</code>. * ! * @param[in] timestamp the current time. */ void openvrml::script::events_processed(double timestamp) *************** *** 142,146 **** * @brief Execute script code after processing events. * ! * @param timestamp the current time. */ --- 142,146 ---- * @brief Execute script code after processing events. * ! * @param[in] timestamp the current time. */ *************** *** 150,154 **** * Delegates to <code>script::do_shutdown</code>. * ! * @param timestamp the current time. */ void openvrml::script::shutdown(double timestamp) --- 150,154 ---- * Delegates to <code>script::do_shutdown</code>. * ! * @param[in] timestamp the current time. */ void openvrml::script::shutdown(double timestamp) *************** *** 163,167 **** * @brief Shut down the Script node. * ! * @param timestamp the current time. */ --- 163,167 ---- * @brief Shut down the Script node. * ! * @param[in] timestamp the current time. */ *************** *** 192,197 **** * @brief Set the value of a field. * ! * @param id field identifier. ! * @param value new value. * * @exception unsupported_interface if the Script node has no field @p id. --- 192,197 ---- * @brief Set the value of a field. * ! * @param[in] id field identifier. ! * @param[in] value new value. * * @exception unsupported_interface if the Script node has no field @p id. *************** *** 216,222 **** * execution. * ! * @param listener the <code>event_listener</code> to which the event should * be sent. ! * @param value the value to send. * * @exception field_value_type_mismatch if @p listener is not the correct type --- 216,222 ---- * execution. * ! * @param[in] listener the <code>event_listener</code> to which the event should * be sent. ! * @param[in] value the value to send. * * @exception field_value_type_mismatch if @p listener is not the correct type *************** *** 304,308 **** * @brief Construct. * ! * @param browser the browser to be associated with the script_node_class. */ openvrml::script_node_class::script_node_class(openvrml::browser & browser): --- 304,308 ---- * @brief Construct. * ! * @param[in] browser the browser to be associated with the script_node_class. */ openvrml::script_node_class::script_node_class(openvrml::browser & browser): *************** *** 384,389 **** * @brief Construct. * ! * @param type field value type identifier. ! * @param node script_node. * * @exception std::bad_alloc if memory allocation fails. --- 384,389 ---- * @brief Construct. * ! * @param[in] type field value type identifier. ! * @param[in] node script_node. * * @exception std::bad_alloc if memory allocation fails. *************** *** 415,419 **** * is called. * ! * @param val field value. * * @exception std::bad_alloc if memory allocation fails. --- 415,419 ---- * is called. * ! * @param[in] val field value. * * @exception std::bad_alloc if memory allocation fails. *************** *** 457,461 **** * @return the event_emitter associated with the eventout. */ ! openvrml::event_emitter & openvrml::script_node::eventout::emitter() OPENVRML_NOTHROW { return *this->emitter_; --- 457,462 ---- * @return the event_emitter associated with the eventout. */ ! openvrml::event_emitter & openvrml::script_node::eventout::emitter() ! OPENVRML_NOTHROW { return *this->emitter_; *************** *** 468,472 **** * of passing the event_emitter directly to node::emit_event. * ! * @param timestamp the current time. * * @exception std::bad_alloc if memory allocation fails. --- 469,473 ---- * of passing the event_emitter directly to node::emit_event. * ! * @param[in] timestamp the current time. * * @exception std::bad_alloc if memory allocation fails. *************** *** 534,538 **** * @brief Construct. * ! * @param class_ the node_class for @link script_node script_nodes@endlink. */ openvrml::script_node::script_node_type:: --- 535,539 ---- * @brief Construct. * ! * @param[in] class_ the node_class for @link script_node script_nodes@endlink. */ openvrml::script_node::script_node_type:: *************** *** 556,560 **** * @brief Add an interface. * ! * @param interface * * @exception std::bad_alloc if memory allocation fails. --- 557,561 ---- * @brief Add an interface. * ! * @param[in] interface * * @exception std::bad_alloc if memory allocation fails. *************** *** 594,599 **** * with a call to the script_node constructor. * ! * @param scope the scope to which the node should belong. ! * @param initial_values a map of initial values for the node's fields and * exposedFields. * --- 595,600 ---- * with a call to the script_node constructor. * ! * @param[in] scope the scope to which the node should belong. ! * @param[in] initial_values a map of initial values for the node's fields and * exposedFields. * *************** *** 684,689 **** * @brief Construct. * ! * @param id eventIn identifier. ! * @param node script_node. */ template <typename FieldValue> --- 685,690 ---- * @brief Construct. * ! * @param[in] id eventIn identifier. ! * @param[in] node script_node. */ template <typename FieldValue> *************** *** 720,725 **** * @brief Process an event. * ! * @param value event value. ! * @param timestamp the current time. * * @exception std::bad_alloc if memory allocation fails. --- 721,726 ---- * @brief Process an event. * ! * @param[in] value event value. ! * @param[in] timestamp the current time. * * @exception std::bad_alloc if memory allocation fails. *************** *** 1019,1025 **** * @brief Create a Script node event listener. * ! * @param type the type of listener to create. ! * @param id eventIn identifier. ! * @param node the containing script_node. * * @return a Script node event listener. --- 1020,1026 ---- * @brief Create a Script node event listener. * ! * @param[in] type the type of listener to create. ! * @param[in] id eventIn identifier. ! * @param[in] node the containing script_node. * * @return a Script node event listener. *************** *** 1166,1171 **** * @brief Create a Script node event emitter. * ! * @param node the containing <code>script_node</code>. ! * @param value the node field value associated with the emitter. * * @return a Script node event emitter. --- 1167,1172 ---- * @brief Create a Script node event emitter. * ! * @param[in] node the containing <code>script_node</code>. ! * @param[in] value the node field value associated with the emitter. * * @return a Script node event emitter. *************** *** 1198,1202 **** * @brief Construct. * ! * @param node a reference to the containing script_node. */ openvrml::script_node::set_url_listener_t:: --- 1199,1203 ---- * @brief Construct. * ! * @param[in] node a reference to the containing script_node. */ openvrml::script_node::set_url_listener_t:: *************** *** 1226,1231 **** * @brief Process an event. * ! * @param value new url value. ! * @param timestamp the current time. * * @exception std::bad_alloc if memory allocation fails. --- 1227,1232 ---- * @brief Process an event. * ! * @param[in] value new url value. ! * @param[in] timestamp the current time. * * @exception std::bad_alloc if memory allocation fails. *************** *** 1261,1265 **** * @brief Construct. * ! * @param value the associated field value. */ openvrml::script_node::url_changed_emitter:: --- 1262,1266 ---- * @brief Construct. * ! * @param[in] value the associated field value. */ openvrml::script_node::url_changed_emitter:: *************** *** 1297,1301 **** * @brief Construct. * ! * @param node a reference to the containing script_node. */ openvrml::script_node::set_metadata_listener:: --- 1298,1302 ---- * @brief Construct. * ! * @param[in] node a reference to the containing script_node. */ openvrml::script_node::set_metadata_listener:: *************** *** 1325,1330 **** * @brief Process an event. * ! * @param value new metadata value. ! * @param timestamp the current time. * * @exception std::bad_alloc if memory allocation fails. --- 1326,1331 ---- * @brief Process an event. * ! * @param[in] value new metadata value. ! * @param[in] timestamp the current time. * * @exception std::bad_alloc if memory allocation fails. *************** *** 1357,1361 **** * @brief Construct. * ! * @param value the associated field value. */ openvrml::script_node::metadata_changed_emitter:: --- 1358,1362 ---- * @brief Construct. * ! * @param[in] value the associated field value. */ openvrml::script_node::metadata_changed_emitter:: *************** *** 1512,1525 **** * type. OpenVRML uses this internally when instantiating <code>PROTO</code>s. * ! * @param class_ the <code>script_node_class</code>. Typically * there is one <code>script_node_class</code> per * browser instance. ! * @param scope the <code>scope</code> to which the node should * belong. ! * @param interfaces a <code>node_interface_set</code> containing * specifications of user-defined fields, eventIns, * and eventOuts particular to the * <code>script_node</code> instance. ! * @param initial_values a map of initial values for fields of the * <code>script_node</code>. * --- 1513,1526 ---- * type. OpenVRML uses this internally when instantiating <code>PROTO</code>s. * ! * @param[in] class_ the <code>script_node_class</code>. Typically * there is one <code>script_node_class</code> per * browser instance. ! * @param[in] scope the <code>scope</code> to which the node should * belong. ! * @param[in] interfaces a <code>node_interface_set</code> containing * specifications of user-defined fields, eventIns, * and eventOuts particular to the * <code>script_node</code> instance. ! * @param[in] initial_values a map of initial values for fields of the * <code>script_node</code>. * *************** *** 1703,1707 **** * @brief Update the script_node for the current time. * ! * @param current_time the current time. */ void openvrml::script_node::update(const double current_time) --- 1704,1708 ---- * @brief Update the script_node for the current time. * ! * @param[in] current_time the current time. */ void openvrml::script_node::update(const double current_time) *************** *** 1752,1757 **** * self-references for which ownership is relinquished. * ! * @param inval input sfnode. ! * @retval retval output sfnode. */ void openvrml::script_node::assign_with_self_ref_check(const sfnode & inval, --- 1753,1758 ---- * self-references for which ownership is relinquished. * ! * @param[in] inval input sfnode. ! * @param[out] retval output sfnode. */ void openvrml::script_node::assign_with_self_ref_check(const sfnode & inval, *************** *** 1800,1805 **** * self-references for which ownership is relinquished. * ! * @param inval input mfnode. ! * @retval retval output mfnode. */ void openvrml::script_node::assign_with_self_ref_check(const mfnode & inval, --- 1801,1806 ---- * self-references for which ownership is relinquished. * ! * @param[in] inval input mfnode. ! * @param[out] retval output mfnode. */ void openvrml::script_node::assign_with_self_ref_check(const mfnode & inval, *************** *** 1830,1834 **** * @brief Initialize. * ! * @param timestamp the current time. * * @exception std::bad_alloc if memory allocation fails. --- 1831,1835 ---- * @brief Initialize. * ! * @param[in] timestamp the current time. * * @exception std::bad_alloc if memory allocation fails. *************** *** 1859,1863 **** * @brief Get the value of a field. * ! * @param id the name of the field to get. * * @return the value for field @p id. --- 1860,1864 ---- * @brief Get the value of a field. * ! * @param[in] id the name of the field to get. * * @return the value for field @p id. *************** *** 1891,1895 **** * this method. * ! * @param id eventIn identifier. * * @return the event listener. --- 1892,1896 ---- * this method. * ! * @param[in] id eventIn identifier. * * @return the event listener. *************** *** 1923,1927 **** * This method is called by node::event_emitter. * ! * @param id eventOut identifier. * * @return the event emitter. --- 1924,1928 ---- * This method is called by node::event_emitter. * ! * @param[in] id eventOut identifier. * * @return the event emitter. *************** *** 1974,1978 **** * @brief Called by node::shutdown. * ! * @param timestamp the current time. */ void openvrml::script_node::do_shutdown(const double timestamp) OPENVRML_NOTHROW --- 1975,1979 ---- * @brief Called by node::shutdown. * ! * @param[in] timestamp the current time. */ void openvrml::script_node::do_shutdown(const double timestamp) OPENVRML_NOTHROW *************** *** 1985,1992 **** * @brief render_child implementation. * ! * @param v viewer implementation responsible for actually doing the ! * drawing. ! * @param context generic context argument; holds things like the accumulated ! * modelview transform. */ void openvrml::script_node::do_render_child(viewer &, rendering_context) --- 1986,1993 ---- * @brief render_child implementation. * ! * @param[in,out] v viewer implementation responsible for actually ! * doing the drawing. ! * @param[in] context generic context argument; holds things like the ! * accumulated modelview transform. */ void openvrml::script_node::do_render_child(viewer &, rendering_context) Index: exposedfield.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/exposedfield.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** exposedfield.cpp 12 Feb 2006 09:40:17 -0000 1.4 --- exposedfield.cpp 25 Feb 2006 08:37:27 -0000 1.5 *************** *** 47,52 **** * @brief Construct. * ! * @param node a reference to the node to which the exposedField belongs. ! * @param value default value. */ --- 47,52 ---- * @brief Construct. * ! * @param[in] node a reference to the node to which the exposedField belongs. ! * @param[in] value default value. */ *************** *** 56,60 **** * @brief Construct a copy. * ! * @param obj the instance to copy. */ --- 56,60 ---- * @brief Construct a copy. * ! * @param[in] obj the instance to copy. */ *************** *** 81,86 **** * <code>exposedfield<FieldValue>::event_side_effect</code> instead. * ! * @param value new value. ! * @param timestamp the current time. * * @exception std::bad_... [truncated message content] |
|
From: Braden M. <br...@us...> - 2006-02-25 08:37:31
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20660 Modified Files: ChangeLog Log Message: Doc-comment improvements; added direction (in, out) to param directives. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1156 retrieving revision 1.1157 diff -C2 -d -r1.1156 -r1.1157 *** ChangeLog 25 Feb 2006 06:57:28 -0000 1.1156 --- ChangeLog 25 Feb 2006 08:37:27 -0000 1.1157 *************** *** 1,4 **** --- 1,26 ---- 2006-02-25 Braden McDaniel <br...@en...> + Doc-comment improvements; added direction (in, out) to param + directives. + + * src/libopenvrml/openvrml/ScriptJDK.cpp + * src/libopenvrml/openvrml/basetypes.cpp + * src/libopenvrml/openvrml/bounding_volume.cpp + * src/libopenvrml/openvrml/browser.cpp + * src/libopenvrml/openvrml/event.cpp + * src/libopenvrml/openvrml/exposedfield.cpp + * src/libopenvrml/openvrml/field_value.cpp + * src/libopenvrml/openvrml/frustum.cpp + * src/libopenvrml/openvrml/node.cpp + * src/libopenvrml/openvrml/node_impl_util.cpp + * src/libopenvrml/openvrml/node_impl_util.h + * src/libopenvrml/openvrml/scope.cpp + * src/libopenvrml/openvrml/script.cpp + * src/libopenvrml/openvrml/viewer.cpp + * src/libopenvrml/openvrml/vrml97node.cpp + * src/libopenvrml-gl/openvrml/gl/viewer.cpp + + 2006-02-25 Braden McDaniel <br...@en...> + * doc/doxygen-header: Updated to reflect changes to Doxygen style sheet. |
|
From: Braden M. <br...@us...> - 2006-02-25 06:57:37
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12731 Modified Files: ChangeLog Log Message: Updated to reflect changes to Doxygen style sheet. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1155 retrieving revision 1.1156 diff -C2 -d -r1.1155 -r1.1156 *** ChangeLog 22 Feb 2006 15:35:08 -0000 1.1155 --- ChangeLog 25 Feb 2006 06:57:28 -0000 1.1156 *************** *** 1,2 **** --- 1,7 ---- + 2006-02-25 Braden McDaniel <br...@en...> + + * doc/doxygen-header: Updated to reflect changes to Doxygen style + sheet. + 2006-02-22 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-02-25 06:57:37
|
Update of /cvsroot/openvrml/openvrml/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12731/doc Modified Files: doxygen-header Log Message: Updated to reflect changes to Doxygen style sheet. Index: doxygen-header =================================================================== RCS file: /cvsroot/openvrml/openvrml/doc/doxygen-header,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** doxygen-header 22 Feb 2006 04:40:05 -0000 1.18 --- doxygen-header 25 Feb 2006 06:57:28 -0000 1.19 *************** *** 132,136 **** } ! td.memItemLeft, td.memItemRight, .mdRow td { font-family: "Bitstream Vera Sans Mono", "LucidaTypewriter", --- 132,136 ---- } ! td.memItemLeft, td.memItemRight, .memproto td { font-family: "Bitstream Vera Sans Mono", "LucidaTypewriter", *************** *** 143,159 **** } - .mdRow { - background-color: rgb(95%, 95%, 95%); - } - .mdTable { background-color: rgb(95%, 95%, 95%); } ! .mdRow td { ! background-color: rgb(95%, 95%, 95%); ! } ! ! .mdRow td code { font-family: sans-serif; font-style: italic; --- 143,151 ---- } .mdTable { background-color: rgb(95%, 95%, 95%); } ! .memproto td code { font-family: sans-serif; font-style: italic; |
|
From: Braden M. <br...@us...> - 2006-02-22 15:35:21
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4710/src/libopenvrml/openvrml Modified Files: script.cpp script.h Log Message: Moved openvrml::script_node::script_event_listener<FieldValue> and openvrml::script_node::script_event_emitter<FieldValue> out of the header. Index: script.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** script.cpp 22 Feb 2006 08:05:02 -0000 1.65 --- script.cpp 22 Feb 2006 15:35:08 -0000 1.66 *************** *** 656,663 **** * @internal * - * @class openvrml::script_node::script_event_listener - * * @brief Event listener. */ /** --- 656,677 ---- * @internal * * @brief Event listener. */ + template <typename FieldValue> + class openvrml::script_node::script_event_listener : + public node_field_value_listener<FieldValue> { + + const std::string id; + + public: + script_event_listener(const std::string & id, script_node & node); + virtual ~script_event_listener() OPENVRML_NOTHROW; + + private: + virtual const std::string do_eventin_id() const OPENVRML_NOTHROW; + virtual void do_process_event(const FieldValue & value, double timestamp) + OPENVRML_THROW1(std::bad_alloc); + }; + /** *************** *** 668,673 **** /** - * @fn openvrml::script_node::script_event_listener::script_event_listener(const std::string & id, script_node & node) - * * @brief Construct. * --- 682,685 ---- *************** *** 675,696 **** * @param node script_node. */ /** - * @fn openvrml::script_node::script_event_listener::~script_event_listener() - * * @brief Destroy. */ /** - * @fn const std::string openvrml::script_node::script_event_listener::do_eventin_id() const - * * @brief The associated eventIn identifier. * * @return the associated eventIn identifier. */ /** - * @fn void openvrml::script_node::script_event_listener::do_process_event(const FieldValue & value, double timestamp) - * * @brief Process an event. * --- 687,721 ---- * @param node script_node. */ + template <typename FieldValue> + openvrml::script_node::script_event_listener<FieldValue>:: + script_event_listener(const std::string & id, + script_node & node): + node_event_listener(node), + node_field_value_listener<FieldValue>(node), + id(id) + {} /** * @brief Destroy. */ + template <typename FieldValue> + openvrml::script_node::script_event_listener<FieldValue>:: + ~script_event_listener() OPENVRML_NOTHROW + {} /** * @brief The associated eventIn identifier. * * @return the associated eventIn identifier. */ + template <typename FieldValue> + const std::string + openvrml::script_node::script_event_listener<FieldValue>::do_eventin_id() const + OPENVRML_NOTHROW + { + return this->id; + } /** * @brief Process an event. * *************** *** 700,703 **** --- 725,742 ---- * @exception std::bad_alloc if memory allocation fails. */ + template <typename FieldValue> + void openvrml::script_node::script_event_listener<FieldValue>:: + do_process_event(const FieldValue & value, + const double timestamp) + OPENVRML_THROW1(std::bad_alloc) + { + assert(dynamic_cast<openvrml::script_node *>(&this->node())); + openvrml::script_node & script_node = + dynamic_cast<openvrml::script_node &>(this->node()); + if (script_node.script_) { + script_node.script_->process_event(this->id, value, timestamp); + } + ++script_node.events_received; + } /** *************** *** 1006,1009 **** --- 1045,1133 ---- * @internal * + * @brief Event emitter. + */ + template <typename FieldValue> + class openvrml::script_node::script_event_emitter : + public openvrml::field_value_emitter<FieldValue> { + BOOST_CLASS_REQUIRE(FieldValue, openvrml, FieldValueConcept); + + script_node * node_; + + struct event_emitter_equal_to : + std::unary_function<typename eventout_map_t::value_type, bool> { + explicit event_emitter_equal_to( + const script_event_emitter<FieldValue> & emitter) + OPENVRML_NOTHROW: + emitter_(&emitter) + {} + + bool operator()(const typename eventout_map_t::value_type & arg) const + { + return this->emitter_ == &arg.second->emitter(); + } + + private: + const script_event_emitter * emitter_; + }; + + public: + script_event_emitter(script_node & node, const FieldValue & value) + OPENVRML_NOTHROW; + virtual ~script_event_emitter() OPENVRML_NOTHROW; + + private: + virtual const std::string do_eventout_id() const OPENVRML_NOTHROW; + }; + + /** + * @var openvrml::script_node * openvrml::script_node::script_event_emitter::node_ + * + * @brief The @c script_node. + */ + + /** + * @brief Construct. + * + * @param[in] node the @c script_node. + * @param[in] value the field value with which the emitter is associated. + */ + template <typename FieldValue> + openvrml::script_node::script_event_emitter<FieldValue>:: + script_event_emitter(script_node & node, const FieldValue & value) + OPENVRML_NOTHROW: + openvrml::event_emitter(value), + openvrml::field_value_emitter<FieldValue>(value), + node_(&node) + {} + + /** + * @brief Destroy. + */ + template <typename FieldValue> + openvrml::script_node::script_event_emitter<FieldValue>:: + ~script_event_emitter() OPENVRML_NOTHROW + {} + + /** + * @brief The eventOut identifier. + * + * @return the eventOut identifier. + */ + template <typename FieldValue> + const std::string + openvrml::script_node::script_event_emitter<FieldValue>::do_eventout_id() const + OPENVRML_NOTHROW + { + const eventout_map_t::const_iterator pos = + std::find_if(this->node_->eventout_map_.begin(), + this->node_->eventout_map_.end(), + event_emitter_equal_to(*this)); + assert(pos != this->node_->eventout_map_.end()); + return pos->first; + } + + /** + * @internal + * * @brief Function object for @c boost::mpl::for_each; create a * @c script_event_emitter. Index: script.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** script.h 22 Feb 2006 08:05:03 -0000 1.28 --- script.h 22 Feb 2006 15:35:09 -0000 1.29 *************** *** 138,157 **** }; ! template <typename FieldValue> ! class script_event_listener : ! public node_field_value_listener<FieldValue> { ! ! const std::string id; ! ! public: ! script_event_listener(const std::string & id, script_node & node); ! virtual ~script_event_listener() OPENVRML_NOTHROW; ! ! private: ! virtual const std::string do_eventin_id() const OPENVRML_NOTHROW; ! virtual void do_process_event(const FieldValue & value, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); ! }; typedef script_event_listener<sfbool> sfbool_listener; --- 138,142 ---- }; ! template <typename FieldValue> class script_event_listener; typedef script_event_listener<sfbool> sfbool_listener; *************** *** 193,230 **** OPENVRML_THROW1(std::bad_alloc); ! template <typename FieldValue> ! class script_event_emitter : ! public openvrml::field_value_emitter<FieldValue> { ! BOOST_CLASS_REQUIRE(FieldValue, openvrml, FieldValueConcept); ! ! script_node * node_; ! ! struct event_emitter_equal_to : ! std::unary_function<typename eventout_map_t::value_type, bool> ! { ! explicit event_emitter_equal_to( ! const script_event_emitter<FieldValue> & emitter) ! OPENVRML_NOTHROW: ! emitter_(&emitter) ! {} ! ! bool operator()( ! const typename eventout_map_t::value_type & arg) const ! { ! return this->emitter_ == &arg.second->emitter(); ! } ! ! private: ! const script_event_emitter * emitter_; ! }; ! ! public: ! script_event_emitter(script_node & node, const FieldValue & value) ! OPENVRML_NOTHROW; ! virtual ~script_event_emitter() OPENVRML_NOTHROW; ! ! private: ! virtual const std::string do_eventout_id() const OPENVRML_NOTHROW; ! }; struct script_event_emitter_creator; --- 178,182 ---- OPENVRML_THROW1(std::bad_alloc); ! template <typename FieldValue> class script_event_emitter; struct script_event_emitter_creator; *************** *** 248,252 **** class url_changed_emitter : public openvrml::mfstring_emitter { public: ! explicit url_changed_emitter(const mfstring & value) OPENVRML_NOTHROW; virtual ~url_changed_emitter() OPENVRML_NOTHROW; --- 200,205 ---- class url_changed_emitter : public openvrml::mfstring_emitter { public: ! explicit url_changed_emitter(const mfstring & value) ! OPENVRML_NOTHROW; virtual ~url_changed_emitter() OPENVRML_NOTHROW; *************** *** 270,274 **** class metadata_changed_emitter : public openvrml::sfnode_emitter { public: ! explicit metadata_changed_emitter(const sfnode & value) OPENVRML_NOTHROW; virtual ~metadata_changed_emitter() OPENVRML_NOTHROW; --- 223,228 ---- class metadata_changed_emitter : public openvrml::sfnode_emitter { public: ! explicit metadata_changed_emitter(const sfnode & value) ! OPENVRML_NOTHROW; virtual ~metadata_changed_emitter() OPENVRML_NOTHROW; *************** *** 334,403 **** }; - template <typename FieldValue> - script_node::script_event_listener<FieldValue>::script_event_listener( - const std::string & id, - script_node & node): - node_event_listener(node), - node_field_value_listener<FieldValue>(node), - id(id) - {} - - template <typename FieldValue> - script_node::script_event_listener<FieldValue>::~script_event_listener() - OPENVRML_NOTHROW - {} - - template <typename FieldValue> - const std::string - script_node::script_event_listener<FieldValue>::do_eventin_id() const - OPENVRML_NOTHROW - { - return this->id; - } - - template <typename FieldValue> - void script_node::script_event_listener<FieldValue>::do_process_event( - const FieldValue & value, - const double timestamp) - OPENVRML_THROW1(std::bad_alloc) - { - assert(dynamic_cast<openvrml::script_node *>(&this->node())); - openvrml::script_node & script_node = - dynamic_cast<openvrml::script_node &>(this->node()); - if (script_node.script_) { - script_node.script_->process_event(this->id, value, timestamp); - } - ++script_node.events_received; - } - - template <typename FieldValue> - script_node::script_event_emitter<FieldValue>:: - script_event_emitter(script_node & node, - const FieldValue & value) - OPENVRML_NOTHROW: - openvrml::event_emitter(value), - openvrml::field_value_emitter<FieldValue>(value), - node_(&node) - {} - - template <typename FieldValue> - script_node::script_event_emitter<FieldValue>::~script_event_emitter() - OPENVRML_NOTHROW - {} - - template <typename FieldValue> - const std::string - script_node::script_event_emitter<FieldValue>::do_eventout_id() const - OPENVRML_NOTHROW - { - const eventout_map_t::const_iterator pos = - std::find_if(this->node_->eventout_map_.begin(), - this->node_->eventout_map_.end(), - event_emitter_equal_to(*this)); - assert(pos != this->node_->eventout_map_.end()); - return pos->first; - } - - inline const script_node::field_value_map_t & script_node::field_value_map() const OPENVRML_NOTHROW --- 288,291 ---- |
|
From: Braden M. <br...@us...> - 2006-02-22 15:35:13
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4710 Modified Files: ChangeLog Log Message: Moved openvrml::script_node::script_event_listener<FieldValue> and openvrml::script_node::script_event_emitter<FieldValue> out of the header. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1154 retrieving revision 1.1155 diff -C2 -d -r1.1154 -r1.1155 *** ChangeLog 22 Feb 2006 08:04:58 -0000 1.1154 --- ChangeLog 22 Feb 2006 15:35:08 -0000 1.1155 *************** *** 1,4 **** --- 1,13 ---- 2006-02-22 Braden McDaniel <br...@en...> + Moved openvrml::script_node::script_event_listener<FieldValue> and + openvrml::script_node::script_event_emitter<FieldValue> out of the + header. + + * src/libopenvrml/openvrml/script.cpp + * src/libopenvrml/openvrml/script.h + + 2006-02-22 Braden McDaniel <br...@en...> + Moved openvrml::script_node::script_event_listener_creator and openvrml::script_node::script_event_emitter_creator out of the |
|
From: Braden M. <br...@us...> - 2006-02-22 08:05:14
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26054/src/libopenvrml/openvrml Modified Files: script.cpp script.h Log Message: Moved openvrml::script_node::script_event_listener_creator and openvrml::script_node::script_event_emitter_creator out of the header. Index: script.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** script.cpp 16 Feb 2006 21:30:50 -0000 1.64 --- script.cpp 22 Feb 2006 08:05:02 -0000 1.65 *************** *** 944,947 **** --- 944,981 ---- * @internal * + * @brief Function object for @c boost::mpl::for_each; create a + * @c script_event_listener. + */ + struct OPENVRML_LOCAL openvrml::script_node::script_event_listener_creator { + script_event_listener_creator( + const field_value::type_id type, + const std::string & id, + script_node & node, + boost::shared_ptr<openvrml::event_listener> & listener): + type_(type), + id_(&id), + node_(&node), + listener_(&listener) + {} + + template <typename T> + void operator()(T) const + { + if (T::field_value_type_id == this->type_) { + this->listener_->reset(new script_event_listener<T>(*this->id_, + *this->node_)); + } + } + + private: + field_value::type_id type_; + const std::string * id_; + script_node * node_; + boost::shared_ptr<openvrml::event_listener> * listener_; + }; + + /** + * @internal + * * @brief Create a Script node event listener. * *************** *** 972,975 **** --- 1006,1043 ---- * @internal * + * @brief Function object for @c boost::mpl::for_each; create a + * @c script_event_emitter. + */ + struct OPENVRML_LOCAL openvrml::script_node::script_event_emitter_creator { + script_event_emitter_creator( + script_node & node, + const openvrml::field_value & value, + std::auto_ptr<openvrml::event_emitter> & emitter): + node_(&node), + value_(&value), + emitter_(&emitter) + {} + + template <typename T> + void operator()(T) const + { + if (T::field_value_type_id == this->value_->type()) { + using boost::polymorphic_downcast; + this->emitter_->reset( + new script_event_emitter<T>( + *this->node_, + *polymorphic_downcast<const T *>(this->value_))); + } + } + + private: + script_node * node_; + const openvrml::field_value * value_; + std::auto_ptr<openvrml::event_emitter> * emitter_; + }; + + /** + * @internal + * * @brief Create a Script node event emitter. * Index: script.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** script.h 12 Feb 2006 09:40:17 -0000 1.27 --- script.h 22 Feb 2006 08:05:03 -0000 1.28 *************** *** 186,217 **** typedef script_event_listener<mfvec3d> mfvec3d_listener; ! struct OPENVRML_LOCAL script_event_listener_creator { ! script_event_listener_creator( ! const field_value::type_id type, ! const std::string & id, ! script_node & node, ! boost::shared_ptr<openvrml::event_listener> & listener): ! type_(type), ! id_(&id), ! node_(&node), ! listener_(&listener) ! {} ! ! template <typename T> ! void operator()(T) const ! { ! if (T::field_value_type_id == this->type_) { ! this->listener_->reset( ! new script_event_listener<T>(*this->id_, ! *this->node_)); ! } ! } ! ! private: ! field_value::type_id type_; ! const std::string * id_; ! script_node * node_; ! boost::shared_ptr<openvrml::event_listener> * listener_; ! }; static const boost::shared_ptr<openvrml::event_listener> --- 186,190 ---- typedef script_event_listener<mfvec3d> mfvec3d_listener; ! struct script_event_listener_creator; static const boost::shared_ptr<openvrml::event_listener> *************** *** 255,285 **** }; ! struct OPENVRML_LOCAL script_event_emitter_creator { ! script_event_emitter_creator( ! script_node & node, ! const openvrml::field_value & value, ! std::auto_ptr<openvrml::event_emitter> & emitter): ! node_(&node), ! value_(&value), ! emitter_(&emitter) ! {} ! ! template <typename T> ! void operator()(T) const ! { ! if (T::field_value_type_id == this->value_->type()) { ! using boost::polymorphic_downcast; ! this->emitter_->reset( ! new script_event_emitter<T>( ! *this->node_, ! *polymorphic_downcast<const T *>(this->value_))); ! } ! } ! ! private: ! script_node * node_; ! const openvrml::field_value * value_; ! std::auto_ptr<openvrml::event_emitter> * emitter_; ! }; static std::auto_ptr<openvrml::event_emitter> --- 228,232 ---- }; ! struct script_event_emitter_creator; static std::auto_ptr<openvrml::event_emitter> |
|
From: Braden M. <br...@us...> - 2006-02-22 08:05:10
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26054 Modified Files: ChangeLog Log Message: Moved openvrml::script_node::script_event_listener_creator and openvrml::script_node::script_event_emitter_creator out of the header. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1153 retrieving revision 1.1154 diff -C2 -d -r1.1153 -r1.1154 *** ChangeLog 22 Feb 2006 07:57:26 -0000 1.1153 --- ChangeLog 22 Feb 2006 08:04:58 -0000 1.1154 *************** *** 1,4 **** --- 1,13 ---- 2006-02-22 Braden McDaniel <br...@en...> + Moved openvrml::script_node::script_event_listener_creator and + openvrml::script_node::script_event_emitter_creator out of the + header. + + * src/libopenvrml/openvrml/script.cpp + * src/libopenvrml/openvrml/script.h + + 2006-02-22 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/node_impl_util.h (openvrml::node_impl_util::bound_node_stack<BindableNode>::bind(BindableNode&, |
|
From: Braden M. <br...@us...> - 2006-02-22 07:57:29
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21352/src/libopenvrml/openvrml Modified Files: node_impl_util.h Log Message: Fixed check to see if the node is already active. Index: node_impl_util.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node_impl_util.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** node_impl_util.h 21 Feb 2006 06:09:16 -0000 1.10 --- node_impl_util.h 22 Feb 2006 07:57:26 -0000 1.11 *************** *** 1040,1044 **** // If the node is already the active node, do nothing. // ! if (this->empty() && (&n == this->top())) { return false; } // --- 1040,1044 ---- // If the node is already the active node, do nothing. // ! if (!this->empty() && (&n == this->top())) { return false; } // |
|
From: Braden M. <br...@us...> - 2006-02-22 07:57:29
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21352 Modified Files: ChangeLog Log Message: Fixed check to see if the node is already active. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1152 retrieving revision 1.1153 diff -C2 -d -r1.1152 -r1.1153 *** ChangeLog 22 Feb 2006 04:40:05 -0000 1.1152 --- ChangeLog 22 Feb 2006 07:57:26 -0000 1.1153 *************** *** 1,2 **** --- 1,8 ---- + 2006-02-22 Braden McDaniel <br...@en...> + + * src/libopenvrml/openvrml/node_impl_util.h + (openvrml::node_impl_util::bound_node_stack<BindableNode>::bind(BindableNode&, + double)): Fixed check to see if the node is already active. + 2006-02-21 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-02-22 04:40:11
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3494 Modified Files: ChangeLog Log Message: Changed doxygen styles and images to be consistent with OpenVRML Web site theme. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1151 retrieving revision 1.1152 diff -C2 -d -r1.1151 -r1.1152 *** ChangeLog 21 Feb 2006 23:01:01 -0000 1.1151 --- ChangeLog 22 Feb 2006 04:40:05 -0000 1.1152 *************** *** 1,4 **** --- 1,20 ---- 2006-02-21 Braden McDaniel <br...@en...> + Changed doxygen styles and images to be consistent with OpenVRML + Web site theme. + + * doc/Makefile.am (MAINTANERCLEANFILES): Be more selective about + what gets cleaned in the manual subdirectory. + * doc/doxygen-header: Override CSS rules generated by doxygen to + show grayscale images instead. + * doc/manual/tab_b-openvrml.png: Added file. Grayscale image for + tabs on doxygen-generated pages. + * doc/manual/tab_l-openvrml.png: Added file. Grayscale image for + tabs on doxygen-generated pages. + * doc/manual/tab_r-openvrml.png: Added file. Grayscale image for + tabs on doxygen-generated pages. + + 2006-02-21 Braden McDaniel <br...@en...> + Removed Visual C++ 7.1 compatibility property page and enabled link-time code generation for Release configurations. |
