Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2604/src/libopenvrml/openvrml
Modified Files:
Tag: OpenVRML-0_16-BRANCH
vrml97node.cpp
Log Message:
Initial implementation of font discovery and resolution for Windows. The current code pays no attention to the FontStyle specification; but it should reliably pick a font such that text is rendered.
Index: vrml97node.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v
retrieving revision 1.108.2.3
retrieving revision 1.108.2.4
diff -C2 -d -r1.108.2.3 -r1.108.2.4
*** vrml97node.cpp 3 Sep 2006 03:52:00 -0000 1.108.2.3
--- vrml97node.cpp 19 Sep 2006 20:18:13 -0000 1.108.2.4
***************
*** 39,42 ****
--- 39,43 ----
# include <boost/algorithm/string/predicate.hpp>
# include <boost/array.hpp>
+ # include <boost/multi_index/detail/scope_guard.hpp>
# include <boost/thread.hpp>
# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
***************
*** 45,52 ****
# include FT_GLYPH_H
# include FT_OUTLINE_H
[...997 lines suppressed...]
? geometryXMin
--- 23542,23546 ----
newGeometry.coord.push_back(textVertex);
newGeometry.coord_index
! .push_back(int32(newGeometry.coord.size() - 1));
geometryXMin = (geometryXMin < textVertex.x())
? geometryXMin
***************
*** 23349,23353 ****
(this->max_extent_.sffloat::value() > 0.0)
? this->max_extent_.sffloat::value()
! : 0.0;
if (maxExtent > 0.0) {
const float currentMaxExtent = geometryXMax - geometryXMin;
--- 23567,23571 ----
(this->max_extent_.sffloat::value() > 0.0)
? this->max_extent_.sffloat::value()
! : 0.0f;
if (maxExtent > 0.0) {
const float currentMaxExtent = geometryXMax - geometryXMin;
|
