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-08-31 07:28:15
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32053 Modified Files: ChangeLog Log Message: Added missing "using openvrml::make_vec3f". Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1320 retrieving revision 1.1321 diff -C2 -d -r1.1320 -r1.1321 *** ChangeLog 31 Aug 2006 06:45:30 -0000 1.1320 --- ChangeLog 31 Aug 2006 07:28:13 -0000 1.1321 *************** *** 1,4 **** --- 1,16 ---- 2006-08-31 Braden McDaniel <br...@en...> + * src/libopenvrml-gl/openvrml/gl/viewer.cpp + (trackball(float, float, float, float): Added missing "using + openvrml::make_vec3f". + (computeExtrusion_(const std::vector<openvrml::rotation> &, const + std::vector<openvrml::vec2f> &, const + std::vector<openvrml::vec2f>&, const + std::vector<openvrml::vec3f>&, std::vector<openvrml::vec3f> &, + std::vector<openvrml::vec2f> &)): Added missing "using + openvrml::make_vec3f". + + 2006-08-31 Braden McDaniel <br...@en...> + Made openvrml::color, openvrml::color_rgba, openvrml::vec2f, openvrml::vec2d, openvrml::vec3f, openvrml::vec3d, |
|
From: Braden M. <br...@us...> - 2006-08-31 06:46:04
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14506 Modified Files: ChangeLog Log Message: Made openvrml::color, openvrml::color_rgba, openvrml::vec2f, openvrml::vec2d, openvrml::vec3f, openvrml::vec3d, openvrml::rotation, openvrml::mat4f, and openvrml::quatf POD-structs. This allows safe usage of these types in C APIs. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1319 retrieving revision 1.1320 diff -C2 -d -r1.1319 -r1.1320 *** ChangeLog 31 Aug 2006 06:30:51 -0000 1.1319 --- ChangeLog 31 Aug 2006 06:45:30 -0000 1.1320 *************** *** 1,4 **** --- 1,523 ---- 2006-08-31 Braden McDaniel <br...@en...> + Made openvrml::color, openvrml::color_rgba, openvrml::vec2f, + openvrml::vec2d, openvrml::vec3f, openvrml::vec3d, + openvrml::rotation, openvrml::mat4f, and openvrml::quatf + POD-structs. This allows safe usage of these types in C APIs. + + * src/libopenvrml/openvrml/Vrml97Parser.g (rotationValue): Use + construction functions instead of constructors. + * src/libopenvrml/openvrml/basetypes.cpp + (openvrml::color::color()): Removed constructor; use + openvrml::make_color() instead. + (openvrml::color::color(const float (&)[3])): Removed constructor; + use openvrml::make_color(const float (&)[3]) instead. + (openvrml::color::color(float, float, float)): Removed + constructor; use openvrml::make_color(float, float, float) + instead. + (openvrml::make_color()): Added function. + (openvrml::make_color(const float (&)[3])): Added function. + (openvrml::make_color(float, float, float)): Added function. + (openvrml::color_rgba::color_rgba()): Removed constructor; use + openvrml::make_color_rgba() instead. + (openvrml::color_rgba::color_rgba(const float (&)[4])): Removed + constructor; use openvrml::make_color_rgba(const float (&)[4]) + instead. + (openvrml::color_rgba::color_rgba(float, float, float, float)): + Removed constructor; use openvrml::make_color_rgba(float, float, + float, float) instead. + (openvrml::make_color_rgba()): Added function. + (openvrml::make_color_rgba(const float (&)[4])): Added function. + (openvrml::make_color_rgba(float, float, float, float)): Added + function. + (openvrml::vec2f::vec2f()): Removed constructor; use + openvrml::make_vec2f() instead. + (openvrml::vec2f::vec2f(const float (&)[2])): Removed constructor; + use openvrml::make_vec2f(const float (&)[2]) instead. + (openvrml::vec2f::vec2f(float, float)): Removed constructor; use + openvrml::make_vec2f(float, float) instead. + (openvrml::vec2f::operator-()): Use make_vec2f instead of + constructor. + (openvrml::make_vec2f()): Added function. + (openvrml::make_vec2f(const float (&)[2])): Added function. + (openvrml::make_vec2f(float, float)): Added function. + (openvrml::vec2d::vec2d()): Removed constructor; use + openvrml::make_vec2d() instead. + (openvrml::vec2d::vec2d(const double (&)[2])): Removed + constructor; use openvrml::make_vec2d(const double (&)[2]) + instead. + (openvrml::vec2d::vec2d(double, double)): Removed constructor; use + openvrml::make_vec2d(double, double) instead. + (openvrml::vec2d::operator-()): Use make_vec2d instead of + constructor. + (openvrml::make_vec2d()): Added function. + (openvrml::make_vec2d(const double (&)[2])): Added function. + (openvrml::make_vec2d(double, double)): Added function. + (openvrml::vec3f::vec3f()): Removed constructor; use + openvrml::make_vec3f() instead. + (openvrml::vec3f::vec3f(const float (&)[3])): Removed constructor; + use openvrml::make_vec3f(const float (&)[3]) instead. + (openvrml::vec3f::vec3f(float, float, float)): Removed + constructor; use openvrml::make_vec3f(float, float, float) + instead. + (openvrml::vec3f::operator-()): Use make_vec3f instead of + constructor. + (openvrml::make_vec3f()): Added function. + (openvrml::make_vec3f(const float (&)[3])): Added function. + (openvrml::make_vec3f(float, float, float)): Added function. + (openvrml::vec3d::vec3d()): Removed constructor; use + openvrml::make_vec3d() instead. + (openvrml::vec3d::vec3d(const double (&)[3])): Removed + constructor; use openvrml::make_vec3d(const double (&)[3]) + instead. + (openvrml::vec3d::vec3d(double, double, double)): Removed + constructor; use openvrml::make_vec3d(double, double, double) + instead. + (openvrml::vec3d::operator-()): Use make_vec3d instead of + constructor. + (openvrml::make_vec3d()): Added function. + (openvrml::make_vec3d(const double (&)[3])): Added function. + (openvrml::make_vec3d(double, double, double)): Added function. + (openvrml::rotation::rotation()): Removed constructor; use + openvrml::make_rotation() instead. + (openvrml::rotation::rotation(const float (&)[4])): Removed + constructor; use openvrml::make_rotation(const float (&)[4]) + instead. + (openvrml::rotation::rotation(float, float, float, float)): + Removed constructor; use openvrml::make_rotation(float, float, + float, float) instead. + (openvrml::rotation::rotation(const vec3f &, float)): Removed + constructor; use openvrml::make_rotation(const vec3f &, float) + instead. + (openvrml::rotation::rotation(const vec3f &, const vec3f &)): + Removed constructor; use openvrml::make_rotation(const vec3f &, + const vec3f &) instead. + (openvrml::rotation::rotation(const quatf &)): Removed + constructor; use openvrml::make_rotation(const quatf &) instead. + (openvrml::rotation::operator*=(const rotation &)): Use + make_rotation, make_quatf instead of constructors. + (openvrml::rotation::slerp(const rotation &, float)): Use + make_rotation, make_quatf instead of constructors. + (openvrml::make_rotation()): Added function. + (openvrml::make_rotation(const float (&)[4])): Added function. + (openvrml::make_rotation(float, float, float, float)): Added + function. + (openvrml::make_rotation(const vec3f &, float)): Added function. + (openvrml::make_rotation(const vec3f &, const vec3f &)): Added + function. + (openvrml::rotation::rotation(const quatf &)): Removed + constructor; use openvrml::make_rotation(const quatf &) instead. + (is_normalized::operator()() const): Use make_vec3f instead of + constructor. + (openvrml::mat4f::rotation(const openvrml::rotation &)): Removed + function; use openvrml::make_rotation_mat4f(const rotation &) + instead. + (openvrml::mat4f::rotation(const quatf &)): Removed function; use + openvrml::make_rotation_mat4f(const quatf &) instead. + (openvrml::mat4f::scale(float)): Removed function; use + openvrml::make_scale_mat4f(float) instead. + (openvrml::mat4f::scale(const vec3f &)): Removed function; use + openvrml::make_scale_mat4f(const vec3f &) instead. + (openvrml::mat4f::translation(const vec3f &)): Removed function; + use openvrml::make_translation_mat4f(const vec3f &) instead. + (openvrml::mat4f::transformation(const vec3f &, const + openvrml::rotation &, const vec3f &, const openvrml::rotation &, + const vec3f &)): Removed function; use + openvrml::make_transformation_mat4f(const vec3f &, const + openvrml::rotation &, const vec3f &, const openvrml::rotation &, + const vec3f &) instead. + (openvrml::mat4f::mat4f()): Removed constructor; use + openvrml::make_mat4f() instead. + (openvrml::mat4f::mat4f(float, float, float, float, float, float, + float, float, float, float, float, float, float, float, float, + float)): Removed constructor; use openvrml::make_mat4f(float, + float, float, float, float, float, float, float, float, float, + float, float, float, float, float, float) instead. + (openvrml::mat4f::mat4f(const float[])): Removed constructor; use + openvrml::make_mat4f(const float[]) instead. + (openvrml::mat4f::mat4f(const float (&)[4][4])): Removed + constructor; use openvrml::make_mat4f(const float (&)[4][4]) + instead. + (openvrml::mat4f::transformation(vec3f &, openvrml::rotation &, + vec3f &)): Use make_vec3f, make_quatf, and make_rotation instead + of constructors. + (openvrml::mat4f::transpose() const): Use aggregate initializer + instead of constructor. + (openvrml::make_rotation_mat4f(const openvrml::rotation &)): Added + function. + (openvrml::make_rotation_mat4f(const quatf &)): Added function. + (openvrml::make_scale_mat4f(float)): Added function. + (openvrml::make_scale_mat4f(const vec3f &)): Added function. + (openvrml::make_translation_mat4f(const vec3f &)): Added function. + (openvrml::make_transformation_mat4f(const vec3f &, const + openvrml::rotation &, const vec3f &, const openvrml::rotation &, + const vec3f &)): Added function. + (openvrml::make_mat4f()): Added function. + (openvrml::make_mat4f(float, float, float, float, float, float, + float, float, float, float, float, float, float, float, float, + float)): Added function. + (openvrml::make_mat4f(const float[])): Added function. + (openvrml::make_mat4f(const float (&)[4][4])): Added function. + (openvrml::quatf::quatf()): Removed constructor; use + openvrml::make_quatf() instead. + (openvrml::quatf::quatf(float, float, float, float)): Removed + constructor; use openvrml::make_quatf(float, float, float, float) + instead. + (openvrml::quatf::quatf(const float (&)[4])): Removed constructor; + use openvrml::make_quatf(const float (&)[4]) instead. + (openvrml::quatf::quatf(const mat4f &)): Removed constructor; use + openvrml::make_quatf(const mat4f &) instead. + (openvrml::quatf::quatf(const rotation &)): Removed constructor; + use openvrml::make_quatf(const rotation &) instead. + (openvrml::quatf::operator*=(const quatf &)): Use make_quatf + instead of constructor. + (openvrml::quatf::conjugate() const): Use aggregate initializer + instead of constructor. + (openvrml::quatf::normalize() const): Use aggregate initializer + instead of constructor. + (openvrml::make_quatf()): Added function. + (openvrml::make_quatf(float, float, float, float)): Added + function. + (openvrml::make_quatf(const float (&)[4])): Added function. + (openvrml::make_quatf(const mat4f &)): Added function. + (openvrml::make_quatf(const rotation &)): Added function. + * src/libopenvrml/openvrml/basetypes.h + (openvrml::color): Changed to struct; removed unnecessary friend + declaration for operator>>; removed constructor declarations. + (openvrml::make_color()): Added function declaration. + (openvrml::make_color(const float (&)[3])): Added function + declaration. + (openvrml::make_color(float, float, float)): Added function + declaration. + (openvrml::color_rgba): Changed to struct; removed unnecessary + friend declaration for operator>>; removed constructor + declarations. + (openvrml::make_color_rgba()): Added function declaration. + (openvrml::make_color_rgba(const float (&)[4])): Added function + declaration. + (openvrml::make_color_rgba(float, float, float, float)): Added + function declaration. + (openvrml::vec2f): Changed to struct; removed unnecessary friend + declaration for operator>>; removed constructor declarations. + (openvrml::make_vec2f()): Added function declaration. + (openvrml::make_vec2f(const float (&)[2])): Added function + declaration. + (openvrml::make_vec2f(float, float)): Added function declaration. + (openvrml::vec2d): Changed to struct; removed unnecessary friend + declaration for operator>>; removed constructor declarations. + (openvrml::make_vec2d()): Added function declaration. + (openvrml::make_vec2d(const double (&)[2])): Added function + declaration. + (openvrml::make_vec2d(double, double)): Added function + declaration. + (openvrml::vec3f): Changed to struct; removed unnecessary friend + declaration for operator>>; removed constructor declarations. + (openvrml::make_vec3f()): Added function declaration. + (openvrml::make_vec3f(const float (&)[3])): Added function + declaration. + (openvrml::make_vec3f(float, float, float)): Added function + declaration. + (openvrml::vec3d): Changed to struct; removed unnecessary friend + declaration for operator>>; removed constructor declarations. + (openvrml::make_vec3d()): Added function declaration. + (openvrml::make_vec3d(const double (&)[3])): Added function + declaration. + (openvrml::make_vec3d(double, double, double)): Added function + declaration. + (openvrml::rotation): Changed to struct; removed constructor + declarations. + (openvrml::make_rotation()): Added function declaration. + (openvrml::make_rotation(const float (&)[4])): Added function + declaration. + (openvrml::make_rotation(float, float, float, float)): Added + function declaration. + (openvrml::make_rotation(const vec3f &, float)): Added function + declaration. + (openvrml::make_rotation(const vec3f &, const vec3f &)): Added + function declaration. + (openvrml::make_rotation(const quatf &)): Added function + declaration. + (openvrml::rotation::axis()) const): Use make_vec3f instead of + constructor. + (openvrml::mat4f): Changed to struct; changed static creation + functions to be nonmembers; removed constructor declarations. + (openvrml::make_mat4f()): Added function declaration. + (openvrml::make_mat4f(float, float, float, float, float, float, + float, float, float, float, float, float, float, float, float, + float)): Added function declaration. + (openvrml::make_mat4f(const float[])): Added function declaration. + (openvrml::make_mat4f(const float (&)[4][4])): Added function + declaration. + (openvrml::make_rotation_mat4f(const rotation &)): Added function + declaration. + (openvrml::make_rotation_mat4f(const quatf &)): Added function + declaration. + (openvrml::make_scale_mat4f(float)): Added function declaration. + (openvrml::make_scale_mat4f(const vec3f &)): Added function + declaration. + (openvrml::make_translation_mat4f(const vec3f &)): Added function + declaration. + (openvrml::make_transformation_mat4f(const vec3f &, const rotation + &, const vec3f &, const rotation &, const vec3f &)): Added + function declaration. + (openvrml::quatf): Changed to struct; removed unnecessary friend + declaration for operator>>; removed constructor declarations. + (openvrml::make_quatf()): Added function declaration. + (openvrml::make_quatf(float, float, float, float)): Added function + declaration. + (openvrml::make_quatf(const float (&)[4])): Added function + declaration. + (openvrml::make_quatf(const rotation &)): Added function + declaration. + (openvrml::make_quatf(const mat4f &)): Added function declaration. + * src/libopenvrml/openvrml/bounding_volume.cpp + (openvrml::bounding_sphere::do_extend(const bounding_sphere &)): + Use make_vec3f instead of constructor. + (openvrml::bounding_sphere::do_maximize()): Use make_vec3f instead + of constructor. + (openvrml::bounding_sphere::do_ortho_transform(const mat4f &)): + Use make_vec3f instead of constructor. + (openvrml::bounding_sphere::do_transform(const mat4f &)): Use + make_vec3f instead of constructor. + * src/libopenvrml/openvrml/browser.cpp + (default_viewpoint::transformation() const): Use make_vec3f, + make_rotation instead of constructors. + (openvrml::browser::render()): Use make_color, make_vec3f instead + of constructors. + * src/libopenvrml/openvrml/script.cpp + (js_::SFColor::initObject(JSContext *, JSObject *, const + jsdouble (&)[3])): Use openvrml::make_color instead of + openvrml::color constructor. + (js_::SFRotation::initObject(JSContext *, JSObject *, const + jsdouble (&)[4])): Use openvrml::make_vec3f and + openvrml::make_rotation instead of openvrml::vec3f and + openvrml::rotation constructors. + (js_::SFRotation::setProperty(JSContext *, JSObject *, jsval, + jsval *)): Use openvrml::make_rotation instead of + openvrml::rotation constructor. + (js_::SFRotation::multVec(JSContext *, JSObject *, uintN, jsval *, + jsval *)): Use openvrml::make_rotation_mat4f instead of + openvrml::mat4f::rotation. + (js_::sfvec2_jsobject<SFVec2>::initObject(JSContext *, JSObject *, + const jsdouble (&)[2])): Use aggregate initializer instead of + constructor. + (js_::sfvec3_jsobject<SFVec3>::initObject(JSContext *, JSObject *, + const jsdouble (&)[3])): Use aggregate initializer instead of + constructor. + (js_::VrmlMatrix::initObject(JSContext *, JSObject *, const + jsdouble (&)[16])): Use openvrml::make_mat4f instead of + openvrml::mat4f constructor. + (js_::VrmlMatrix::setTransform(JSContext *, JSObject *, uintN, + jsval *, jsval *)): Use openvrml::make_rotation and + openvrml::make_vec3f instead of openvrml::rotation and + openvrml::vec3f constructors; use + openvrml::make_transformation_mat4f instead of + openvrml::mat4f::transformation. + * src/libopenvrml/openvrml/vrml97node.cpp + (abstract_light_node<Derived>::abstract_light_node(const + openvrml::node_type &, const boost::shared_ptr<openvrml::scope> & + scope)): Use openvrml::make_color instead of openvrml::color + constructor. + (grouping_node_base<Derived>::grouping_node_base(const + openvrml::node_type &, const boost::shared_ptr<openvrml::scope> + &)): Use openvrml::make_vec3f instead of openvrml::vec3f + constructor. + (set_unlit_material(openvrml::viewer &)): Use openvrml::make_color + instead of openvrml::color constructor. + (appearance_node::do_render_appearance(openvrml::viewer &, + rendering_context)): Use openvrml::make_color and + openvrml::make_vec2f instead of openvrml::color and + openvrml::vec2f constructors. + (background_node::background_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope> &)): Use + openvrml::make_color instead of openvrml::color constructor. + (billboard_node::billboard_to_matrix(const billboard_node &, const + openvrml::mat4f &)): Use openvrml::make_vec3f instead of + openvrml::vec3f constructor; use openvrml::make_rotation_mat4f + instead of openvrml::mat4f::rotation. + (billboard_node::billboard_node(const openvrml::node_type &, const + boost::shared_ptr<openvrml::scope> &)): Use openvrml::make_vec3f + instead of openvrml::vec3f constructor. + (cylinder_sensor_node::do_activate(double, bool, bool, const + double (&)[3])): Use openvrml::make_vec3f and + openvrml::make_rotation instead of openvrml::vec3f and + openvrml::rotation constructors. + (directional_light_node::directional_light_node(const + openvrml::node_type &, const boost::shared_ptr<openvrml::scope> + &)): Use openvrml::make_vec3f instead of openvrml::vec3f + constructor. + (extrusionDefaultCrossSection_): Use openvrml::make_vec2f instead + of openvrml::vec2f constructor. + (extrusionDefaultScale_): Use openvrml::make_vec2f instead of + openvrml::vec2f constructor. + (extrusionDefaultOrientation_): Use openvrml::make_rotation + instead of openvrml::rotation constructor. + (extrusionDefaultSpine_): Use openvrml::make_vec3f instead of + openvrml::vec3f constructor. + (fog_node::fog_node(const openvrml::node_type &, const + boost::shared_ptr<openvrml::scope> &)): Use openvrml::make_color + instead of openvrml::color constructor. + (material_node::material_node(const openvrml::node_type &, const + boost::shared_ptr<openvrml::scope> &)): Use openvrml::make_color + instead of openvrml::color constructor. + (orientation_interpolator_node::set_fraction_listener::do_process_event(const + sffloat &, double)): Use openvrml::make_rotation instead of + openvrml::rotation constructor. + (plane_sensor_node::plane_sensor_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope> &)): Use + openvrml::make_vec2f and openvrml::make_vec3f instead of + openvrml::vec2f and openvrml::vec3f constructors. + (plane_sensor_node::do_activate(double, bool, bool, const + double (&)[3])): Use openvrml::make_vec3f instead of + openvrml::vec3f constructor. + (point_light_node::point_light_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope> &)): Use + openvrml::make_vec3f instead of openvrml::vec3f constructor. + (proximity_sensor_node::proximity_sensor_node(const + openvrml::node_type &, const + boost::shared_ptr<openvrml::scope>&)): Use openvrml::make_vec3f + instead of openvrml::vec3f constructor. + (proximity_sensor_node::do_render_child(openvrml::viewer &, + rendering_context)): Use openvrml::make_vec3f instead of + openvrml::vec3f constructor. + (shape_node::shape_node(const openvrml::node_type &, const + boost::shared_ptr<openvrml::scope> &)): Use openvrml::make_vec3f + instead of openvrml::vec3f constructor. + (shape_node::do_render_child(openvrml::viewer &, + rendering_context)): Use openvrml::make_color instead of + openvrml::color constructor. + (sound_node::sound_node(const openvrml::node_type &, const + boost::shared_ptr<openvrml::scope> &)): Use openvrml::make_vec3f + instead of openvrml::vec3f constructor. + (sphere_sensor_node::sphere_sensor_node(const + openvrml::node_type&, const boost::shared_ptr<openvrml::scope>&)): + Use openvrml::make_rotation instead of openvrml::rotation + constructor. + (sphere_sensor_node::do_activate(double, bool, bool, const + double (&p)[3])): Use openvrml::make_vec3f and + openvrml::make_rotation instead of openvrml::vec3f and + openvrml::rotation constructors. + (spot_light_node::spot_light_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope>&)): Use + openvrml::make_vec3f instead of openvrml::vec3f constructor. + (moveTo_(FT_Vector *, void *)): Use openvrml::make_vec2f instead + of openvrml::vec2f constructor. + (lineTo_(FT_Vector *, void *)): Use openvrml::make_vec2f instead + of openvrml::vec2f constructor. + (conic_(FT_Vector *, FT_Vector *, void *)): Use + openvrml::make_vec2f instead of openvrml::vec2f constructor. + (cubic_(FT_Vector *, FT_Vector *, FT_Vector *, void *)): Use + openvrml::make_vec2f instead of openvrml::vec2f constructor. + (text_node::update_geometry()): Use openvrml::make_vec2f and + openvrml::make_vec3f instead of openvrml::vec2f and + openvrml::vec3f constructors. + (texture_transform_node::texture_transform_node(const + openvrml::node_type &, const + boost::shared_ptr<openvrml::scope>&)): Use openvrml::make_vec2f + instead of openvrml::vec2f constructor. + (transform_node::scale_exposedfield::scale_exposedfield(transform_node&)): + Use openvrml::make_vec3f instead of openvrml::vec3f constructor. + (transform_node::update_transform()): Use + openvrml::make_transformation_mat4f instead of + openvrml::mat4f::transformation. + (viewpoint_node::position_exposedfield::position_exposedfield(viewpoint_node&)): + Use openvrml::make_vec3f instead of openvrml::vec3f constructor. + (viewpoint_node::update_final_transformation() const): Use + openvrml::make_vec3f and openvrml::make_rotation instead of + openvrml::vec3f and openvrml::rotation constructors; use + openvrml::make_transformation_mat4f instead of + openvrml::mat4f::transformation. + (visibility_sensor_node::visibility_sensor_node(const + openvrml::node_type &, const + boost::shared_ptr<openvrml::scope>&)): Use openvrml::make_vec3f + instead of openvrml::vec3f constructor. + * src/libopenvrml/openvrml/x3d_dis.cpp + (espdu_transform_node::espdu_transform_node(const + openvrml::node_type &, const boost::shared_ptr<openvrml::scope&)): + Use openvrml::make_vec3f instead of openvrml::vec3f constructor. + (receiver_pdu_node::receiver_pdu_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope> &)): Use + openvrml::make_vec3f instead of openvrml::vec3f constructor. + (signal_pdu_node::signal_pdu_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope> &)): Use + openvrml::make_vec3f instead of openvrml::vec3f constructor. + (transmitter_pdu_node::transmitter_pdu_node(const + openvrml::node_type &, const + boost::shared_ptr<openvrml::scope>&)): Use openvrml::make_vec3f + instead of openvrml::vec3f constructor. + * src/libopenvrml/openvrml/x3d_geometry2d.cpp + (rectangle2d_node::rectangle2d_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope> &)): Use + openvrml::make_vec2f instead of openvrml::vec2f constructor. + * src/libopenvrml/openvrml/x3d_geospatial.cpp + (geo_location_node::geo_location_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope> &)): Use + openvrml::make_vec3f instead of openvrml::vec3f constructor. + (geo_lod_node::geo_lod_node(const openvrml::node_type &, const + boost::shared_ptr<openvrml::scope> &)): Use openvrml::make_vec3f + instead of openvrml::vec3f constructor. + (geo_viewpoint_node::geo_viewpoint_node(const + openvrml::node_type&, const boost::shared_ptr<openvrml::scope>&)): + Use openvrml::make_vec3d instead of openvrml::vec3d constructor. + * src/libopenvrml/openvrml/x3d_grouping.cpp + (static_group_node::static_group_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope> &)): Use + openvrml::make_vec3f instead of openvrml::vec3f constructor. + * src/libopenvrml/openvrml/x3d_hanim.cpp + (hanim_humanoid_node::hanim_humanoid_node(const + openvrml::node_type &, const + boost::shared_ptr<openvrml::scope>&)): Use openvrml::make_vec3f + instead of openvrml::vec3f constructor. + (hanim_joint_node::hanim_joint_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope> &)): Use + openvrml::make_vec3f instead of openvrml::vec3f constructor. + (hanim_segment_node::hanim_segment_node(const + openvrml::node_type&, const boost::shared_ptr<openvrml::scope>&)): + Use openvrml::make_vec3f instead of openvrml::vec3f constructor. + (hanim_site_node::hanim_site_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope> &)): Use + openvrml::make_vec3f instead of openvrml::vec3f constructor. + * src/libopenvrml/openvrml/x3d_nurbs.cpp + (nurbs_set_node::nurbs_set_node(const openvrml::node_type &, + const boost::shared_ptr<openvrml::scope> &)): Use + openvrml::make_vec3f instead of openvrml::vec3f constructor. + * src/libopenvrml/openvrml/x3d_shape.cpp + (fill_properties_node::fill_properties_node(const + openvrml::node_type &, const + boost::shared_ptr<openvrml::scope>&)): Use openvrml::make_color + instead of openvrml::color constructor. + * src/libopenvrml/openvrml/x3d_texturing.cpp + (multi_texture_node::multi_texture_properties_node(const + openvrml::node_type &, const + boost::shared_ptr<openvrml::scope>&)): Use openvrml::make_color + instead of openvrml::color constructor. + * src/libopenvrml-gl/openvrml/gl/viewer.cpp + (trackball(float, float, float, float)): Use openvrml::make_vec3f + instead of openvrml::vec3f constructor. + (openvrml::gl::viewer::insert_elevation_grid(unsigned int, const + std::vector<float> &, int32, int32, float, float, const + std::vector<color> &, const std::vector<vec3f> &, const + std::vector<vec2f> &)): Use openvrml::make_vec3f instead of + openvrml::vec3f constructor. + (computeExtrusion_(const std::vector<openvrml::rotation> &, const + std::vector<openvrml::vec2f> &, const + std::vector<openvrml::vec2f>&, const + std::vector<openvrml::vec3f>&, std::vector<openvrml::vec3f> &, + std::vector<openvrml::vec2f> &)): Use openvrml::make_rotation and + openvrml::make_vec3f instead of openvrml::rotation and + openvrml::vec3f constructors; use openvrml::make_rotation_mat4f + instead of openvrml::mat4f::rotation. + (openvrml::gl::viewer::rotate(const openvrml::rotation &)): Use + openvrml::make_rotation_mat4f instead of + openvrml::mat4f::rotation; use openvrml::make_translation_mat4f + instead of openvrml::mat4f::translation. + (openvrml::gl::viewer::step(float, float, float)): Use + openvrml::make_translation_mat4f instead of + openvrml::mat4f::translation. + (openvrml::gl::viewer::zoom(float)): Use openvrml::make_vec3f + instead of openvrml::vec3f constructor. + + 2006-08-31 Braden McDaniel <br...@en...> + * src/libopenvrml-gl/openvrml/gl/viewer.cpp: Explicitly qualify definitions from the global scope rather than enclose them in |
|
From: Braden M. <br...@us...> - 2006-08-31 06:45:38
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14506/src/libopenvrml/openvrml Modified Files: Vrml97Parser.g basetypes.cpp basetypes.h bounding_volume.cpp browser.cpp script.cpp vrml97node.cpp x3d_dis.cpp x3d_geometry2d.cpp x3d_geospatial.cpp x3d_grouping.cpp x3d_hanim.cpp x3d_nurbs.cpp x3d_shape.cpp x3d_texturing.cpp Log Message: Made openvrml::color, openvrml::color_rgba, openvrml::vec2f, openvrml::vec2d, openvrml::vec3f, openvrml::vec3d, openvrml::rotation, openvrml::mat4f, and openvrml::quatf POD-structs. This allows safe usage of these types in C APIs. Index: basetypes.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/basetypes.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** basetypes.h 23 Aug 2006 06:41:27 -0000 1.24 --- basetypes.h 31 Aug 2006 06:45:30 -0000 1.25 *************** *** 42,59 **** ! class color; ! ! OPENVRML_API std::istream & operator>>(std::istream & in, color & c); ! ! class OPENVRML_API color { ! friend std::istream & operator>>(std::istream & in, color & c); ! float rgb[3]; - public: - color() OPENVRML_NOTHROW; - explicit color(const float (&rgb)[3]) OPENVRML_NOTHROW; - color(float r, float g, float b) OPENVRML_NOTHROW; - const float & operator[](size_t index) const OPENVRML_NOTHROW; --- 42,48 ---- ! struct OPENVRML_API color { float rgb[3]; const float & operator[](size_t index) const OPENVRML_NOTHROW; *************** *** 70,77 **** --- 59,73 ---- }; + OPENVRML_API const color make_color() OPENVRML_NOTHROW; + OPENVRML_API const color make_color(const float (&rgb)[3]) + OPENVRML_NOTHROW; + OPENVRML_API const color make_color(float r, float g, float b) + OPENVRML_NOTHROW; + OPENVRML_API bool operator==(const color & lhs, const color & rhs) OPENVRML_NOTHROW; OPENVRML_API bool operator!=(const color & lhs, const color & rhs) OPENVRML_NOTHROW; + OPENVRML_API std::istream & operator>>(std::istream & in, color & c); OPENVRML_API std::ostream & operator<<(std::ostream & out, const color & c); *************** *** 115,132 **** ! class color_rgba; ! ! OPENVRML_API std::istream & operator>>(std::istream & in, color_rgba & c); ! ! class OPENVRML_API color_rgba { ! friend std::istream & operator>>(std::istream & in, color_rgba & c); ! float rgba[4]; - public: - color_rgba() OPENVRML_NOTHROW; - explicit color_rgba(const float (&rgba)[4]) OPENVRML_NOTHROW; - color_rgba(float r, float g, float b, float a = 1.0f) OPENVRML_NOTHROW; - const float & operator[](size_t index) const OPENVRML_NOTHROW; --- 111,117 ---- ! struct OPENVRML_API color_rgba { float rgba[4]; const float & operator[](size_t index) const OPENVRML_NOTHROW; *************** *** 145,148 **** --- 130,142 ---- }; + OPENVRML_API const color_rgba make_color_rgba() OPENVRML_NOTHROW; + OPENVRML_API const color_rgba make_color_rgba(const float (&rgba)[4]) + OPENVRML_NOTHROW; + OPENVRML_API const color_rgba make_color_rgba(float r, + float g, + float b, + float a) + OPENVRML_NOTHROW; + OPENVRML_API bool operator==(const color_rgba & lhs, const color_rgba & rhs) *************** *** 151,154 **** --- 145,149 ---- const color_rgba & rhs) OPENVRML_NOTHROW; + OPENVRML_API std::istream & operator>>(std::istream & in, color_rgba & c); OPENVRML_API std::ostream & operator<<(std::ostream & out, const color_rgba & c); *************** *** 202,219 **** ! class vec2f; ! ! OPENVRML_API std::istream & operator>>(std::istream & in, vec2f & v); ! ! class OPENVRML_API vec2f { ! friend std::istream & operator>>(std::istream & in, vec2f & v); ! float vec[2]; - public: - vec2f() OPENVRML_NOTHROW; - explicit vec2f(const float (&vec)[2]) OPENVRML_NOTHROW; - vec2f(float x, float y) OPENVRML_NOTHROW; - vec2f & operator*=(float scalar) OPENVRML_NOTHROW; vec2f & operator/=(float scalar) OPENVRML_NOTHROW; --- 197,203 ---- ! struct OPENVRML_API vec2f { float vec[2]; vec2f & operator*=(float scalar) OPENVRML_NOTHROW; vec2f & operator/=(float scalar) OPENVRML_NOTHROW; *************** *** 236,239 **** --- 220,228 ---- }; + OPENVRML_API const vec2f make_vec2f() OPENVRML_NOTHROW; + OPENVRML_API const vec2f make_vec2f(const float (&vec)[2]) + OPENVRML_NOTHROW; + OPENVRML_API const vec2f make_vec2f(float x, float y) OPENVRML_NOTHROW; + OPENVRML_API const vec2f operator*(const vec2f & lhs, float rhs) OPENVRML_NOTHROW; *************** *** 251,254 **** --- 240,244 ---- OPENVRML_NOTHROW; + OPENVRML_API std::istream & operator>>(std::istream & in, vec2f & v); OPENVRML_API std::ostream & operator<<(std::ostream & out, const vec2f & v); *************** *** 292,309 **** ! class vec2d; ! ! OPENVRML_API std::istream & operator>>(std::istream & in, vec2d & v); ! ! class OPENVRML_API vec2d { ! friend std::istream & operator>>(std::istream & in, vec2d & v); ! double vec[2]; - public: - vec2d() OPENVRML_NOTHROW; - explicit vec2d(const double (&vec)[2]) OPENVRML_NOTHROW; - vec2d(double x, double y) OPENVRML_NOTHROW; - vec2d & operator*=(double scalar) OPENVRML_NOTHROW; vec2d & operator/=(double scalar) OPENVRML_NOTHROW; --- 282,288 ---- ! struct OPENVRML_API vec2d { double vec[2]; vec2d & operator*=(double scalar) OPENVRML_NOTHROW; vec2d & operator/=(double scalar) OPENVRML_NOTHROW; *************** *** 326,329 **** --- 305,313 ---- }; + OPENVRML_API const vec2d make_vec2d() OPENVRML_NOTHROW; + OPENVRML_API const vec2d make_vec2d(const double (&vec)[2]) + OPENVRML_NOTHROW; + OPENVRML_API const vec2d make_vec2d(double x, double y) OPENVRML_NOTHROW; + OPENVRML_API const vec2d operator*(const vec2d & lhs, double rhs) OPENVRML_NOTHROW; *************** *** 341,344 **** --- 325,329 ---- OPENVRML_NOTHROW; + OPENVRML_API std::istream & operator>>(std::istream & in, vec2d & v); OPENVRML_API std::ostream & operator<<(std::ostream & out, const vec2d & v); *************** *** 383,400 **** class mat4f; - class vec3f; - - OPENVRML_API std::istream & operator>>(std::istream & in, vec3f & v); - - class OPENVRML_API vec3f { - friend std::istream & operator>>(std::istream & in, vec3f & v); float vec[3]; - public: - vec3f() OPENVRML_NOTHROW; - explicit vec3f(const float (&vec)[3]) OPENVRML_NOTHROW; - vec3f(float x, float y, float z) OPENVRML_NOTHROW; - vec3f & operator*=(const vec3f & vec) OPENVRML_NOTHROW; vec3f & operator*=(const mat4f & mat) OPENVRML_NOTHROW; --- 368,375 ---- class mat4f; + struct OPENVRML_API vec3f { float vec[3]; vec3f & operator*=(const vec3f & vec) OPENVRML_NOTHROW; vec3f & operator*=(const mat4f & mat) OPENVRML_NOTHROW; *************** *** 422,425 **** --- 397,406 ---- }; + OPENVRML_API const vec3f make_vec3f() OPENVRML_NOTHROW; + OPENVRML_API const vec3f make_vec3f(const float (&vec)[3]) + OPENVRML_NOTHROW; + OPENVRML_API const vec3f make_vec3f(float x, float y, float z) + OPENVRML_NOTHROW; + OPENVRML_API const vec3f operator*(const vec3f & lhs, const vec3f & rhs) OPENVRML_NOTHROW; *************** *** 443,446 **** --- 424,428 ---- OPENVRML_NOTHROW; + OPENVRML_API std::istream & operator>>(std::istream & in, vec3f & v); OPENVRML_API std::ostream & operator<<(std::ostream & out, const vec3f & v); *************** *** 500,517 **** ! class vec3d; ! ! OPENVRML_API std::istream & operator>>(std::istream & in, vec3d & v); ! ! class OPENVRML_API vec3d { ! friend std::istream & operator>>(std::istream & in, vec3d & v); ! double vec[3]; - public: - vec3d() OPENVRML_NOTHROW; - explicit vec3d(const double (&vec)[3]) OPENVRML_NOTHROW; - vec3d(double x, double y, double z) OPENVRML_NOTHROW; - vec3d & operator*=(const vec3d & vec) OPENVRML_NOTHROW; vec3d & operator*=(const mat4f & mat) OPENVRML_NOTHROW; --- 482,488 ---- ! struct OPENVRML_API vec3d { double vec[3]; vec3d & operator*=(const vec3d & vec) OPENVRML_NOTHROW; vec3d & operator*=(const mat4f & mat) OPENVRML_NOTHROW; *************** *** 539,542 **** --- 510,519 ---- }; + OPENVRML_API const vec3d make_vec3d() OPENVRML_NOTHROW; + OPENVRML_API const vec3d make_vec3d(const double (&vec)[3]) + OPENVRML_NOTHROW; + OPENVRML_API const vec3d make_vec3d(double x, double y, double z) + OPENVRML_NOTHROW; + OPENVRML_API const vec3d operator*(const vec3d & lhs, const vec3d & rhs) OPENVRML_NOTHROW; *************** *** 560,563 **** --- 537,541 ---- OPENVRML_NOTHROW; + OPENVRML_API std::istream & operator>>(std::istream & in, vec3d & v); OPENVRML_API std::ostream & operator<<(std::ostream & out, const vec3d & v); *************** *** 619,634 **** class quatf; ! class OPENVRML_API rotation { float rot[4]; - public: - rotation() OPENVRML_NOTHROW; - explicit rotation(const float (&rot)[4]) OPENVRML_NOTHROW; - rotation(float x, float y, float z, float angle) OPENVRML_NOTHROW; - rotation(const vec3f & axis, float angle) OPENVRML_NOTHROW; - rotation(const vec3f & from_vec, const vec3f & to_vec) - OPENVRML_NOTHROW; - explicit rotation(const quatf & quat) OPENVRML_NOTHROW; - rotation & operator*=(const rotation & rot) OPENVRML_NOTHROW; --- 597,603 ---- class quatf; ! struct OPENVRML_API rotation { float rot[4]; rotation & operator*=(const rotation & rot) OPENVRML_NOTHROW; *************** *** 652,656 **** }; ! const rotation OPENVRML_API operator*(const rotation & lhs, const rotation & rhs) OPENVRML_NOTHROW; --- 621,641 ---- }; ! OPENVRML_API const rotation make_rotation() OPENVRML_NOTHROW; ! OPENVRML_API const rotation make_rotation(const float (&rot)[4]) ! OPENVRML_NOTHROW; ! OPENVRML_API const rotation make_rotation(float x, ! float y, ! float z, ! float angle) ! OPENVRML_NOTHROW; ! OPENVRML_API const rotation make_rotation(const vec3f & axis, float angle) ! OPENVRML_NOTHROW; ! OPENVRML_API const rotation make_rotation(const vec3f & from_vec, ! const vec3f & to_vec) ! OPENVRML_NOTHROW; ! OPENVRML_API const rotation make_rotation(const quatf & quat) ! OPENVRML_NOTHROW; ! ! OPENVRML_API const rotation operator*(const rotation & lhs, const rotation & rhs) OPENVRML_NOTHROW; *************** *** 687,691 **** inline const vec3f rotation::axis() const OPENVRML_NOTHROW { ! return vec3f(this->rot[0], this->rot[1], this->rot[2]); } --- 672,676 ---- inline const vec3f rotation::axis() const OPENVRML_NOTHROW { ! return make_vec3f(this->rot[0], this->rot[1], this->rot[2]); } *************** *** 701,730 **** ! class OPENVRML_API mat4f { float mat[4][4]; - public: - static const mat4f rotation(const openvrml::rotation & rot) - OPENVRML_NOTHROW; - static const mat4f rotation(const quatf & quat) OPENVRML_NOTHROW; - static const mat4f scale(float s) OPENVRML_NOTHROW; - static const mat4f scale(const vec3f & s) OPENVRML_NOTHROW; - static const mat4f translation(const vec3f & t) OPENVRML_NOTHROW; - static const mat4f transformation(const vec3f & t, - const openvrml::rotation & r, - const vec3f & s, - const openvrml::rotation & sr, - const vec3f & c) OPENVRML_NOTHROW; - - mat4f() OPENVRML_NOTHROW; - mat4f(float f11, float f12, float f13, float f14, - float f21, float f22, float f23, float f24, - float f31, float f32, float f33, float f34, - float f41, float f42, float f43, float f44) OPENVRML_NOTHROW; - explicit mat4f(const float mat[16]) OPENVRML_NOTHROW; - explicit mat4f(const float (&mat)[4][4]) OPENVRML_NOTHROW; - - // Use compiler-defined operator= and copy constructor. - mat4f & operator*=(float scalar) OPENVRML_NOTHROW; mat4f & operator*=(const mat4f & mat) OPENVRML_NOTHROW; --- 686,692 ---- ! struct OPENVRML_API mat4f { float mat[4][4]; mat4f & operator*=(float scalar) OPENVRML_NOTHROW; mat4f & operator*=(const mat4f & mat) OPENVRML_NOTHROW; *************** *** 733,739 **** const float (&operator[](const size_t index) const OPENVRML_NOTHROW)[4]; ! void transformation(vec3f & t, openvrml::rotation & r, vec3f & s) const OPENVRML_NOTHROW; ! void transformation(vec3f & t, openvrml::rotation & r, vec3f & s, vec3f & shear) const OPENVRML_NOTHROW; --- 695,701 ---- const float (&operator[](const size_t index) const OPENVRML_NOTHROW)[4]; ! void transformation(vec3f & t, rotation & r, vec3f & s) const OPENVRML_NOTHROW; ! void transformation(vec3f & t, rotation & r, vec3f & s, vec3f & shear) const OPENVRML_NOTHROW; *************** *** 744,747 **** --- 706,729 ---- }; + const mat4f make_mat4f() OPENVRML_NOTHROW; + const mat4f make_mat4f(float f11, float f12, float f13, float f14, + float f21, float f22, float f23, float f24, + float f31, float f32, float f33, float f34, + float f41, float f42, float f43, float f44) + OPENVRML_NOTHROW; + const mat4f make_mat4f(const float mat[16]) OPENVRML_NOTHROW; + const mat4f make_mat4f(const float (&mat)[4][4]) OPENVRML_NOTHROW; + + const mat4f make_rotation_mat4f(const rotation & rot) OPENVRML_NOTHROW; + const mat4f make_rotation_mat4f(const quatf & quat) OPENVRML_NOTHROW; + const mat4f make_scale_mat4f(float s) OPENVRML_NOTHROW; + const mat4f make_scale_mat4f(const vec3f & s) OPENVRML_NOTHROW; + const mat4f make_translation_mat4f(const vec3f & t) OPENVRML_NOTHROW; + const mat4f make_transformation_mat4f(const vec3f & t, + const rotation & r, + const vec3f & s, + const rotation & sr, + const vec3f & c) OPENVRML_NOTHROW; + OPENVRML_API bool operator==(const mat4f & lhs, const mat4f & rhs) OPENVRML_NOTHROW; *************** *** 772,791 **** ! OPENVRML_API std::istream & operator>>(std::istream & in, quatf & q); ! ! class OPENVRML_API quatf { ! friend std::istream & operator>>(std::istream & in, quatf & q); ! float quat[4]; - public: - quatf() OPENVRML_NOTHROW; - quatf(float x, float y, float z, float w) OPENVRML_NOTHROW; - explicit quatf(const float (&quat)[4]) OPENVRML_NOTHROW; - explicit quatf(const rotation & rot) OPENVRML_NOTHROW; - explicit quatf(const mat4f & mat) OPENVRML_NOTHROW; - - // use compiler-defined operator= and copy constructor. - quatf & operator*=(const quatf & quat) OPENVRML_NOTHROW; quatf & operator*=(float scalar) OPENVRML_NOTHROW; --- 754,760 ---- ! struct OPENVRML_API quatf { float quat[4]; quatf & operator*=(const quatf & quat) OPENVRML_NOTHROW; quatf & operator*=(float scalar) OPENVRML_NOTHROW; *************** *** 813,816 **** --- 782,791 ---- }; + const quatf make_quatf() OPENVRML_NOTHROW; + const quatf make_quatf(float x, float y, float z, float w) OPENVRML_NOTHROW; + const quatf make_quatf(const float (&quat)[4]) OPENVRML_NOTHROW; + const quatf make_quatf(const rotation & rot) OPENVRML_NOTHROW; + const quatf make_quatf(const mat4f & mat) OPENVRML_NOTHROW; + OPENVRML_API const quatf operator*(const quatf & lhs, const quatf & rhs) OPENVRML_NOTHROW; *************** *** 829,832 **** --- 804,808 ---- OPENVRML_API bool operator!=(const quatf & lhs, const quatf & rhs) OPENVRML_NOTHROW; + OPENVRML_API std::istream & operator>>(std::istream & in, quatf & q); OPENVRML_API std::ostream & operator<<(std::ostream & out, const quatf & quat); Index: x3d_grouping.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_grouping.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** x3d_grouping.cpp 16 Aug 2006 19:29:16 -0000 1.3 --- x3d_grouping.cpp 31 Aug 2006 06:45:34 -0000 1.4 *************** *** 412,416 **** abstract_node<self_t>(type, scope), grouping_node(type, scope), ! bbox_size_(vec3f(-1.0f, -1.0f, -1.0f)), viewerObject(0) {} --- 412,416 ---- abstract_node<self_t>(type, scope), grouping_node(type, scope), ! bbox_size_(make_vec3f(-1.0f, -1.0f, -1.0f)), viewerObject(0) {} Index: x3d_hanim.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_hanim.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** x3d_hanim.cpp 18 May 2006 04:11:31 -0000 1.3 --- x3d_hanim.cpp 31 Aug 2006 06:45:34 -0000 1.4 *************** *** 2003,2007 **** name_(*this), rotation_(*this), ! scale_(*this, vec3f(1,1,1)), scale_orientation_(*this), segments_(*this), --- 2003,2007 ---- name_(*this), rotation_(*this), ! scale_(*this, make_vec3f(1.0, 1.0, 1.0)), scale_orientation_(*this), segments_(*this), *************** *** 2014,2018 **** version_(*this), viewpoints_(*this), ! bbox_size_(vec3f(-1.0f, -1.0f, -1.0f)) {} --- 2014,2018 ---- version_(*this), viewpoints_(*this), ! bbox_size_(make_vec3f(-1.0f, -1.0f, -1.0f)) {} *************** *** 2203,2207 **** name_(*this), rotation_(*this), ! scale_(*this, vec3f(1,1,1)), scale_orientation_(*this), skin_coord_index_(*this), --- 2203,2207 ---- name_(*this), rotation_(*this), ! scale_(*this, make_vec3f(1.0, 1.0, 1.0)), scale_orientation_(*this), skin_coord_index_(*this), *************** *** 2210,2214 **** translation_(*this), ulimit_(*this), ! bbox_size_(vec3f(-1.0f, -1.0f, -1.0f)) {} --- 2210,2214 ---- translation_(*this), ulimit_(*this), ! bbox_size_(make_vec3f(-1.0f, -1.0f, -1.0f)) {} *************** *** 2357,2361 **** moments_of_inertia_(*this, vector<float>(9,0.0f)), name_(*this), ! bbox_size_(vec3f(-1.0f, -1.0f, -1.0f)) {} --- 2357,2361 ---- moments_of_inertia_(*this, vector<float>(9,0.0f)), name_(*this), ! bbox_size_(make_vec3f(-1.0f, -1.0f, -1.0f)) {} *************** *** 2501,2508 **** name_(*this), rotation_(*this), ! scale_(*this, vec3f(1,1,1)), scale_orientation_(*this), translation_(*this), ! bbox_size_(vec3f(-1.0f, -1.0f, -1.0f)) {} --- 2501,2508 ---- name_(*this), rotation_(*this), ! scale_(*this, make_vec3f(1.0, 1.0, 1.0)), scale_orientation_(*this), translation_(*this), ! bbox_size_(make_vec3f(-1.0f, -1.0f, -1.0f)) {} Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** vrml97node.cpp 17 Aug 2006 20:04:22 -0000 1.110 --- vrml97node.cpp 31 Aug 2006 06:45:31 -0000 1.111 *************** *** 1627,1631 **** abstract_node<Derived>(type, scope), ambient_intensity_(*this, 0.0), ! color_(*this, openvrml::color(1.0, 1.0, 1.0)), intensity_(*this, 1.0), on_(*this, true) --- 1627,1631 ---- abstract_node<Derived>(type, scope), ambient_intensity_(*this, 0.0), ! color_(*this, openvrml::make_color(1.0, 1.0, 1.0)), intensity_(*this, 1.0), on_(*this, true) *************** *** 2171,2175 **** grouping_node(type, scope), abstract_node<Derived>(type, scope), ! bbox_size_(vec3f(-1.0, -1.0, -1.0)), add_children_listener_(*this), remove_children_listener_(*this), --- 2171,2175 ---- grouping_node(type, scope), abstract_node<Derived>(type, scope), ! bbox_size_(make_vec3f(-1.0, -1.0, -1.0)), add_children_listener_(*this), remove_children_listener_(*this), *************** *** 4961,4968 **** using openvrml::color; static const float unlit_ambient_intensity(1); ! static const color unlit_diffuse_color(1, 1, 1); ! static const color unlit_emissive_color(1, 1, 1); static const float unlit_shininess(0); ! static const color unlit_specular_color(1, 1, 1); static const float unlit_transparency(0); v.set_material(unlit_ambient_intensity, --- 4961,4968 ---- using openvrml::color; static const float unlit_ambient_intensity(1); ! static const color unlit_diffuse_color = make_color(1, 1, 1); ! static const color unlit_emissive_color = make_color(1, 1, 1); static const float unlit_shininess(0); ! static const color unlit_specular_color = make_color(1, 1, 1); static const float unlit_transparency(0); v.set_material(unlit_ambient_intensity, *************** *** 4995,4999 **** size_t nTexComponents = texture ? texture->image().comp() : 0; if (nTexComponents == 2 || nTexComponents == 4) { trans = 0.0; } ! if (nTexComponents >= 3) { diffuse = color(1.0, 1.0, 1.0); } v.enable_lighting(true); // turn lighting on for this object --- 4995,4999 ---- size_t nTexComponents = texture ? texture->image().comp() : 0; if (nTexComponents == 2 || nTexComponents == 4) { trans = 0.0; } ! if (nTexComponents >= 3) { diffuse = make_color(1.0, 1.0, 1.0); } v.enable_lighting(true); // turn lighting on for this object *************** *** 5018,5025 **** texture_transform->render_texture_transform(v); } else { ! static const vec2f center(0.0, 0.0); static const float rotation = 0.0; ! static const vec2f scale(1.0, 1.0); ! static const vec2f translation(0.0, 0.0); v.set_texture_transform(center, rotation, scale, translation); } --- 5018,5025 ---- texture_transform->render_texture_transform(v); } else { ! static const vec2f center = make_vec2f(0.0, 0.0); static const float rotation = 0.0; ! static const vec2f scale = make_vec2f(1.0, 1.0); ! static const vec2f translation = make_vec2f(0.0, 0.0); v.set_texture_transform(center, rotation, scale, translation); } *************** *** 6645,6649 **** top_url_(*this), sky_angle_(*this), ! sky_color_(*this, std::vector<color>(1, color(0.0, 0.0, 0.0))), is_bound_emitter_(*this, this->is_bound_), bind_time_emitter_(*this, this->bind_time_), --- 6645,6649 ---- top_url_(*this), sky_angle_(*this), ! sky_color_(*this, std::vector<color>(1, make_color(0.0, 0.0, 0.0))), is_bound_emitter_(*this, this->is_bound_), bind_time_emitter_(*this, this->bind_time_), *************** *** 7722,7728 **** // Viewer position in local coordinate system ! const vec3f position = vec3f(inverse_modelview[3][0], ! inverse_modelview[3][1], ! inverse_modelview[3][2]).normalize(); // Viewer-alignment --- 7722,7728 ---- // Viewer position in local coordinate system ! const vec3f position = make_vec3f(inverse_modelview[3][0], ! inverse_modelview[3][1], ! inverse_modelview[3][2]).normalize(); // Viewer-alignment *************** *** 7733,7739 **** // Viewer's up vector // ! const vec3f up = vec3f(inverse_modelview[1][0], ! inverse_modelview[1][1], ! inverse_modelview[1][2]).normalize(); // get x-vector from the cross product of Viewer's --- 7733,7739 ---- // Viewer's up vector // ! const vec3f up = make_vec3f(inverse_modelview[1][0], ! inverse_modelview[1][1], ! inverse_modelview[1][2]).normalize(); // get x-vector from the cross product of Viewer's *************** *** 7778,7782 **** float angle = float(acos(nz[2])); if(nz[0] > 0) { angle = -angle; } ! result = mat4f::rotation(rotation(Y, angle)); } return result; --- 7778,7782 ---- float angle = float(acos(nz[2])); if(nz[0] > 0) { angle = -angle; } ! result = make_rotation_mat4f(make_rotation(Y, angle)); } return result; *************** *** 7797,7801 **** grouping_node(type, scope), grouping_node_base<billboard_node>(type, scope), ! axis_of_rotation_(*this, vec3f(0.0, 1.0, 0.0)), xformObject(0) {} --- 7797,7801 ---- grouping_node(type, scope), grouping_node_base<billboard_node>(type, scope), ! axis_of_rotation_(*this, make_vec3f(0.0, 1.0, 0.0)), xformObject(0) {} *************** *** 7981,7985 **** abstract_node<box_node>(type, scope), geometry_node(type, scope), ! size(vec3f(2.0, 2.0, 2.0)), solid_(true) { --- 7981,7985 ---- abstract_node<box_node>(type, scope), geometry_node(type, scope), ! size(make_vec3f(2.0, 2.0, 2.0)), solid_(true) { *************** *** 10140,10146 **** // set activation point in local coords ! vec3f v(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); this->activationMatrix = this->modelview.inverse(); v *= this->activationMatrix; --- 10140,10146 ---- // set activation point in local coords ! vec3f v = make_vec3f(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); this->activationMatrix = this->modelview.inverse(); v *= this->activationMatrix; *************** *** 10151,10155 **** v.z(this->activationMatrix[2][2]); const vec3f bearing = v.normalize(); ! const vec3f up(0.0, 1.0, 0.0); double ang = acos(bearing.dot(up)); if (ang > pi_2) { ang = pi - ang; } --- 10151,10155 ---- v.z(this->activationMatrix[2][2]); const vec3f bearing = v.normalize(); ! const vec3f up = make_vec3f(0.0, 1.0, 0.0); double ang = acos(bearing.dot(up)); if (ang > pi_2) { ang = pi - ang; } *************** *** 10176,10182 **** // get local coord for touch point ! vec3f Vec(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); Vec = Vec * this->activationMatrix; this->track_point_changed_.value(Vec); --- 10176,10182 ---- // get local coord for touch point ! vec3f Vec = make_vec3f(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); Vec = Vec * this->activationMatrix; this->track_point_changed_.value(Vec); *************** *** 10185,10196 **** vec3f tempv; float rot, radius; ! vec3f dir1(Vec[0], 0, Vec[2]); radius = this->disk ? 1.0f : dir1.length(); dir1 = dir1.normalize(); ! vec3f dir2(this->activationPoint.x(), ! 0, ! this->activationPoint.z()); dir2 = dir2.normalize(); tempv = dir2 * dir1; --- 10185,10196 ---- vec3f tempv; float rot, radius; ! vec3f dir1 = make_vec3f(Vec[0], 0, Vec[2]); radius = this->disk ? 1.0f : dir1.length(); dir1 = dir1.normalize(); ! vec3f dir2 = make_vec3f(this->activationPoint.x(), ! 0, ! this->activationPoint.z()); dir2 = dir2.normalize(); tempv = dir2 * dir1; *************** *** 10213,10217 **** this->rotation_val = rot; this->rotation_changed_.sfrotation::value( ! openvrml::rotation(0, 1, 0, rot)); node::emit_event(this->rotation_changed_emitter_, timestamp); --- 10213,10217 ---- this->rotation_val = rot; this->rotation_changed_.sfrotation::value( ! make_rotation(0, 1, 0, rot)); node::emit_event(this->rotation_changed_emitter_, timestamp); *************** *** 10442,10446 **** light_node(type, scope), abstract_light_node<directional_light_node>(type, scope), ! direction_(*this, vec3f(0.0, 0.0, -1.0)) {} --- 10442,10446 ---- light_node(type, scope), abstract_light_node<directional_light_node>(type, scope), ! direction_(*this, make_vec3f(0.0, 0.0, -1.0)) {} *************** *** 11514,11538 **** const openvrml::vec2f extrusionDefaultCrossSection_[] = { ! openvrml::vec2f(1.0, 1.0), ! openvrml::vec2f(1.0, -1.0), ! openvrml::vec2f(-1.0, -1.0), ! openvrml::vec2f(-1.0, 1.0), ! openvrml::vec2f(1.0, 1.0) }; const openvrml::vec2f extrusionDefaultScale_[] = { ! openvrml::vec2f(1.0, 1.0) }; const openvrml::rotation extrusionDefaultOrientation_[] = { ! openvrml::rotation(0.0, 0.0, 1.0, 0.0) }; const openvrml::vec3f extrusionDefaultSpine_[] = { ! openvrml::vec3f(0.0, 0.0, 0.0), ! openvrml::vec3f(0.0, 1.0, 0.0) }; --- 11514,11538 ---- const openvrml::vec2f extrusionDefaultCrossSection_[] = { ! openvrml::make_vec2f(1.0, 1.0), ! openvrml::make_vec2f(1.0, -1.0), ! openvrml::make_vec2f(-1.0, -1.0), ! openvrml::make_vec2f(-1.0, 1.0), ! openvrml::make_vec2f(1.0, 1.0) }; const openvrml::vec2f extrusionDefaultScale_[] = { ! openvrml::make_vec2f(1.0, 1.0) }; const openvrml::rotation extrusionDefaultOrientation_[] = { ! openvrml::make_rotation(0.0, 0.0, 1.0, 0.0) }; const openvrml::vec3f extrusionDefaultSpine_[] = { ! openvrml::make_vec3f(0.0, 0.0, 0.0), ! openvrml::make_vec3f(0.0, 1.0, 0.0) }; *************** *** 12010,12014 **** child_node(type, scope), set_bind_listener_(*this), ! color_(*this, openvrml::color(1.0, 1.0, 1.0)), fog_type_(*this, "LINEAR"), visibility_range_(*this, 0.0), --- 12010,12014 ---- child_node(type, scope), set_bind_listener_(*this), ! color_(*this, openvrml::make_color(1.0, 1.0, 1.0)), fog_type_(*this, "LINEAR"), visibility_range_(*this, 0.0), *************** *** 14813,14820 **** openvrml::material_node(type, scope), ambient_intensity_(*this, 0.2f), ! diffuse_color_(*this, color(0.8f, 0.8f, 0.8f)), ! emissive_color_(*this, color(0.0, 0.0, 0.0)), shininess_(*this, 0.2f), ! specular_color_(*this, color(0.0, 0.0, 0.0)), transparency_(*this, 0.0) {} --- 14813,14820 ---- openvrml::material_node(type, scope), ambient_intensity_(*this, 0.2f), ! diffuse_color_(*this, make_color(0.8f, 0.8f, 0.8f)), ! emissive_color_(*this, make_color(0.0, 0.0, 0.0)), shininess_(*this, 0.2f), ! specular_color_(*this, make_color(0.0, 0.0, 0.0)), transparency_(*this, 0.0) {} *************** *** 16937,16942 **** angle += float(2.0 * pi); } ! const rotation value(vec3f(x, y, z).normalize(), ! angle); node.value_changed_.value(value); break; --- 16937,16943 ---- angle += float(2.0 * pi); } ! const rotation value = ! make_rotation(make_vec3f(x, y, z).normalize(), ! angle); node.value_changed_.value(value); break; *************** *** 17550,17556 **** auto_offset_(*this, true), enabled_(*this, true), ! max_position_(*this, vec2f(-1.0, -1.0)), ! min_position_(*this, vec2f(0.0, 0.0)), ! offset_(*this, vec3f(0.0, 0.0, 0.0)), description_(*this), is_active_(false), --- 17551,17557 ---- auto_offset_(*this, true), enabled_(*this, true), ! max_position_(*this, make_vec2f(-1.0, -1.0)), ! min_position_(*this, make_vec2f(0.0, 0.0)), ! offset_(*this, make_vec3f(0.0, 0.0, 0.0)), description_(*this), is_active_(false), *************** *** 17612,17618 **** this->is_active_.value(active); ! vec3f V(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); this->activationMatrix = this->modelview.inverse(); V *= this->activationMatrix; --- 17613,17619 ---- this->is_active_.value(active); ! vec3f V = make_vec3f(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); this->activationMatrix = this->modelview.inverse(); V *= this->activationMatrix; *************** *** 17632,17638 **** } else if (active) { // Tracking ! vec3f V(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); V *= this->activationMatrix; this->track_point_changed_.value(V); --- 17633,17639 ---- } else if (active) { // Tracking ! vec3f V = make_vec3f(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); V *= this->activationMatrix; this->track_point_changed_.value(V); *************** *** 17640,17648 **** timestamp); ! vec3f t(V[0] - this->activationPoint.value().x() ! + this->offset_.sfvec3f::value().x(), ! V[1] - this->activationPoint.value().y() ! + this->offset_.sfvec3f::value().y(), ! 0.0); const vec2f & min_pos = this->min_position_.sfvec2f::value(); --- 17641,17649 ---- timestamp); ! vec3f t = make_vec3f(V[0] - this->activationPoint.value().x() ! + this->offset_.sfvec3f::value().x(), ! V[1] - this->activationPoint.value().y() ! + this->offset_.sfvec3f::value().y(), ! 0.0); const vec2f & min_pos = this->min_position_.sfvec2f::value(); *************** *** 17935,17940 **** abstract_light_node<point_light_node>(type, scope), scoped_light_node(type, scope), ! attenuation_(*this, vec3f(1.0, 0.0, 0.0)), ! location_(*this, vec3f(0.0, 0.0, 0.0)), radius_(*this, 100) {} --- 17936,17941 ---- abstract_light_node<point_light_node>(type, scope), scoped_light_node(type, scope), ! attenuation_(*this, make_vec3f(1.0, 0.0, 0.0)), ! location_(*this, make_vec3f(0.0, 0.0, 0.0)), radius_(*this, 100) {} *************** *** 18891,18897 **** abstract_node<proximity_sensor_node>(type, scope), child_node(type, scope), ! center_(*this, vec3f(0.0, 0.0, 0.0)), enabled_(*this, true), ! size_(*this, vec3f(0.0, 0.0, 0.0)), is_active_(false), is_active_emitter_(*this, this->is_active_), --- 18892,18898 ---- abstract_node<proximity_sensor_node>(type, scope), child_node(type, scope), ! center_(*this, make_vec3f(0.0, 0.0, 0.0)), enabled_(*this, true), ! size_(*this, make_vec3f(0.0, 0.0, 0.0)), is_active_(false), is_active_emitter_(*this, this->is_active_), *************** *** 18984,18989 **** // Check for movement within the box if (wasIn || inside) { ! if (this->position_changed_.value() != vec3f(x, y, z)) { ! this->position_changed_.value(vec3f(x, y, z)); node::emit_event(this->position_changed_emitter_, timeNow.value()); --- 18985,18990 ---- // Check for movement within the box if (wasIn || inside) { ! if (this->position_changed_.value() != make_vec3f(x, y, z)) { ! this->position_changed_.value(make_vec3f(x, y, z)); node::emit_event(this->position_changed_emitter_, timeNow.value()); *************** *** 19483,19487 **** appearance_(*this), geometry_(*this), ! bbox_size_(vec3f(-1,-1,-1)), viewerObject(0) {} --- 19484,19488 ---- appearance_(*this), geometry_(*this), ! bbox_size_(make_vec3f(-1,-1,-1)), viewerObject(0) {} *************** *** 19579,19583 **** // color. // ! color c(1.0, 1.0, 1.0); float transparency = 0.0; if (material) { --- 19580,19584 ---- // color. // ! color c = make_color(1.0, 1.0, 1.0); float transparency = 0.0; if (material) { *************** *** 19964,19968 **** abstract_node<sound_node>(type, scope), child_node(type, scope), ! direction_(*this, vec3f(0, 0, 1)), intensity_(*this, 1.0f), location_(*this), --- 19965,19969 ---- abstract_node<sound_node>(type, scope), child_node(type, scope), ! direction_(*this, make_vec3f(0, 0, 1)), intensity_(*this, 1.0f), location_(*this), *************** *** 20481,20485 **** auto_offset_(*this, true), enabled_(*this, true), ! offset_(*this, openvrml::rotation(0.0, 1.0, 0.0, 0.0)), description_(*this), is_active_(false), --- 20482,20486 ---- auto_offset_(*this, true), enabled_(*this, true), ! offset_(*this, openvrml::make_rotation(0.0, 1.0, 0.0, 0.0)), description_(*this), is_active_(false), *************** *** 20542,20548 **** // set activation point in world coords ! const vec3f floatVec(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); this->activationPoint.value(floatVec); --- 20543,20549 ---- // set activation point in world coords ! const vec3f floatVec = make_vec3f(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); this->activationPoint.value(floatVec); *************** *** 20575,20581 **** else if (active) { // get local coord for touch point ! vec3f V(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); mat4f M = this->modelview.inverse(); V = V * M; --- 20576,20582 ---- else if (active) { // get local coord for touch point ! vec3f V = make_vec3f(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); mat4f M = this->modelview.inverse(); V = V * M; *************** *** 20584,20590 **** timestamp); ! vec3f V2(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); vec3f tempv = V2 - this->centerPoint.value(); vec3f dir1(tempv); --- 20585,20591 ---- timestamp); ! vec3f V2 = make_vec3f(static_cast<float>(p[0]), ! static_cast<float>(p[1]), ! static_cast<float>(p[2])); vec3f tempv = V2 - this->centerPoint.value(); vec3f dir1(tempv); *************** *** 20605,20610 **** cx = cx.normalize(); ! openvrml::rotation newRot(cx, ! dist * float(acos(dir1.dot(dir2)))); if (this->auto_offset_.sfbool::value()) { newRot = newRot * this->offset_.sfrotation::value(); --- 20606,20611 ---- cx = cx.normalize(); ! openvrml::rotation newRot = ! make_rotation(cx, dist * float(acos(dir1.dot(dir2)))); if (this->auto_offset_.sfbool::value()) { newRot = newRot * this->offset_.sfrotation::value(); *************** *** 20950,20958 **** abstract_light_node<spot_light_node>(type, scope), scoped_light_node(type, scope), ! attenuation_(*this, vec3f(1.0, 0.0, 0.0)), beam_width_(*this, 1.570796f), cut_off_angle_(*this, 0.785398f), ! direction_(*this, vec3f(0.0, 0.0, -1.0)), ! location_(*this, vec3f(0.0, 0.0, 0.0)), radius_(*this, 100) {} --- 20951,20959 ---- abstract_light_node<spot_light_node>(type, scope), scoped_light_node(type, scope), ! attenuation_(*this, make_vec3f(1.0, 0.0, 0.0)), beam_width_(*this, 1.570796f), cut_off_angle_(*this, 0.785398f), ! direction_(*this, make_vec3f(0.0, 0.0, -1.0)), ! location_(*this, make_vec3f(0.0, 0.0, 0.0)), radius_(*this, 100) {} *************** *** 22953,22957 **** return FT_Err_Out_Of_Memory; } ! const vec2f vertex(to->x * c.scale, to->y * c.scale); c.contours.back().front() = vertex; return 0; --- 22954,22958 ---- return FT_Err_Out_Of_Memory; } ! const vec2f vertex = make_vec2f(to->x * c.scale, to->y * c.scale); c.contours.back().front() = vertex; return 0; *************** *** 22963,22967 **** assert(user); GlyphContours_ & c = *static_cast<GlyphContours_ *>(user); ! const openvrml::vec2f vertex(to->x * c.scale, to->y * c.scale); try { c.contours.back().push_back(vertex); --- 22964,22969 ---- assert(user); GlyphContours_ & c = *static_cast<GlyphContours_ *>(user); ! const openvrml::vec2f vertex = make_vec2f(to->x * c.scale, ! to->y * c.scale); try { c.contours.back().push_back(vertex); *************** *** 23042,23048 **** const size_t npoints = 3; vec2f buffer[npoints * npoints] = { ! vec2f(lastVertex[0], lastVertex[1]), ! vec2f(control->x * c.scale, control->y * c.scale), ! vec2f(to->x * c.scale, to->y * c.scale) }; --- 23044,23050 ---- const size_t npoints = 3; vec2f buffer[npoints * npoints] = { ! make_vec2f(lastVertex[0], lastVertex[1]), ! make_vec2f(control->x * c.scale, control->y * c.scale), ! make_vec2f(to->x * c.scale, to->y * c.scale) }; *************** *** 23079,23086 **** static const size_t npoints = 4; vec2f buffer[npoints * npoints] = { ! vec2f(lastVertex[0], lastVertex[1]), ! vec2f(control1->x * c.scale, control1->y * c.scale), ! vec2f(control2->x * c.scale, control2->y * c.scale), ! vec2f(to->x * c.scale, to->y * c.scale) }; --- 23081,23088 ---- static const size_t npoints = 4; vec2f buffer[npoints * npoints] = { ! make_vec2f(lastVertex[0], lastVertex[1]), ! make_vec2f(control1->x * c.scale, control1->y * c.scale), ! make_vec2f(control2->x * c.scale, control2->y * c.scale), ! make_vec2f(to->x * c.scale, to->y * c.scale) }; *************** *** 23228,23233 **** for (size_t i = 0; i < glyphGeometry->coord.size(); ++i) { const vec2f & glyphVertex = glyphGeometry->coord[i]; ! const vec2f textVertex(glyphVertex[0] + penPos[0], ! glyphVertex[1] + penPos[1]); lineGeometry.coord.push_back(textVertex); lineGeometry.xMin = (lineGeometry.xMin < textVertex[0]) --- 23230,23236 ---- for (size_t i = 0; i < glyphGeometry->coord.size(); ++i) { const vec2f & glyphVertex = glyphGeometry->coord[i]; ! const vec2f textVertex = ! make_vec2f(glyphVertex[0] + penPos[0], ! glyphVertex[1] + penPos[1]); lineGeometry.coord.push_back(textVertex); lineGeometry.xMin = (lineGeometry.xMin < textVertex[0]) *************** *** 23286,23291 **** for (size_t i = 0; i < lineGeometry.coord.size(); ++i) { const vec2f & vertex = lineGeometry.coord[i]; ! const vec2f scaledVertex(vertex[0] / currentLength * length, ! vertex[1]); lineGeometry.coord[i] = scaledVertex; } --- 23289,23295 ---- for (size_t i = 0; i < lineGeometry.coord.size(); ++i) { const vec2f & vertex = lineGeometry.coord[i]; ! const vec2f scaledVertex = ! make_vec2f(vertex[0] / currentLength * length, ! vertex[1]); lineGeometry.coord[i] = scaledVertex; } *************** *** 23319,23325 **** if (index > -1) { const vec2f & lineVertex = lineGeometry.coord[index]; ! const vec3f textVertex(lineVertex.x() + xOffset, ! lineVertex.y() + yOffset, ! 0.0f); newGeometry.coord.push_back(textVertex); newGeometry.coord_index --- 23323,23330 ---- if (index > -1) { const vec2f & lineVertex = lineGeometry.coord[index]; ! const vec3f textVertex = ! make_vec3f(lineVertex.x() + xOffset, ! lineVertex.y() + yOffset, ! 0.0f); newGeometry.coord.push_back(textVertex); newGeometry.coord_index *************** *** 23355,23363 **** for (size_t i = 0; i < newGeometry.coord.size(); ++i) { const vec3f & vertex = newGeometry.coord[i]; ! const vec3f scaledVertex( ! vertex.x() / currentMaxExtent * maxExtent, ! vertex.y(), ! vertex.z() ! ); newGeometry.coord[i] = scaledVertex; } --- 23360,23367 ---- for (size_t i = 0; i < newGeometry.coord.size(); ++i) { const vec3f & vertex = newGeometry.coord[i]; ! const vec3f scaledVertex = ! make_vec3f(vertex.x() / currentMaxExtent * maxExtent, ! vertex.y(), ! vertex.z()); newGeometry.coord[i] = scaledVertex; } *************** *** 23397,23403 **** for (size_t i = 0; i < newGeometry.coord.size(); ++i) { const vec3f & vertex = newGeometry.coord[i]; ! const vec3f adjustedVertex(vertex.x() + xOffset, ! vertex.y() + yOffset, ! vertex.z()); newGeometry.coord[i] = adjustedVertex; } --- 23401,23407 ---- for (size_t i = 0; i < newGeometry.coord.size(); ++i) { const vec3f & vertex = newGeometry.coord[i]; ! const vec3f adjustedVertex = make_vec3f(vertex.x() + xOffset, ! vertex.y() + yOffset, ! vertex.z()); newGeometry.coord[i] = adjustedVertex; } *************** *** 23408,23412 **** newGeometry.normal.resize(npolygons); // Throws std::bad_alloc. for (size_t i = 0; i < newGeometry.normal.size(); ++i) { ! static const vec3f normal(0.0, 0.0, 1.0); newGeometry.normal[i] = normal; } --- 23412,23416 ---- newGeometry.normal.resize(npolygons); // Throws std::bad_alloc. for (size_t i = 0; i < newGeometry.normal.size(); ++i) { ! static const vec3f normal = make_vec3f(0.0, 0.0, 1.0); newGeometry.normal[i] = normal; } *************** *** 23418,23422 **** for (size_t i = 0; i < newGeometry.tex_coord.size(); ++i) { const vec3f & vertex = newGeometry.coord[i]; ! newGeometry.tex_coord[i] = vec2f(vertex.x() / size, vertex.y() / size); } --- 23422,23427 ---- for (size_t i = 0; i < newGeometry.tex_coord.size(); ++i) { const vec3f & vertex = newGeometry.coord[i]; ! newGeometry.tex_coord[i] = make_vec2f(vertex.x() / size, ! vertex.y() / size); } *************** *** 23802,23809 **** abstract_node<texture_transform_node>(type, scope), openvrml::texture_transform_node(type, scope), ! center_(*this, vec2f(0.0, 0.0)), rotation_(*this, 0.0), ! scale_(*this, vec2f(1.0, 1.0)), ! translation_(*this, vec2f(0.0, 0.0)) {} --- 23807,23814 ---- abstract_node<texture_transform_node>(type, scope), openvrml::texture_transform_node(type, scope), ! center_(*this, make_vec2f(0.0, 0.0)), rotation_(*this, 0.0), ! scale_(*this, make_vec2f(1.0, 1.0)), ! translation_(*this, make_vec2f(0.0, 0.0)) {} *************** *** 25390,25394 **** openvrml::event_emitter(static_cast<const field_value &>(*this)), sfvec3f_listener(node), ! exposedfield<openvrml::sfvec3f>(node, vec3f(1.0f, 1.0f, 1.0f)) {} --- 25395,25399 ---- openvrml::event_emitter(static_cast<const field_value &>(*this)), sfvec3f_listener(node), ! exposedfield<openvrml::sfvec3f>(node, make_vec3f(1.0f, 1.0f, 1.0f)) {} *************** *** 25782,25786 **** if (this->transform_dirty) { this->transform_ = ! mat4f::transformation( this->translation_.sfvec3f::value(), this->rotation_.sfrotation::value(), --- 25787,25791 ---- if (this->transform_dirty) { this->transform_ = ! make_transformation_mat4f( this->translation_.sfvec3f::value(), this->rotation_.sfrotation::value(), *************** *** 26326,26330 **** openvrml::event_emitter(static_cast<const field_value &>(*this)), sfvec3f_listener(node), ! exposedfield<openvrml::sfvec3f>(node, vec3f(0.0f, 0.0f, 10.0f)) {} --- 26331,26335 ---- openvrml::event_emitter(static_cast<const field_value &>(*this)), sfvec3f_listener(node), ! exposedfield<openvrml::sfvec3f>(node, make_vec3f(0.0f, 0.0f, 10.0f)) {} *************** *** 26690,26702 **** { if (this->final_transformation_dirty) { ! static const vec3f scale(1.0, 1.0, 1.0); ! static const rotation scaleOrientation; ! static const vec3f center; const mat4f & t = ! mat4f::transformation(this->position_.sfvec3f::value(), ! this->orientation_.sfrotation::value(), ! scale, ! scaleOrientation, ! center); this->final_transformation = t * this->parent_transform; this->final_transformation_dirty = false; --- 26695,26707 ---- { if (this->final_transformation_dirty) { ! static const vec3f scale = make_vec3f(1.0, 1.0, 1.0); ! static const rotation scaleOrientation = make_rotation(); ! static const vec3f center = make_vec3f(); const mat4f & t = ! make_transformation_mat4f(this->position_.sfvec3f::value(), ! this->orientation_.sfrotation::value(), ! scale, ! scaleOrientation, ! center); this->final_transformation = t * this->parent_transform; this->final_transformation_dirty = false; *************** *** 26965,26971 **** abstract_node<visibility_sensor_node>(type, scope), child_node(type, scope), ! center_(*this, vec3f(0.0, 0.0, 0.0)), enabled_(*this, true), ! size_(*this, vec3f(0.0, 0.0, 0.0)), is_active_(false), is_active_emitter_(*this, this->is_active_), --- 26970,26976 ---- abstract_node<visibility_sensor_node>(type, scope), child_node(type, scope), ! center_(*this, make_vec3f(0.0, 0.0, 0.0)), enabled_(*this, true), ! size_(*this, make_vec3f(0.0, 0.0, 0.0)), is_active_(false), is_active_emitter_(*this, this->is_active_), Index: Vrml97Parser.g =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** Vrml97Parser.g 2 Aug 2006 03:20:02 -0000 1.68 --- Vrml97Parser.g 31 Aug 2006 06:45:30 -0000 1.69 *************** *** 2057,2061 **** } : x=floatValue y=floatValue z=floatValue angle=floatValue { ! vec3f axis(x, y, z); const float axisLength = axis.length(); --- 2057,2061 ---- } : x=floatValue y=floatValue z=floatValue angle=floatValue { ! vec3f axis = make_vec3f(x, y, z); const float axisLength = axis.length(); *************** *** 2069,2073 **** } } ! r = rotation(axis, angle); } ; --- 2069,2073 ---- } } ! r = make_rotation(axis, angle); } ; Index: script.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.cpp,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** script.cpp 6 Aug 2006 06:45:24 -0000 1.77 --- script.cpp 31 Aug 2006 06:45:31 -0000 1.78 *************** *** 4780,4786 **** auto_ptr<openvrml::sfcolor> ! sfcolor(new openvrml::sfcolor(openvrml::color(rgb[0], ! rgb[1], ! rgb[2]))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfcolor.get())); sfcolor.release(); --- 4780,4786 ---- auto_ptr<openvrml::sfcolor> ! sfcolor(new openvrml::sfcolor(openvrml::make_color(rgb[0], ! rgb[1], ... [truncated message content] |
|
From: Braden M. <br...@us...> - 2006-08-31 06:45:37
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14506/src/libopenvrml-gl/openvrml/gl Modified Files: viewer.cpp Log Message: Made openvrml::color, openvrml::color_rgba, openvrml::vec2f, openvrml::vec2d, openvrml::vec3f, openvrml::vec3d, openvrml::rotation, openvrml::mat4f, and openvrml::quatf POD-structs. This allows safe usage of these types in C APIs. Index: viewer.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** viewer.cpp 31 Aug 2006 06:30:51 -0000 1.44 --- viewer.cpp 31 Aug 2006 06:45:34 -0000 1.45 *************** *** 877,882 **** // deformed sphere // ! vec3f p1(p1x, p1y, tb_project_to_sphere(trackballSize, p1x, p1y)); ! vec3f p2(p2x, p2y, tb_project_to_sphere(trackballSize, p2x, p2y)); result.axis((p2 * p1).normalize()); --- 877,888 ---- // deformed sphere // ! const vec3f p1 = ! make_vec3f(p1x, ! p1y, ! tb_project_to_sphere(trackballSize, p1x, p1y)); ! const vec3f p2 = ! make_vec3f(p2x, ! p2y, ! tb_project_to_sphere(trackballSize, p2x, p2y)); result.axis((p2 * p1).normalize()); *************** *** 1872,1877 **** // Normal per face. // ! const vec3f vx(xSpacing, *(h + 1) - *h, 0.0); ! const vec3f vz(0.0, *(h + xDimension) - *h, zSpacing); glNormal3fv(&(vx * vz)[0]); } --- 1878,1885 ---- // Normal per face. // ! const vec3f vx = make_vec3f(xSpacing, *(h + 1) - *h, 0.0); ! const vec3f vz = make_vec3f(0.0, ! *(h + xDimension) - *h, ! zSpacing); glNormal3fv(&(vx * vz)[0]); } *************** *** 2160,2166 **** // Xscp, Yscp, Zscp- columns of xform matrix to align cross section // with spine segments. ! vec3f Xscp(1.0, 0.0, 0.0); ! vec3f Yscp(0.0, 1.0, 0.0); ! vec3f Zscp(0.0, 0.0, 1.0); vec3f lastZ; --- 2168,2174 ---- // Xscp, Yscp, Zscp- columns of xform matrix to align cross section // with spine segments. ! vec3f Xscp = make_vec3f(1.0, 0.0, 0.0); ! vec3f Yscp = make_vec3f(0.0, 1.0, 0.0); ! vec3f Zscp = make_vec3f(0.0, 0.0, 1.0); vec3f lastZ; *************** *** 2182,2186 **** // If the spine is a straight line, compute a constant SCP xform if (spineStraight) { ! const vec3f v1(0.0, 1.0, 0.0); const vec3f v2 = spine.back() - spine.front(); vec3f v3 = v2 * v1; --- 2190,2194 ---- // If the spine is a straight line, compute a constant SCP xform if (spineStraight) { ! const vec3f v1 = make_vec3f(0.0, 1.0, 0.0); const vec3f v2 = spine.back() - spine.front(); vec3f v3 = v2 * v1; *************** *** 2192,2200 **** v3 *= float(1.0 / len); ! const rotation orient(v3, float(acos(v1.dot(v2)))); // Axis/angle ! const mat4f scp = mat4f::rotation(orient); // xform matrix ! Xscp = vec3f(scp[0][0], scp[0][1], scp[0][2]); ! Yscp = vec3f(scp[1][0], scp[1][1], scp[1][2]); ! Zscp = vec3f(scp[2][0], scp[2][1], scp[2][2]); } } --- 2200,2209 ---- v3 *= float(1.0 / len); ! const rotation orient = ! make_rotation(v3, float(acos(v1.dot(v2)))); // Axis/angle ! const mat4f scp = make_rotation_mat4f(orient); // xform matrix ! Xscp = make_vec3f(scp[0][0], scp[0][1], scp[0][2]); ! Yscp = make_vec3f(scp[1][0], scp[1][1], scp[1][2]); ! Zscp = make_vec3f(scp[2][0], scp[2][1], scp[2][2]); } } *************** *** 2204,2208 **** if (orientation.size() == 1 && !fequal<float>()(orientation.front().angle(), 0.0f)) { ! om = mat4f::rotation(orientation.front()); } --- 2213,2217 ---- if (orientation.size() == 1 && !fequal<float>()(orientation.front().angle(), 0.0f)) { ! om = make_rotation_mat4f(orientation.front()); } *************** *** 2288,2292 **** // if (!fequal<float>()(r->angle(), 0.0f)) { ! if (orientation.size() > 1) { om = mat4f::rotation(*r); } for (j = 0; j < crossSection.size(); ++j) { --- 2297,2301 ---- // if (!fequal<float>()(r->angle(), 0.0f)) { ! if (orientation.size() > 1) { om = make_rotation_mat4f(*r); } for (j = 0; j < crossSection.size(); ++j) { *************** *** 3858,3866 **** currentScale); ! const mat4f r = mat4f::rotation(rot); ! const mat4f prevOrientation = mat4f::rotation(currentRotation); ! const mat4f t = mat4f::translation(currentTranslation); const mat4f newCameraTransform = --- 3867,3875 ---- currentScale); ! const mat4f r = make_rotation_mat4f(rot); ! const mat4f prevOrientation = make_rotation_mat4f(currentRotation); ! const mat4f t = make_translation_mat4f(currentTranslation); const mat4f newCameraTransform = *************** *** 3883,3887 **** assert(this->browser()); ! mat4f t = mat4f::translation(vec3f(x, y, z)); viewpoint_node & activeViewpoint = this->browser()->active_viewpoint(); activeViewpoint --- 3892,3896 ---- assert(this->browser()); ! mat4f t = make_translation_mat4f(make_vec3f(x, y, z)); viewpoint_node & activeViewpoint = this->browser()->active_viewpoint(); activeViewpoint *************** *** 3936,3943 **** dy *= dist; dz *= dist; ! const vec3f translation(static_cast<float>(dx), ! static_cast<float>(dy), ! static_cast<float>(dz)); ! mat4f t = mat4f::translation(translation); viewpoint_node & activeViewpoint = this->browser()->active_viewpoint(); const mat4f & userViewTransform = activeViewpoint.user_view_transform(); --- 3945,3952 ---- dy *= dist; dz *= dist; ! const vec3f translation = make_vec3f(static_cast<float>(dx), ! static_cast<float>(dy), ! static_cast<float>(dz)); ! mat4f t = make_translation_mat4f(translation); viewpoint_node & activeViewpoint = this->browser()->active_viewpoint(); const mat4f & userViewTransform = activeViewpoint.user_view_transform(); |
|
From: Braden M. <br...@us...> - 2006-08-31 06:30:54
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8613 Modified Files: ChangeLog Log Message: Explicitly qualify definitions from the global scope rather than enclose them in namespace blocks, consistent with the rest of OpenVRML. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1318 retrieving revision 1.1319 diff -C2 -d -r1.1318 -r1.1319 *** ChangeLog 28 Aug 2006 20:15:41 -0000 1.1318 --- ChangeLog 31 Aug 2006 06:30:51 -0000 1.1319 *************** *** 1,2 **** --- 1,8 ---- + 2006-08-31 Braden McDaniel <br...@en...> + + * src/libopenvrml-gl/openvrml/gl/viewer.cpp: Explicitly qualify + definitions from the global scope rather than enclose them in + namespace blocks, consistent with the rest of OpenVRML. + 2006-08-28 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-08-31 06:30:54
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8613/src/libopenvrml-gl/openvrml/gl Modified Files: viewer.cpp Log Message: Explicitly qualify definitions from the global scope rather than enclose them in namespace blocks, consistent with the rest of OpenVRML. Index: viewer.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** viewer.cpp 25 Feb 2006 08:37:28 -0000 1.43 --- viewer.cpp 31 Aug 2006 06:30:51 -0000 1.44 *************** *** 343,355 **** - namespace openvrml { - /** * @brief OpenGL geometry renderer. */ - namespace gl { /** [...1958 lines suppressed...] /** ! * @fn void viewer::set_timer(double interval) * * @brief Set a delay. --- 4494,4498 ---- /** ! * @fn void openvrml::gl::viewer::set_timer(double interval) * * @brief Set a delay. *************** *** 4473,4478 **** * @param[in] interval milliseconds to delay. */ - - } // namespace gl - - } // namespace openvrml --- 4500,4501 ---- |
|
From: Braden M. <br...@us...> - 2006-08-31 06:30:37
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8583/src/libopenvrml-gl/openvrml/gl Modified Files: Tag: OpenVRML-0_16-BRANCH viewer.cpp Log Message: Explicitly qualify definitions from the global scope rather than enclose them in namespace blocks, consistent with the rest of OpenVRML. Index: viewer.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v retrieving revision 1.43 retrieving revision 1.43.2.1 diff -C2 -d -r1.43 -r1.43.2.1 *** viewer.cpp 25 Feb 2006 08:37:28 -0000 1.43 --- viewer.cpp 31 Aug 2006 06:30:33 -0000 1.43.2.1 *************** *** 343,355 **** - namespace openvrml { - /** * @brief OpenGL geometry renderer. */ - namespace gl { /** [...1958 lines suppressed...] /** ! * @fn void viewer::set_timer(double interval) * * @brief Set a delay. --- 4494,4498 ---- /** ! * @fn void openvrml::gl::viewer::set_timer(double interval) * * @brief Set a delay. *************** *** 4473,4478 **** * @param[in] interval milliseconds to delay. */ - - } // namespace gl - - } // namespace openvrml --- 4500,4501 ---- |
|
From: Braden M. <br...@us...> - 2006-08-31 06:30:37
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8583 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Explicitly qualify definitions from the global scope rather than enclose them in namespace blocks, consistent with the rest of OpenVRML. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.8 retrieving revision 1.1310.2.9 diff -C2 -d -r1.1310.2.8 -r1.1310.2.9 *** ChangeLog 28 Aug 2006 20:04:34 -0000 1.1310.2.8 --- ChangeLog 31 Aug 2006 06:30:32 -0000 1.1310.2.9 *************** *** 1,2 **** --- 1,8 ---- + 2006-08-31 Braden McDaniel <br...@en...> + + * src/libopenvrml-gl/openvrml/gl/viewer.cpp: Explicitly qualify + definitions from the global scope rather than enclose them in + namespace blocks, consistent with the rest of OpenVRML. + 2006-08-28 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-08-28 20:46:15
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/antlr In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23545/ide-projects/Windows/VisualC8_0/OpenVRML/antlr Added Files: .cvsignore Log Message: Added .cvsignore files. --- NEW FILE: .cvsignore --- *.vcproj.*.user |
|
From: Braden M. <br...@us...> - 2006-08-28 20:46:14
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23545/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer Added Files: .cvsignore Log Message: Added .cvsignore files. --- NEW FILE: .cvsignore --- *.vcproj.*.user |
|
From: Braden M. <br...@us...> - 2006-08-28 20:46:14
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23545/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml Added Files: .cvsignore Log Message: Added .cvsignore files. --- NEW FILE: .cvsignore --- *.aps *.vcproj.*.user |
|
From: Braden M. <br...@us...> - 2006-08-28 20:46:14
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23545/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl Added Files: .cvsignore Log Message: Added .cvsignore files. --- NEW FILE: .cvsignore --- *.aps *.vcproj.*.user |
|
From: Braden M. <br...@us...> - 2006-08-28 20:45:45
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23159/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl Added Files: Tag: OpenVRML-0_16-BRANCH .cvsignore Log Message: Added .cvsignore files. --- NEW FILE: .cvsignore --- *.aps *.vcproj.*.user |
|
From: Braden M. <br...@us...> - 2006-08-28 20:45:43
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/antlr In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23159/ide-projects/Windows/VisualC8_0/OpenVRML/antlr Added Files: Tag: OpenVRML-0_16-BRANCH .cvsignore Log Message: Added .cvsignore files. --- NEW FILE: .cvsignore --- *.vcproj.*.user |
|
From: Braden M. <br...@us...> - 2006-08-28 20:45:42
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23159/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer Added Files: Tag: OpenVRML-0_16-BRANCH .cvsignore Log Message: Added .cvsignore files. --- NEW FILE: .cvsignore --- *.vcproj.*.user |
|
From: Braden M. <br...@us...> - 2006-08-28 20:45:42
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23159/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml Added Files: Tag: OpenVRML-0_16-BRANCH .cvsignore Log Message: Added .cvsignore files. --- NEW FILE: .cvsignore --- *.aps *.vcproj.*.user |
|
From: Braden M. <br...@us...> - 2006-08-28 20:15:48
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8853/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl Modified Files: openvrml-gl.vcproj Added Files: openvrml-gl.rc resource.h Log Message: Visual C++ 8.0 project file improvements. --- NEW FILE: resource.h --- //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by openvrml-gl.rc // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif --- NEW FILE: openvrml-gl.rc --- // Microsoft Visual C++ generated resource script. // #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // TEXTINCLUDE // 1 TEXTINCLUDE BEGIN "resource.h\0" END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END 3 TEXTINCLUDE BEGIN "\r\n" "\0" END #endif // APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Version // VS_VERSION_INFO VERSIONINFO FILEVERSION 6,2,0,0 PRODUCTVERSION 0,16,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L #else FILEFLAGS 0x0L #endif FILEOS 0x4L FILETYPE 0x2L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML OpenGL Renderer Library" VALUE "FileVersion", "6, 2, 0, 0" VALUE "InternalName", "openvrml-gl" VALUE "LegalCopyright", "Copyright (C) 2006" VALUE "OriginalFilename", "openvrml-gl.dll" VALUE "ProductName", "OpenVRML Library" VALUE "ProductVersion", "0, 16, 0, 0" END END BLOCK "VarFileInfo" BEGIN VALUE "Translation", 0x409, 1200 END END #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 3 resource. // ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED Index: openvrml-gl.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** openvrml-gl.vcproj 19 May 2006 21:47:02 -0000 1.4 --- openvrml-gl.vcproj 28 Aug 2006 20:15:42 -0000 1.5 *************** *** 340,343 **** --- 340,347 ---- </File> <File + RelativePath=".\resource.h" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml-gl\openvrml\gl\viewer.h" > *************** *** 348,351 **** --- 352,359 ---- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > + <File + RelativePath=".\openvrml-gl.rc" + > + </File> </Filter> </Files> |
|
From: Braden M. <br...@us...> - 2006-08-28 20:15:47
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8853/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml Modified Files: openvrml.vcproj Added Files: openvrml.rc resource.h Log Message: Visual C++ 8.0 project file improvements. Index: openvrml.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** openvrml.vcproj 19 May 2006 21:47:02 -0000 1.4 --- openvrml.vcproj 28 Aug 2006 20:15:42 -0000 1.5 *************** *** 209,212 **** --- 209,213 ---- <Tool Name="VCLinkerTool" + GenerateDebugInformation="true" /> <Tool *************** *** 581,584 **** --- 582,589 ---- </File> <File + RelativePath=".\resource.h" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scope.h" > *************** *** 678,684 **** --- 683,703 ---- > <File + RelativePath=".\openvrml.rc" + > + </File> + </Filter> + <Filter + Name="ANTLR Grammar Files" + Filter="g" + ParseFiles="false" + > + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\Vrml97Parser.g" > </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\X3DVrmlParser.g" + > + </File> </Filter> </Files> --- NEW FILE: resource.h --- //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by openvrml.rc // // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 102 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif --- NEW FILE: openvrml.rc --- // Microsoft Visual C++ generated resource script. // #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // TEXTINCLUDE // 1 TEXTINCLUDE BEGIN "resource.h\0" END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END 3 TEXTINCLUDE BEGIN "\r\n" "\0" END #endif // APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Version // VS_VERSION_INFO VERSIONINFO FILEVERSION 6,0,0,0 PRODUCTVERSION 0,16,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L #else FILEFLAGS 0x0L #endif FILEOS 0x4L FILETYPE 0x2L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML Library" VALUE "FileVersion", "6, 0, 0, 0" VALUE "InternalName", "openvrml" VALUE "LegalCopyright", "Copyright (C) 2006" VALUE "OriginalFilename", "openvrml.dll" VALUE "ProductName", "OpenVRML Library" VALUE "ProductVersion", "0.16.0" END END BLOCK "VarFileInfo" BEGIN VALUE "Translation", 0x409, 1200 END END #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 3 resource. // ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED |
|
From: Braden M. <br...@us...> - 2006-08-28 20:15:47
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8853/ide-projects/Windows/VisualC8_0/OpenVRML Modified Files: OpenVRML.sln Log Message: Visual C++ 8.0 project file improvements. Index: OpenVRML.sln =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/OpenVRML.sln,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OpenVRML.sln 21 Feb 2006 20:47:01 -0000 1.1 --- OpenVRML.sln 28 Aug 2006 20:15:42 -0000 1.2 *************** *** 1,4 **** Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml", "openvrml\openvrml.vcproj", "{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}" ProjectSection(ProjectDependencies) = postProject --- 1,4 ---- Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml", "openvrml\openvrml.vcproj", "{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}" ProjectSection(ProjectDependencies) = postProject *************** *** 15,21 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl-viewer", "sdl-viewer\sdl-viewer.vcproj", "{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}" ProjectSection(ProjectDependencies) = postProject - {ED407BF6-F8A1-4C7E-9952-E5454896AC63} = {ED407BF6-F8A1-4C7E-9952-E5454896AC63} - {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} {141F90C2-6630-4D7A-834F-D5D57C6CFC24} = {141F90C2-6630-4D7A-834F-D5D57C6CFC24} EndProjectSection EndProject --- 15,33 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl-viewer", "sdl-viewer\sdl-viewer.vcproj", "{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}" ProjectSection(ProjectDependencies) = postProject {141F90C2-6630-4D7A-834F-D5D57C6CFC24} = {141F90C2-6630-4D7A-834F-D5D57C6CFC24} + {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} + {ED407BF6-F8A1-4C7E-9952-E5454896AC63} = {ED407BF6-F8A1-4C7E-9952-E5454896AC63} + EndProjectSection + EndProject + Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0961B1CF-A5CE-47BF-AC8B-CFC8AB30B5DA}" + ProjectSection(SolutionItems) = preProject + ..\..\..\..\AUTHORS = ..\..\..\..\AUTHORS + ..\..\..\..\ChangeLog = ..\..\..\..\ChangeLog + ..\..\..\..\COPYING = ..\..\..\..\COPYING + ..\..\..\..\COPYING.LESSER = ..\..\..\..\COPYING.LESSER + ..\..\..\..\INSTALL = ..\..\..\..\INSTALL + ..\..\..\..\NEWS = ..\..\..\..\NEWS + ..\..\..\..\README = ..\..\..\..\README + ..\..\..\..\THANKS = ..\..\..\..\THANKS EndProjectSection EndProject |
|
From: Braden M. <br...@us...> - 2006-08-28 20:15:47
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8853 Modified Files: ChangeLog Log Message: Visual C++ 8.0 project file improvements. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1317 retrieving revision 1.1318 diff -C2 -d -r1.1317 -r1.1318 *** ChangeLog 27 Aug 2006 04:37:42 -0000 1.1317 --- ChangeLog 28 Aug 2006 20:15:41 -0000 1.1318 *************** *** 1,2 **** --- 1,14 ---- + 2006-08-28 Braden McDaniel <br...@en...> + + Visual C++ 8.0 project file improvements. + + * ide-projects/Windows/VisualC8_0/OpenVRML/OpenVRML.sln + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.rc + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/resource.h + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.rc + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/resource.h + 2006-08-27 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-08-28 20:04:44
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3274/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml.vcproj Added Files: Tag: OpenVRML-0_16-BRANCH openvrml.rc resource.h Log Message: Visual C++ 8.0 project file improvements. Index: openvrml.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** openvrml.vcproj 19 May 2006 21:47:02 -0000 1.4 --- openvrml.vcproj 28 Aug 2006 20:04:34 -0000 1.4.2.1 *************** *** 209,212 **** --- 209,213 ---- <Tool Name="VCLinkerTool" + GenerateDebugInformation="true" /> <Tool *************** *** 581,584 **** --- 582,589 ---- </File> <File + RelativePath=".\resource.h" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scope.h" > *************** *** 678,684 **** --- 683,703 ---- > <File + RelativePath=".\openvrml.rc" + > + </File> + </Filter> + <Filter + Name="ANTLR Grammar Files" + Filter="g" + ParseFiles="false" + > + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\Vrml97Parser.g" > </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\X3DVrmlParser.g" + > + </File> </Filter> </Files> --- NEW FILE: resource.h --- //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by openvrml.rc // // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 102 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif --- NEW FILE: openvrml.rc --- // Microsoft Visual C++ generated resource script. // #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // TEXTINCLUDE // 1 TEXTINCLUDE BEGIN "resource.h\0" END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END 3 TEXTINCLUDE BEGIN "\r\n" "\0" END #endif // APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Version // VS_VERSION_INFO VERSIONINFO FILEVERSION 6,0,0,0 PRODUCTVERSION 0,16,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L #else FILEFLAGS 0x0L #endif FILEOS 0x4L FILETYPE 0x2L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML Library" VALUE "FileVersion", "6, 0, 0, 0" VALUE "InternalName", "openvrml" VALUE "LegalCopyright", "Copyright (C) 2006" VALUE "OriginalFilename", "openvrml.dll" VALUE "ProductName", "OpenVRML Library" VALUE "ProductVersion", "0.16.0" END END BLOCK "VarFileInfo" BEGIN VALUE "Translation", 0x409, 1200 END END #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 3 resource. // ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED |
|
From: Braden M. <br...@us...> - 2006-08-28 20:04:40
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3274/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml-gl.vcproj Added Files: Tag: OpenVRML-0_16-BRANCH openvrml-gl.rc resource.h Log Message: Visual C++ 8.0 project file improvements. --- NEW FILE: resource.h --- //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by openvrml-gl.rc // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif --- NEW FILE: openvrml-gl.rc --- // Microsoft Visual C++ generated resource script. // #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // TEXTINCLUDE // 1 TEXTINCLUDE BEGIN "resource.h\0" END 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END 3 TEXTINCLUDE BEGIN "\r\n" "\0" END #endif // APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Version // VS_VERSION_INFO VERSIONINFO FILEVERSION 6,2,0,0 PRODUCTVERSION 0,16,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L #else FILEFLAGS 0x0L #endif FILEOS 0x4L FILETYPE 0x2L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML OpenGL Renderer Library" VALUE "FileVersion", "6, 2, 0, 0" VALUE "InternalName", "openvrml-gl" VALUE "LegalCopyright", "Copyright (C) 2006" VALUE "OriginalFilename", "openvrml-gl.dll" VALUE "ProductName", "OpenVRML Library" VALUE "ProductVersion", "0, 16, 0, 0" END END BLOCK "VarFileInfo" BEGIN VALUE "Translation", 0x409, 1200 END END #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 3 resource. // ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED Index: openvrml-gl.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** openvrml-gl.vcproj 19 May 2006 21:47:02 -0000 1.4 --- openvrml-gl.vcproj 28 Aug 2006 20:04:35 -0000 1.4.2.1 *************** *** 340,343 **** --- 340,347 ---- </File> <File + RelativePath=".\resource.h" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml-gl\openvrml\gl\viewer.h" > *************** *** 348,351 **** --- 352,359 ---- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > + <File + RelativePath=".\openvrml-gl.rc" + > + </File> </Filter> </Files> |
|
From: Braden M. <br...@us...> - 2006-08-28 20:04:40
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3274/ide-projects/Windows/VisualC8_0/OpenVRML Modified Files: Tag: OpenVRML-0_16-BRANCH OpenVRML.sln Log Message: Visual C++ 8.0 project file improvements. Index: OpenVRML.sln =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/OpenVRML.sln,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** OpenVRML.sln 21 Feb 2006 20:47:01 -0000 1.1 --- OpenVRML.sln 28 Aug 2006 20:04:34 -0000 1.1.2.1 *************** *** 1,4 **** Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml", "openvrml\openvrml.vcproj", "{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}" ProjectSection(ProjectDependencies) = postProject --- 1,4 ---- Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml", "openvrml\openvrml.vcproj", "{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}" ProjectSection(ProjectDependencies) = postProject *************** *** 15,21 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl-viewer", "sdl-viewer\sdl-viewer.vcproj", "{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}" ProjectSection(ProjectDependencies) = postProject - {ED407BF6-F8A1-4C7E-9952-E5454896AC63} = {ED407BF6-F8A1-4C7E-9952-E5454896AC63} - {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} {141F90C2-6630-4D7A-834F-D5D57C6CFC24} = {141F90C2-6630-4D7A-834F-D5D57C6CFC24} EndProjectSection EndProject --- 15,33 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl-viewer", "sdl-viewer\sdl-viewer.vcproj", "{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}" ProjectSection(ProjectDependencies) = postProject {141F90C2-6630-4D7A-834F-D5D57C6CFC24} = {141F90C2-6630-4D7A-834F-D5D57C6CFC24} + {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} + {ED407BF6-F8A1-4C7E-9952-E5454896AC63} = {ED407BF6-F8A1-4C7E-9952-E5454896AC63} + EndProjectSection + EndProject + Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0961B1CF-A5CE-47BF-AC8B-CFC8AB30B5DA}" + ProjectSection(SolutionItems) = preProject + ..\..\..\..\AUTHORS = ..\..\..\..\AUTHORS + ..\..\..\..\ChangeLog = ..\..\..\..\ChangeLog + ..\..\..\..\COPYING = ..\..\..\..\COPYING + ..\..\..\..\COPYING.LESSER = ..\..\..\..\COPYING.LESSER + ..\..\..\..\INSTALL = ..\..\..\..\INSTALL + ..\..\..\..\NEWS = ..\..\..\..\NEWS + ..\..\..\..\README = ..\..\..\..\README + ..\..\..\..\THANKS = ..\..\..\..\THANKS EndProjectSection EndProject |
|
From: Braden M. <br...@us...> - 2006-08-28 20:04:38
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3274 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Visual C++ 8.0 project file improvements. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.7 retrieving revision 1.1310.2.8 diff -C2 -d -r1.1310.2.7 -r1.1310.2.8 *** ChangeLog 27 Aug 2006 04:37:25 -0000 1.1310.2.7 --- ChangeLog 28 Aug 2006 20:04:34 -0000 1.1310.2.8 *************** *** 1,2 **** --- 1,14 ---- + 2006-08-28 Braden McDaniel <br...@en...> + + Visual C++ 8.0 project file improvements. + + * ide-projects/Windows/VisualC8_0/OpenVRML/OpenVRML.sln + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.rc + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/resource.h + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.rc + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/resource.h + 2006-08-27 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-08-27 04:37:46
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18930/src/libopenvrml/openvrml Modified Files: field_value.cpp Log Message: Removed code to convert from sfvec2f to sfvec2d. Index: field_value.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** field_value.cpp 4 Aug 2006 05:44:14 -0000 1.28 --- field_value.cpp 27 Aug 2006 04:37:42 -0000 1.29 *************** *** 3081,3092 **** OPENVRML_THROW1(std::bad_cast) { - //allow to convert from a float to a double - const sfvec2f * float_val = dynamic_cast<const sfvec2f *>(&value); - if (float_val != NULL) - { - this->value(vec2d(float_val->value()[0], float_val->value()[1])); - return *this; - } - return (*this = dynamic_cast<const sfvec2d &>(value)); } --- 3081,3084 ---- |
