TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2001-02-06 00:52:49 +00:00
parent 8580e54f09
commit 8911e805e3
13 changed files with 282 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dtool/src/dtoolutil/filename.I
View File

@ -386,6 +386,26 @@ is_local() const {
return _filename.empty() || _filename[0] != '/';
}
////////////////////////////////////////////////////////////////////
// Function: Filename::is_fully_qualified
// Access: Public
// Description: Returns true if the filename is fully qualified,
// e.g. begins with a slash. This is almost, but not
// quite, the same thing as !is_local(). It's not
// exactly the same because a special case is made for
// filenames that begin with a single dot followed by a
// slash--these are considered to be fully qualified
// (they are explicitly relative to the current
// directory, and do not refer to a filename on a search
// path somewhere).
////////////////////////////////////////////////////////////////////
INLINE bool Filename::
is_fully_qualified() const {
return
(_filename.size() > 2 && _filename[0] == '.' && _filename[1] == '/') ||
(!_filename.empty() && _filename[0] == '/');
}
////////////////////////////////////////////////////////////////////
// Function: Filename::Equality operator
// Access: Public

2
dtool/src/dtoolutil/filename.cxx
View File

@ -827,7 +827,7 @@ resolve_filename(const DSearchPath &searchpath,
const string &default_extension) {
string found;
if (is_local()) {
if (!is_fully_qualified()) {
found = searchpath.find_file(get_fullpath());
if (found.empty()) {

1
dtool/src/dtoolutil/filename.h
View File

@ -119,6 +119,7 @@ PUBLISHED:
// The following functions deal with the outside world.
INLINE bool is_local() const;
INLINE bool is_fully_qualified() const;
void make_absolute();
void make_absolute(const Filename &start_directory);

2
panda/src/egg2sg/Sources.pp
View File

@ -4,7 +4,7 @@
#begin lib_target
#define TARGET egg2sg
#define LOCAL_LIBS \
cull collide egg builder loader chan char switchnode
parametrics cull collide egg builder loader chan char switchnode
#define SOURCES \
animBundleMaker.cxx animBundleMaker.h characterMaker.cxx \

72
panda/src/egg2sg/eggLoader.cxx
View File

@ -26,8 +26,10 @@
#include <eggPrimitive.h>
#include <eggPolygon.h>
#include <eggPoint.h>
#include <eggNurbsCurve.h>
#include <eggTextureCollection.h>
#include <eggBin.h>
#include <nurbsCurve.h>
#include <builderBucket.h>
#include <builderPrim.h>
#include <builderVertex.h>
@ -1063,7 +1065,9 @@ setup_bucket(BuilderBucket &bucket, NamedNode *parent,
////////////////////////////////////////////////////////////////////
RenderRelation *EggLoader::
make_node(EggNode *egg_node, NamedNode *parent) {
if (egg_node->is_of_type(EggPrimitive::get_class_type())) {
if (egg_node->is_of_type(EggNurbsCurve::get_class_type())) {
return make_node(DCAST(EggNurbsCurve, egg_node), parent);
} else if (egg_node->is_of_type(EggPrimitive::get_class_type())) {
return make_node(DCAST(EggPrimitive, egg_node), parent);
} else if (egg_node->is_of_type(EggBin::get_class_type())) {
return make_node(DCAST(EggBin, egg_node), parent);
@ -1078,6 +1082,72 @@ make_node(EggNode *egg_node, NamedNode *parent) {
return (RenderRelation *)NULL;
}
////////////////////////////////////////////////////////////////////
// Function: EggLoader::make_node (EggNurbsCurve)
// Access: Private
// Description:
////////////////////////////////////////////////////////////////////
RenderRelation *EggLoader::
make_node(EggNurbsCurve *egg_curve, NamedNode *parent) {
assert(parent != NULL);
assert(!parent->is_of_type(GeomNode::get_class_type()));
PT(NurbsCurve) curve = new NurbsCurve;
if (egg_curve->get_order() < 1 || egg_curve->get_order() > 4) {
egg2sg_cat.error()
<< "Invalid NURBSCurve order for " << egg_curve->get_name() << ": "
<< egg_curve->get_order() << "\n";
return (RenderRelation *)NULL;
}
curve->set_order(egg_curve->get_order());
EggPrimitive::const_iterator pi;
for (pi = egg_curve->begin(); pi != egg_curve->end(); ++pi) {
curve->append_cv(LCAST(float, (*pi)->get_pos4()));
}
int num_knots = egg_curve->get_num_knots();
if (num_knots != curve->get_num_knots()) {
egg2sg_cat.error()
<< "Invalid NURBSCurve number of knots for "
<< egg_curve->get_name() << ": got " << num_knots
<< " knots, expected " << curve->get_num_knots() << "\n";
return (RenderRelation *)NULL;
}
for (int i = 0; i < num_knots; i++) {
curve->set_knot(i, egg_curve->get_knot(i));
}
switch (egg_curve->get_curve_type()) {
case EggCurve::CT_xyz:
curve->set_curve_type(PCT_XYZ);
break;
case EggCurve::CT_hpr:
curve->set_curve_type(PCT_HPR);
break;
case EggCurve::CT_t:
curve->set_curve_type(PCT_T);
break;
default:
break;
}
curve->set_name(egg_curve->get_name());
if (!curve->recompute()) {
egg2sg_cat.error()
<< "Invalid NURBSCurve " << egg_curve->get_name() << "\n";
return (RenderRelation *)NULL;
}
return new RenderRelation(parent, curve);
}
////////////////////////////////////////////////////////////////////
// Function: EggLoader::make_node (EggPrimitive)
// Access: Private

2
panda/src/egg2sg/eggLoader.h
View File

@ -26,6 +26,7 @@
class EggNode;
class EggBin;
class EggTable;
class EggNurbsCurve;
class EggPrimitive;
class EggPolygon;
class ComputedVerticesMaker;
@ -77,6 +78,7 @@ private:
EggPrimitive *egg_prim);
RenderRelation *make_node(EggNode *egg_node, NamedNode *parent);
RenderRelation *make_node(EggNurbsCurve *egg_curve, NamedNode *parent);
RenderRelation *make_node(EggPrimitive *egg_prim, NamedNode *parent);
RenderRelation *make_node(EggBin *egg_bin, NamedNode *parent);
RenderRelation *make_node(EggGroup *egg_group, NamedNode *parent);

12
panda/src/parametrics/curve.h
View File

@ -25,8 +25,7 @@
#include <list>
#include <vector>
#include "typedWriteableReferenceCount.h"
#include "namable.h"
#include "namedNode.h"
#include "luse.h"
@ -81,8 +80,7 @@ class NurbsCurve;
// This encapsulates all curves in 3-d space defined
// for a single parameter t in the range [0,get_max_t()].
////////////////////////////////////////////////////////////////////
class EXPCL_PANDA ParametricCurve : public TypedWriteableReferenceCount,
public Namable {
class EXPCL_PANDA ParametricCurve : public NamedNode {
PUBLISHED:
ParametricCurve();
virtual ~ParametricCurve();
@ -153,11 +151,9 @@ public:
return _type_handle;
}
static void init_type() {
TypedWriteableReferenceCount::init_type();
Namable::init_type();
NamedNode::init_type();
register_type(_type_handle, "ParametricCurve",
TypedWriteableReferenceCount::get_class_type(),
Namable::get_class_type());
NamedNode::get_class_type());
}
virtual TypeHandle get_type() const {
return get_class_type();

16
panda/src/parametrics/curveDrawer.cxx
View File

@ -34,8 +34,8 @@ ParametricCurveDrawer(ParametricCurve *curve) {
_lines.set_color(1.0, 1.0, 1.0);
_ticks.set_color(1.0, 0.0, 0.0);
_tick_scale = 0.1;
_num_segs = 100;
_num_ticks = 0;
_num_segs = 100.0;
_num_ticks = 0.0;
_frame_accurate = false;
_geom_node = new GeomNode;
_drawn = false;
@ -168,7 +168,7 @@ detach_geom_node() {
// curve will be get_max_t() * get_num_segs().
////////////////////////////////////////////////////////////////////
void ParametricCurveDrawer::
set_num_segs(int num_segs) {
set_num_segs(double num_segs) {
_num_segs = num_segs;
if (_drawn) {
draw();
@ -184,7 +184,7 @@ set_num_segs(int num_segs) {
// is drawn. The total number of segments drawn for the
// curve will be get_max_t() * get_num_segs().
////////////////////////////////////////////////////////////////////
int ParametricCurveDrawer::
double ParametricCurveDrawer::
get_num_segs() const {
return _num_segs;
}
@ -202,7 +202,7 @@ get_num_segs() const {
// of tick marks.
////////////////////////////////////////////////////////////////////
void ParametricCurveDrawer::
set_num_ticks(int num_ticks) {
set_num_ticks(double num_ticks) {
_num_ticks = num_ticks;
if (_drawn) {
draw();
@ -215,7 +215,7 @@ set_num_ticks(int num_ticks) {
// Description: Returns the number of time tick marks per unit of
// time drawn.
////////////////////////////////////////////////////////////////////
int ParametricCurveDrawer::
double ParametricCurveDrawer::
get_num_ticks() const {
return _num_ticks;
}
@ -330,7 +330,7 @@ draw() {
_drawn = true;
// Now draw the time tick marks.
if (_num_ticks > 0) {
if (_num_ticks > 0.0) {
LVecBase3f tangent2;
int total_ticks = (int)floor(_curve->get_max_t() * _num_ticks + 0.5);
@ -424,7 +424,7 @@ recompute(double t1, double t2, ParametricCurve *curve) {
}
}
if (_num_ticks > 0) {
if (_num_ticks > 0.0) {
LVecBase3f tangent2;
int total_ticks = (int)floor(_curve->get_max_t() * _num_ticks + 0.5);

12
panda/src/parametrics/curveDrawer.h
View File

@ -71,11 +71,11 @@ PUBLISHED:
GeomNode *get_geom_node();
GeomNode *detach_geom_node();
void set_num_segs(int num_segs);
int get_num_segs() const;
void set_num_segs(double num_segs);
double get_num_segs() const;
void set_num_ticks(int num_ticks);
int get_num_ticks() const;
void set_num_ticks(double num_ticks);
double get_num_ticks() const;
void set_color(float r, float g, float b);
void set_tick_color(float r, float g, float b);
@ -119,11 +119,11 @@ protected:
static void get_tick_marks(const LVecBase3f &tangent, LVecBase3f &t1, LVecBase3f &t2);
PT(GeomNode) _geom_node;
int _num_segs;
double _num_segs;
ParametricCurve *_curve, *_time_curve;
LineSegs _lines, _ticks;
bool _drawn;
int _num_ticks;
double _num_ticks;
double _tick_scale;
bool _frame_accurate;
LVecBase3fMapper *_mapper;

92
panda/src/parametrics/curveFitter.cxx
View File

@ -65,6 +65,74 @@ add_point(double t, const LVecBase3f &point) {
_data.push_back(dp);
}
////////////////////////////////////////////////////////////////////
// Function: CurveFitter::get_num_samples
// Access: Public
// Description: Returns the number of sample points that have been
// added.
////////////////////////////////////////////////////////////////////
int CurveFitter::
get_num_samples() const {
return _data.size();
}
////////////////////////////////////////////////////////////////////
// Function: CurveFitter::get_sample_t
// Access: Public
// Description: Returns the parametric value of the nth sample added.
////////////////////////////////////////////////////////////////////
double CurveFitter::
get_sample_t(int n) const {
nassertr(n >= 0 && n < (int)_data.size(), 0.0);
return _data[n]._t;
}
////////////////////////////////////////////////////////////////////
// Function: CurveFitter::get_sample_point
// Access: Public
// Description: Returns the point in space of the nth sample added.
////////////////////////////////////////////////////////////////////
const LVecBase3f &CurveFitter::
get_sample_point(int n) const {
#ifndef NDEBUG
static const LVecBase3f zero(0.0, 0.0, 0.0);
nassertr(n >= 0 && n < (int)_data.size(), zero);
#endif
return _data[n]._point;
}
////////////////////////////////////////////////////////////////////
// Function: CurveFitter::get_sample_tangent
// Access: Public
// Description: Returns the tangent associated with the nth sample
// added. This is only meaningful if compute_tangents()
// has already been called.
////////////////////////////////////////////////////////////////////
const LVecBase3f &CurveFitter::
get_sample_tangent(int n) const {
#ifndef NDEBUG
static const LVecBase3f zero(0.0, 0.0, 0.0);
nassertr(n >= 0 && n < (int)_data.size(), zero);
#endif
return _data[n]._tangent;
}
////////////////////////////////////////////////////////////////////
// Function: CurveFitter::remove_samples
// Access: Public
// Description: Eliminates all samples from index begin, up to but not
// including index end, from the database.
////////////////////////////////////////////////////////////////////
void CurveFitter::
remove_samples(int begin, int end) {
begin = max(0, min((int)_data.size(), begin));
end = max(0, min((int)_data.size(), end));
nassertv(begin <= end);
_data.erase(_data.begin() + begin, _data.begin() + end);
}
////////////////////////////////////////////////////////////////////
// Function: CurveFitter::sample
// Access: Public
@ -451,16 +519,6 @@ make_nurbs() const {
#endif
}
////////////////////////////////////////////////////////////////////
// Function: CurveFitter::print
// Access: Public
// Description:
////////////////////////////////////////////////////////////////////
void CurveFitter::
print() const {
output(cerr);
}
////////////////////////////////////////////////////////////////////
// Function: CurveFitter::output
// Access: Public
@ -468,10 +526,20 @@ print() const {
////////////////////////////////////////////////////////////////////
void CurveFitter::
output(ostream &out) const {
out << "CurveFitter, " << _data.size() << " samples.\n";
}
////////////////////////////////////////////////////////////////////
// Function: CurveFitter::write
// Access: Public
// Description:
////////////////////////////////////////////////////////////////////
void CurveFitter::
write(ostream &out) const {
out << "CurveFitter, " << _data.size() << " samples:\n";
Data::const_iterator di;
for (di = _data.begin(); di != _data.end(); ++di) {
out << (*di) << "\n";
out << " " << (*di) << "\n";
}
}

11
panda/src/parametrics/curveFitter.h
View File

@ -36,6 +36,12 @@ PUBLISHED:
void reset();
void add_point(double t, const LVecBase3f &point);
int get_num_samples() const;
double get_sample_t(int n) const;
const LVecBase3f &get_sample_point(int n) const;
const LVecBase3f &get_sample_tangent(int n) const;
void remove_samples(int begin, int end);
void sample(ParametricCurve *curve, int count, bool even);
void generate_even(int count, double net_distance, double net_time);
@ -48,11 +54,10 @@ PUBLISHED:
PT(HermiteCurve) make_hermite() const;
PT(NurbsCurve) make_nurbs() const;
void print() const;
void output(ostream &out) const;
void write(ostream &out) const;
public:
void output(ostream &out) const;
class DataPoint {
public:
DataPoint() : _t(0.0), _point(0.0, 0.0, 0.0), _tangent(0.0, 0.0, 0.0) { }

125
panda/src/parametrics/nurbsCurve.cxx
View File

@ -15,6 +15,8 @@
#include "nurbsCurve.h"
#include "config_parametrics.h"
#include <indent.h>
////////////////////////////////////////////////////////////////////
// Statics
////////////////////////////////////////////////////////////////////
@ -26,20 +28,6 @@ static const LVecBase3f zero = LVecBase3f(0.0, 0.0, 0.0);
// used from time to time as an initializer.
////////////////////////////////////////////////////////////////////
// Function: Indent
// Description: This function duplicates a similar function declared
// in eggBasics.C. It prints a specified number of
// spaces to indent each line of output.
////////////////////////////////////////////////////////////////////
static ostream &
Indent(ostream &out, int indent) {
for (int i=0; i<indent; i++) {
out << ' ';
}
return out;
}
////////////////////////////////////////////////////////////////////
// Function: NurbsCurve::Constructor
// Access: Public, Scheme
@ -355,61 +343,60 @@ get_knot(int n) const {
}
////////////////////////////////////////////////////////////////////
// Function: NurbsCurve::print
// Function: NurbsCurve::write
// Access: Public, Scheme
// Description:
////////////////////////////////////////////////////////////////////
void NurbsCurve::
print() const {
write(ostream &out) const {
switch (get_curve_type()) {
case PCT_T:
cout << "Time-warping ";
out << "Time-warping ";
break;
case PCT_XYZ:
cout << "XYZ ";
out << "XYZ ";
break;
case PCT_HPR:
cout << "HPR ";
out << "HPR ";
break;
default:
break;
}
cout << "NurbsCurve, order " << _order << ", " << get_num_cvs()
out << "NurbsCurve, order " << _order << ", " << get_num_cvs()
<< " CV's. t ranges from 0 to " << get_max_t() << ".\n";
cout << "CV's:\n";
out << "CV's:\n";
int i;
for (i = 0; i < (int)_cvs.size(); i++) {
LVecBase3f p = (const LVecBase3f &)_cvs[i]._p / _cvs[i]._p[3];
cout << i << ") " << p << ", weight " << _cvs[i]._p[3] << "\n";
out << i << ") " << p << ", weight " << _cvs[i]._p[3] << "\n";
}
cout << "Knots: ";
out << "Knots: ";
for (i = 0; i < (int)_cvs.size()+_order; i++) {
cout << " " << GetKnot(i);
out << " " << GetKnot(i);
}
cout << "\n" << flush;
out << "\n";
}
////////////////////////////////////////////////////////////////////
// Function: NurbsCurve::print_cv
// Function: NurbsCurve::write_cv
// Access: Public, Scheme
// Description:
////////////////////////////////////////////////////////////////////
void NurbsCurve::
print_cv(int n) const {
write_cv(ostream &out, int n) const {
if (n < 0 || n >= (int)_cvs.size()) {
cout << "No such CV: " << n << "\n";
out << "No such CV: " << n << "\n";
} else {
LVecBase3f p = (const LVecBase3f &)_cvs[n]._p / _cvs[n]._p[3];
cout << "CV " << n << ": " << p << ", weight "
out << "CV " << n << ": " << p << ", weight "
<< _cvs[n]._p[3] << "\n";
}
cout << flush;
}
@ -692,12 +679,12 @@ rebuild_curveseg(int rtype0, double t0, const LVecBase4f &v0,
// Returns true if the file is successfully written.
////////////////////////////////////////////////////////////////////
bool NurbsCurve::
write_egg(const char *filename) {
write_egg(const char *filename, CoordinateSystem cs) {
const char *basename = strrchr(filename, '/');
basename = (basename==NULL) ? filename : basename+1;
ofstream out(filename, ios::app);
return write_egg(out, basename);
return write_egg(out, basename, cs);
}
////////////////////////////////////////////////////////////////////
@ -708,7 +695,7 @@ write_egg(const char *filename) {
// successfully written.
////////////////////////////////////////////////////////////////////
bool NurbsCurve::
write_egg(ostream &out, const char *basename) {
write_egg(ostream &out, const char *basename, CoordinateSystem cs) {
if (get_name().empty()) {
// If we don't have a name, come up with one.
int len = strlen(basename);
@ -738,7 +725,7 @@ write_egg(ostream &out, const char *basename) {
set_name(name);
}
Output(out);
format_egg(out, cs, 0);
if (out) {
return true;
@ -804,26 +791,59 @@ splice(double t, const NurbsCurve &other) {
////////////////////////////////////////////////////////////////////
// Function: NurbsCurve::Output
// Function: NurbsCurve::format_egg
// Access: Public
// Description: Formats the Nurbs curve for output to an Egg file.
////////////////////////////////////////////////////////////////////
void NurbsCurve::
Output(ostream &out, int indent) const {
Indent(out, indent)
format_egg(ostream &out, CoordinateSystem cs, int indent_level) const {
if (cs == CS_default) {
cs = default_coordinate_system;
}
if (cs != CS_invalid) {
indent(out, indent_level)
<< "<CoordinateSystem> { ";
switch (cs) {
case CS_zup_right:
out << "Z-Up";
break;
case CS_yup_right:
out << "Y-Up";
break;
case CS_zup_left:
out << "Z-Up-Left";
break;
case CS_yup_left:
out << "Y-Up-Left";
break;
default:
break;
}
out << " }\n\n";
}
indent(out, indent_level)
<< "<VertexPool> " << get_name() << ".pool {\n";
int cv;
for (cv = 0; cv < (int)_cvs.size(); cv++) {
Indent(out, indent+2) << "<Vertex> " << cv << " { "
<< _cvs[cv]._p << " }\n";
indent(out, indent_level+2)
<< "<Vertex> " << cv << " { " << _cvs[cv]._p << " }\n";
}
Indent(out, indent) << "}\n";
indent(out, indent_level)
<< "}\n";
Indent(out, indent) << "<NURBSCurve> " << get_name() << " {\n";
indent(out, indent_level)
<< "<NURBSCurve> " << get_name() << " {\n";
if (_curve_type!=PCT_NONE) {
Indent(out, indent+2) << "<Char*> type { ";
indent(out, indent_level+2)
<< "<Char*> type { ";
switch (_curve_type) {
case PCT_XYZ:
out << "XYZ";
@ -840,35 +860,36 @@ Output(ostream &out, int indent) const {
out << " }\n";
}
Indent(out, indent+2) << "<Order> { " << _order << " }\n";
indent(out, indent_level+2) << "<Order> { " << _order << " }\n";
Indent(out, indent+2) << "<Knots> {";
indent(out, indent_level+2) << "<Knots> {";
int k;
int num_knots = _cvs.size() + _order;
for (k = 0; k < num_knots; k++) {
if (k%6 == 0) {
out << "\n";
Indent(out, indent+4);
indent(out, indent_level+4);
}
out << GetKnot(k) << " ";
}
out << "\n";
Indent(out, indent+2) << "}\n";
indent(out, indent_level+2) << "}\n";
Indent(out, indent+2) << "<VertexRef> {";
indent(out, indent_level+2) << "<VertexRef> {";
for (cv = 0; cv < (int)_cvs.size(); cv++) {
if (cv%10 == 1) {
if (cv%10 == 0) {
out << "\n";
Indent(out, indent+3);
indent(out, indent_level+3);
}
out << " " << cv;
}
out << "\n";
Indent(out, indent+4) << "<Ref> { " << get_name() << ".pool }\n";
Indent(out, indent+2) << "}\n";
indent(out, indent_level+4)
<< "<Ref> { " << get_name() << ".pool }\n";
indent(out, indent_level+2) << "}\n";
Indent(out, indent) << "}\n";
indent(out, indent_level) << "}\n";
}
////////////////////////////////////////////////////////////////////

10
panda/src/parametrics/nurbsCurve.h
View File

@ -87,15 +87,15 @@ PUBLISHED:
bool set_knot(int n, double t);
double get_knot(int n) const;
void print() const;
void print_cv(int n) const;
void write(ostream &out) const;
void write_cv(ostream &out, int n) const;
bool recompute();
void normalize_tlength();
bool write_egg(const char *filename);
bool write_egg(ostream &out, const char *basename);
bool write_egg(const char *filename, CoordinateSystem cs = CS_default);
bool write_egg(ostream &out, const char *basename, CoordinateSystem cs);
void splice(double t, const NurbsCurve &other);
@ -124,7 +124,7 @@ public:
}
}
void Output(ostream &out, int indent=0) const;
void format_egg(ostream &out, CoordinateSystem cs, int indent_level) const;
protected:
int FindCV(double t);