Commit Graph

555 Commits

Author SHA1 Message Date
Paolo Cignoni df1c1d2c62 Added face coloring when there is a texture (and therefore a material) 2007-07-05 14:47:04 +00:00
Paolo Cignoni c1e902f273 wedge colors now are loaded into face color if they are available. 2007-07-02 12:33:34 +00:00
Paolo Cignoni 2ffdf8f562 removed a possibly useless static kw 2007-06-25 15:24:00 +00:00
Paolo Cignoni f11076bbcd Added some std:: here and there 2007-06-25 10:21:38 +00:00
Massimiliano Corsini 5e81eca026 adjust wheel back-compatibility 2007-06-20 12:59:43 +00:00
mtarini 8379662fd6 "newline at end of file" and "endif" warnings fixed 2007-06-20 10:28:04 +00:00
Paolo Cignoni 74d325979b Added one-level undo system and sticky trackmodes. 2007-06-13 17:15:09 +00:00
Paolo Cignoni 5ac1f6fe1a Fix problem with scale 2007-06-13 09:17:14 +00:00
Paolo Cignoni ef439236b1 Very important change. No more scaling and translation in the saved file! 2007-06-12 10:15:35 +00:00
Paolo Cignoni 3535cddaaa Minor fix in DrawUglyCylinderMode() 2007-06-12 08:58:08 +00:00
Paolo Cignoni 75c0f42d92 Modify SVG Proprerties
Add   Save(vector<EdgeMeshType*> *vp, c  function that export vector of edgemesh in a single file.
2007-06-09 10:52:24 +00:00
Paolo Cignoni f354a9f445 Small gcc compiling issues 2007-05-31 09:39:56 +00:00
Paolo Cignoni dc881612b1 Added a const (and reformatted) 2007-05-29 10:09:29 +00:00
Paolo Cignoni 9554ee4245 Removed type cast warnings 2007-05-28 08:10:47 +00:00
Paolo Cignoni 3cf34fb91a Added std:: prefix to advance call 2007-05-28 07:35:21 +00:00
Paolo Cignoni 3dcf88ee2a Corrected gcc warning 2007-05-24 06:56:54 +00:00
Paolo Cignoni 97d7baf66c Corrected gcc compiling issues 2007-05-21 13:22:40 +00:00
ganovelli 22f1bbd089 added inclusion of glew.h 2007-05-16 08:44:05 +00:00
Paolo Cignoni 0fd4e977e5 Moved the dreawing code to trackmodes, some other minor changes 2007-05-15 15:00:47 +00:00
Paolo Cignoni db4c4f0944 Main restructuring. added many new modes 2007-05-15 14:59:10 +00:00
Paolo Cignoni 9ed47e4afa Utility functions for the trackmodes, first version 2007-05-15 14:57:34 +00:00
Marco Di Benedetto 1c2f0e7db7 First Commit. 2007-05-14 22:23:36 +00:00
Paolo Cignoni 2c56fe62ec Initial Commit 2007-05-14 10:32:14 +00:00
Paolo Cignoni 59dac6d418 Added ifdef for manage bigendianess of ppc machines 2007-05-11 08:21:45 +00:00
ganovelli 1b72079489 change from Tetra.h to tetra.h 2007-05-08 18:56:51 +00:00
ganovelli 2af382d25d missing return type 2007-05-08 18:56:04 +00:00
ganovelli e77e2dcf26 glTriangle added 2007-05-08 18:55:38 +00:00
ganovelli 9ff5b1a193 adde vf iterator 2007-05-08 18:55:14 +00:00
Paolo Cignoni f69f481085 resolved issue related to the parsing of CR LF under *nixes 2007-04-18 13:33:11 +00:00
Paolo Cignoni 5624d54730 Added managment of map_Ka textures (and not only map_Kd) 2007-04-18 07:01:26 +00:00
Paolo Cignoni 254ae3f364 Removed garbage chars at the beginning of the file 2007-04-16 08:37:53 +00:00
Paolo Cignoni 4fa383f388 Update to the new texture syntax 2007-03-20 16:47:50 +00:00
mtarini e1f61a9f6f Texture coord name change! "TCoord" and "Texture" are BAD. "TexCoord" is GOOD. 2007-03-12 16:40:17 +00:00
granzuglia 0aa6e033da fixed bug about string iterator 2007-03-08 12:21:26 +00:00
ganovelli 9ab9ea73cc added include to tcoord2 2007-03-08 11:27:52 +00:00
Paolo Cignoni 746bb8ebf6 Removed initialization of a single face in the main parsing loop. Single face cannot exist anymore with OCF. Moved into the tristrip parsing section. 2007-03-03 02:28:59 +00:00
Paolo Cignoni ece2f97c8b Added reflection Name 2007-02-26 01:30:02 +00:00
Paolo Cignoni 5d4900c29f Added cast for mac compiling 2007-02-22 09:17:56 +00:00
Paolo Cignoni 55bf686991 Added guards for opengl including in mac compiling 2007-02-22 09:17:29 +00:00
ganovelli 6f6235a93b moved the vn and fn in the writig of the header 2007-02-21 10:18:24 +00:00
ganovelli 5a2dccac0b added GetHeader 2007-02-21 10:16:49 +00:00
Paolo Cignoni 3b83203044 Added missing typename 2007-02-18 08:01:07 +00:00
Marco Di Benedetto e8df3af443 Commented out strange abort in WriteMaterials() 2007-02-16 21:12:13 +00:00
ganovelli 34495aea67 added HasPerFaceFlag 2007-02-14 16:07:41 +00:00
ganovelli fd0495034a a wrong "!" corrected 2007-02-14 15:40:20 +00:00
ganovelli 30fb113d3c added treatment of HasPerVertexFlags absent 2007-02-14 15:30:13 +00:00
ganovelli f9e26cce1a working draft of VCG Mesh Image importer and exporter. Does not consider optional attributes. The mesh atributes are only vn and fn (no bbox, texture coordiantes) 2007-02-14 01:20:37 +00:00
mtarini 831310930b added a few typecasts to QualityTypefor vertices and faces (avoids warinings when short int or int is used for Quality). 2007-02-02 00:29:33 +00:00
Paolo Cignoni 13a26e1b89 Added cast for mac compiling 2007-01-18 01:26:23 +00:00
mtarini 722bd7a696 added "ToAscii" and "SetFromAscii" methods to load/store current trackball status from/to ascii strings
(intended uses: clipboard operations and comments inside png snapshots!)
2007-01-15 15:04:15 +00:00
Paolo Cignoni bbcb8dc26b Removed a bug in the managment of non triangular faces 2006-12-21 00:36:17 +00:00
matteodelle 17ebec98c6 minor eroor correction on variable names 2006-12-18 16:02:57 +00:00
Marco Callieri 02f23020fc added a function to approximate a far plane value given a shot and the mesh bbox 2006-12-18 15:26:24 +00:00
matteodelle 5360cc0977 *** empty log message *** 2006-12-18 14:28:07 +00:00
Marco Callieri a344d59446 camera+shot revamp: changed field names to something with more sense, cleaning of various functions, correction of minor bugs/incongruences, removal of the infamous reference in shot. 2006-12-18 09:46:39 +00:00
Paolo Cignoni 1cb21d78f1 Slightly changed the colormaterial mode for the flatwire 2006-12-12 11:06:58 +00:00
Paolo Cignoni 6d5f52174b Removed use of tellg that is broken in current version of mingw 2006-12-12 02:47:12 +00:00
ganovelli ebfacd2db3 first draft of the class the draw a Pos 2006-12-10 19:59:28 +00:00
Paolo Cignoni 67007b3691 Added a class prototype for avoiding the inclusion of tetra.h 2006-12-07 00:39:22 +00:00
Paolo Cignoni c88392e13b Corrected bug in the management of deleted vertices 2006-12-07 00:37:58 +00:00
Paolo Cignoni 9effd53926 add method for automatic hole filling.... 2006-12-04 12:01:23 +00:00
Paolo Cignoni aa10ac62be Removed useless include <tetra.h> 2006-12-04 09:27:13 +00:00
Paolo Cignoni f48e5bc1dd Added save with (unused) callback 2006-11-30 22:49:32 +00:00
Paolo Cignoni 4a37245478 Corrected bug in exporting mesh with deleted vertices 2006-11-30 22:48:06 +00:00
Paolo Cignoni d2296156b0 Removed nonstandard include io.h 2006-11-28 11:36:25 +00:00
Paolo Cignoni cb29c783f2 Removed flags initialization. no more necessary 2006-11-27 10:36:13 +00:00
Paolo Cignoni 8ae108fc2a small gcc compiling issues 2006-11-21 22:34:58 +00:00
Paolo Cignoni c7909c67f1 Added comments for documentation 2006-11-21 19:23:50 +00:00
Paolo Cignoni 83bd514579 Added Comments for documentation 2006-11-21 19:22:53 +00:00
Paolo Cignoni 8738390450 ReWrote loadMask. Now shorter and faster. 2006-11-21 10:56:41 +00:00
Paolo Cignoni 49daa83ca1 Corrected bug: missing a newline in the header 2006-11-17 16:12:13 +00:00
Paolo Cignoni b9eebf7d98 Add File I/O 2006-11-16 11:24:44 +00:00
Paolo Cignoni 48669a758a first version 2006-11-16 09:44:35 +00:00
Paolo Cignoni 53f1b1c12d bug due to wrong access to eventually unexistent FaceColor 2006-11-09 07:51:44 +00:00
granzuglia 609ee7db96 1) removed problems with gcc
2) removed stupid bug setContent
3) removed the diamond inherits in AddiotionalInfoDAE
4) removed some compiler warnings
2006-11-09 02:24:41 +00:00
granzuglia deb5402d35 fixed the terrible bug (QDomDocument&) node.toElement() 2006-11-08 22:25:35 +00:00
granzuglia fa68f489cc import, export and util semantically-correct for visual studio 2005 2006-11-08 19:49:57 +00:00
granzuglia 654ababe38 full (almost...) texture supports 2006-11-08 16:59:22 +00:00
Paolo Cignoni 288172b62f Corrected management of capabilities and masks 2006-11-08 15:48:50 +00:00
granzuglia 702fe3dd63 saving of per-vertex normals forced 2006-11-07 22:43:12 +00:00
Paolo Cignoni 642158fc32 many gcc compiling issues 2006-11-07 17:22:53 +00:00
granzuglia c64e319d7b added support for texture-mapping 2006-11-06 09:31:43 +00:00
granzuglia f0b3eeb258 final version (almost) 2006-11-06 08:45:13 +00:00
granzuglia 434a49f499 semi-final version 2006-11-06 05:29:40 +00:00
granzuglia 2b46528dec enhanced version of exporter 2006-11-06 00:11:14 +00:00
granzuglia 0812a3d1bc drastically augmented the save function performance 2006-11-05 21:52:25 +00:00
granzuglia 1510076b65 added support for transformations 2006-11-05 19:09:04 +00:00
granzuglia 2f79d55207 now load file without instance_geometry 2006-11-05 15:40:51 +00:00
granzuglia ab38499165 minor changes 2006-11-05 10:45:41 +00:00
granzuglia fa90f7d267 little bug fixed 2006-11-04 16:34:17 +00:00
granzuglia d83d458e02 full working version of collada's exporter 2006-11-04 16:28:40 +00:00
granzuglia a0981fa6c3 fixed bug: &(*filename.end()) ---> &(*filename.rbegin()) 2006-11-04 14:01:00 +00:00
granzuglia 1816e73b0a some minor changes 2006-11-03 13:09:15 +00:00
granzuglia 04fd13bd8a debugged version 2006-11-02 23:58:33 +00:00
granzuglia de752ec206 added new file for DAE importer/exporter 2006-11-02 23:57:42 +00:00
granzuglia b8bead6b42 good version 2006-11-02 19:15:29 +00:00
granzuglia 9da13efd77 the new collada importer 2006-11-02 18:15:55 +00:00
Paolo Cignoni 132ffb7d82 Added type cast (in order to remove warnings) 2006-10-27 08:55:15 +00:00
Federico Ponchio 4b46ed3c4e Aggiunti un paio di typename... al solito. 2006-10-14 16:26:26 +00:00
Paolo Cignoni 7c72709af7 Added a comment on an assert 2006-10-14 00:39:22 +00:00
Paolo Cignoni 1b9a2d40a2 Allowed the correct loading of meshes with 0 faces 2006-10-14 00:18:42 +00:00
Paolo Cignoni d6efeda9bf Changed barycenter functor to the new Baricenter(face) style 2006-10-13 13:10:05 +00:00
Paolo Cignoni 162c7256e5 Added casts to remove warnings 2006-10-09 19:58:08 +00:00
Paolo Cignoni b9b2725478 Removed the default use of the OpenGL transpose extension. Added two method for direct (non transposed) matrix multiplication and getting 2006-10-09 19:56:09 +00:00
Marco Di Benedetto d878081824 First Commit. 2006-10-05 18:34:13 +00:00
Paolo Cignoni 5652756eaf First really working version. Previous code saved a wrong off.... 2006-09-29 13:56:27 +00:00
granzuglia 667a071b31 #include changed 2006-09-22 06:24:01 +00:00
granzuglia 36b104b62e additionalinfo is added 2006-09-22 06:21:55 +00:00
granzuglia 921b2b773b export dae with cool new feature 2006-09-22 06:04:22 +00:00
granzuglia 3d8ed2e408 collada importer with texture support 2006-09-22 06:01:40 +00:00
Paolo Cignoni 391470c093 Removed bug in the creation of the material filename 2006-09-18 12:14:38 +00:00
Paolo Cignoni 7310eb3f58 Corrected return value of save function (zero is no error) 2006-09-18 08:55:33 +00:00
Paolo Cignoni 74a69d1848 Reverted to version 1.17. Version 1.18 was wrongly done starting from a outdated version. 2006-08-30 07:01:54 +00:00
Paolo Cignoni c5e02633d8 *** empty log message *** 2006-08-23 15:41:32 +00:00
granzuglia 9bc7cd795f fix the multimesh bug also in the other Open function 2006-08-11 11:12:01 +00:00
granzuglia f1dc38a271 finally fix the multimesh bug! 2006-08-11 11:09:40 +00:00
granzuglia 68324d999c fundamental changes in order to operate with other collada's viewer 2006-07-27 09:44:25 +00:00
Paolo Cignoni 94f8e5f4d5 Reversed the direction of wheel scaling and added middle mouse panning 2006-07-26 13:54:45 +00:00
Paolo Cignoni 73751c6e76 some extra typename directives for compilation with gcc 4.1 on linux 2006-07-12 12:12:36 +00:00
Paolo Cignoni ffc18db244 Major rewrite. Now shorter and more robust. 2006-07-09 05:41:17 +00:00
Paolo Cignoni 3c322d2206 Uncommented obj export. Now obj saving is enabled by default 2006-07-09 05:32:15 +00:00
granzuglia ff4d9d011d updated the importer and added the first version of the exporter 2006-07-07 06:55:41 +00:00
ganovelli 89c3034fd9 *** empty log message *** 2006-07-06 12:38:32 +00:00
Paolo Cignoni e7200db32e remove warning C4244 2006-07-03 13:46:34 +00:00
ganovelli a24e269ac4 Aggiunto namespace tetra, cambiato riferimento a puntatore 2006-06-29 13:25:46 +00:00
granzuglia 81a42f1925 newer version 2006-06-29 07:20:16 +00:00
Paolo Cignoni ddf75dd249 added initial test on end of file in the tokenize 2006-06-21 04:26:26 +00:00
granzuglia 962e6d809d patch a bug on a normal's indices 2006-06-20 12:44:54 +00:00
granzuglia db9b756e17 fixed error on empty mesh 2006-06-19 15:13:10 +00:00
granzuglia 3874f80d0a first version 2006-06-14 09:47:21 +00:00
Paolo Cignoni fcf6fa4f6b file length is now computed using fseek and ftell 2006-06-10 12:49:05 +00:00
Paolo Cignoni 89266673a1 fixed some bugs 2006-06-08 16:20:52 +00:00
Paolo Cignoni 8bfbf1111d Changes for compilation on linux AMD64. Some remarks: Linux filenames are case-sensitive. _fileno and _filelength do not exist on linux 2006-06-06 14:35:32 +00:00
Paolo Cignoni 38ec59e185 This class encapsulate a filter for importing ptx meshes. 2006-05-29 11:54:44 +00:00
Paolo Cignoni 283834183d gcc dislike doubleline comments; removed. 2006-05-25 09:40:14 +00:00
Paolo Cignoni 47e62b3c6e Removed all GLUT dependencies! 2006-05-25 09:22:58 +00:00
Paolo Cignoni de11419338 Corrected bug in the pickface to comply deleted faces and to allow to have unsorted results. 2006-05-25 04:42:29 +00:00
Paolo Cignoni a6d3a2c1ea Added mask clamping to the effective capabilities of the mesh 2006-05-21 07:01:04 +00:00
Paolo Cignoni faa420f9b0 Added ClampMask function 2006-05-21 06:58:55 +00:00
Paolo Cignoni 9a7c06e50a Wedge colors are loaded into facecolor only if specified in the incoming pi.mask 2006-05-16 15:01:30 +00:00
Paolo Cignoni 0308e552d0 Corrected bug: mismatch in the index of confidence vertex property (8 instead of 11)
Changed HasPerFaceColor to the new syntax (HasPerFaceColor(m)  instead of FaceType::HasFaceColor() )
2006-05-03 21:21:21 +00:00
Paolo Cignoni 7e9d50694e Added support for progress callback 2006-05-03 21:19:34 +00:00
Paolo Cignoni 2754d4697d changes needed for compilation on linux 64b with gcc 3.4.5 2006-04-11 09:48:04 +00:00
Paolo Cignoni 2705825f50 Added managemnt of non critical errors 2006-03-29 09:27:07 +00:00
Paolo Cignoni 462fa9effe extra includes necessary for compilation of meshlab on AMD 64 with gcc 3.4.5 2006-03-29 09:25:49 +00:00
Massimiliano Corsini 2a7eef61f2 reset to zero warnings 2006-03-29 08:51:16 +00:00
Massimiliano Corsini ad53facf1f Fix bug in texture coordinates reading 2006-03-29 08:50:10 +00:00
Massimiliano Corsini bfe721721e Minor change in LoadMask 2006-03-29 08:16:31 +00:00
Massimiliano Corsini a467768485 Fix several bugs
Add LoadMask
Improve parsing capabilities (account for unexpected newline)
2006-03-29 08:15:46 +00:00
Massimiliano Corsini 733bdcbc78 Add LoadMask to OFF importer 2006-03-29 08:14:20 +00:00
Paolo Cignoni 309fa30451 Wrong matrix type in cone (thx Maarten) 2006-03-29 07:54:03 +00:00
Paolo Cignoni cab787170f added missing std:: 2006-03-27 07:18:22 +00:00
Paolo Cignoni f4f2c70cc9 Added generic LoadMask 2006-03-27 07:17:49 +00:00
Paolo Cignoni 711ca3fe14 renamed 2006-03-07 13:23:39 +00:00
Paolo Cignoni 97a94f6369 changed include of io_material 2006-03-07 13:20:40 +00:00
Paolo Cignoni e71a29248f First Release with OBJ import support 2006-03-07 13:19:29 +00:00
Paolo Cignoni e20aab33b4 Corrected bug in wrong counting the parsed tokens during the reading of color components 2006-03-01 08:25:30 +00:00
Massimiliano Corsini 31b0b8aa0d Fix loading mask update 2006-02-28 15:18:10 +00:00
Massimiliano Corsini b245068038 Fix comments 2006-02-28 14:50:00 +00:00
Massimiliano Corsini a14635f2fe remove qt include 2006-02-28 14:38:09 +00:00
Federico Ponchio cc73ff49c9 for(ii... -> for(int ii 2006-02-28 13:25:48 +00:00
Paolo Cignoni d70397ef2f added relative Path of the Lib3ds library 2006-02-17 23:53:36 +00:00
Paolo Cignoni 897721f451 transfer of Export_3ds.h, Export_obj.h, Io_3ds_obj_material.h from Meshlab to vcg 2006-02-16 19:28:36 +00:00
Massimiliano Corsini 947ecf364e Add reference plane support 2006-02-16 15:16:51 +00:00
Massimiliano Corsini 3632a79352 Decouple SVG properties and exporter for simmetry with the other exporter 2006-02-15 15:40:06 +00:00
Massimiliano Corsini be5d721eef first working version 2006-02-13 16:18:09 +00:00
Paolo Cignoni 95153f03dc Added Scale and Translate methods.
Added many drawing hints and raised the default num. of steps when drawing circles.
Added MouseDown without coords (for remembering changes of keys modifiers)
Added ZMode to the default modes under Alt+left
Added DrawPostApply (to be completed)
2006-02-13 13:15:52 +00:00
Paolo Cignoni 07613df38d Added Zmode for moving objects along the perpendicular to the viewplane 2006-02-13 13:10:27 +00:00
Paolo Cignoni c01d03e1ee Removed glut. Added ifdef guards and namespace.
Added bool return value to the pick function
2006-02-13 13:06:34 +00:00
Paolo Cignoni 1f2ff388d2 Removed glew inclusion 2006-02-13 13:05:05 +00:00
Massimiliano Corsini 9e2b3380b8 Fix typo 2006-02-10 16:14:53 +00:00
Paolo Cignoni df65425b35 Refactored import. No more duplicated code 2006-02-10 08:14:32 +00:00
Massimiliano Corsini bc26bbbc8e Expose load mask 2006-02-09 16:04:45 +00:00
Massimiliano Corsini ce975c026d Update load mask 2006-02-09 15:56:34 +00:00
Massimiliano Corsini e12695f3ea Insert Laurent Saboret modifications
Add color components handling
2006-02-09 15:15:56 +00:00
Paolo Cignoni 287fd21a07 Switched from rough zoffset to glpolygonoffset for hiddenline and flatlines modes. Less zfighting... 2006-02-09 10:00:39 +00:00
Massimiliano Corsini 99735eeb1e Renamed UnexpectedEOF as InvalidFile and
added UnsupportedFormat and ErrorNotTriangularFace (by Laurent Saboret)
2006-02-06 13:11:01 +00:00
Massimiliano Corsini 7da3794f20 Remove signed/unsigned warning 2006-02-03 09:46:24 +00:00
Paolo Cignoni 96ce1e8a4a Added mask filling in open 2006-01-30 15:02:50 +00:00
Paolo Cignoni b32218acdc Added GetExportMaskCapability 2006-01-30 13:43:59 +00:00
Massimiliano Corsini a278daab9e fix signed/unsigned mismatch 2006-01-27 09:11:48 +00:00
Massimiliano Corsini bdd5b4f585 Fix signed/unsigned mismatch 2006-01-27 09:09:10 +00:00
Paolo Cignoni 390a724ff7 Uniformed return type to the style of Open. Now every export function returns 0 in case of success. 2006-01-13 15:47:43 +00:00
Paolo Cignoni 1cb45963f9 Corrected small bugs on rotating after scaling+translating
changed void PlaneMode::Apply and void SphereMode::Apply
2006-01-12 15:40:05 +00:00
matteodelle 060df82dd4 *** empty log message *** 2006-01-11 16:06:25 +00:00
Paolo Cignoni 9f8db472e2 Added use of Callback 2006-01-11 10:37:45 +00:00
Paolo Cignoni 6046c3b80b Removed warning for unused vars 2006-01-11 10:37:12 +00:00
Paolo Cignoni eb11ec57e0 Changed ply::PlyMask to io::Mask 2006-01-10 13:26:38 +00:00
Paolo Cignoni 6dca4be1ab Changed ply::PlyMask to io::Mask 2006-01-10 13:20:42 +00:00
Paolo Cignoni edc2f8532d add namespace vcg:: 2006-01-10 12:22:34 +00:00
Paolo Cignoni 20b3385c59 fix some bugs 2006-01-04 16:39:29 +00:00
Paolo Cignoni 0e28dcfe31 Corrected use of mask and callback in function Open(m,filename,mask,callback); 2006-01-04 16:17:03 +00:00
Paolo Cignoni e64b6d7849 Added callback managment on loading of binary stl 2006-01-04 16:14:43 +00:00
Nico Pietroni e9b8ee44e1 unified use of float in drawing methods 2006-01-03 11:13:25 +00:00
Paolo Cignoni cc15fbcde1 Added support for per vertex color stored as 'diffuse_xxx' property 2005-12-30 22:30:43 +00:00
Paolo Cignoni d32db6dd2a add test (tm==TMPerWedgeMulti) 2005-12-15 14:05:59 +00:00
Paolo Cignoni 67528dcf14 multiple texture support 2005-12-14 00:18:43 +00:00
Federico Ponchio d652973606 glut->GL/glut (for real this time) 2005-12-06 14:11:15 +00:00
ganovelli 45dc280239 minor bug 2005-12-06 10:42:59 +00:00
ganovelli 03d96c24b2 *** empty log message *** 2005-12-03 09:36:28 +00:00