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

remove vector_LVecBase3f to avoid opt4 linking issue

Browse Source
This commit is contained in:
David Rose 2011-08-12 23:16:17 +00:00
parent d0c8ccd901
commit 5158b9b5bf
8 changed files with 13 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/chan/animChannelMatrixXfmTable.cxx
View File

@ -407,7 +407,7 @@ write_datagram(BamWriter *manager, Datagram &me) {
// Now, write out the joint angles. For these we need to build up
// a HPR array.
vector_LVecBase3f hprs;
pvector<LVecBase3f> hprs;
int hprs_length = max(max(_tables[6].size(), _tables[7].size()), _tables[8].size());
hprs.reserve(hprs_length);
for (i = 0; i < hprs_length; i++) {
@ -518,7 +518,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
}
// Read in the HPR array and store it back in the joint angles.
vector_LVecBase3f hprs;
pvector<LVecBase3f> hprs;
compressor.read_hprs(scan, hprs, new_hpr);
PTA_float h_table = PTA_float::empty_array(hprs.size(), get_class_type());
PTA_float p_table = PTA_float::empty_array(hprs.size(), get_class_type());

6
panda/src/linmath/Sources.pp
View File

@ -38,7 +38,7 @@
lpoint2_ext.I lpoint3_ext.I lpoint4_ext.I \
lvector2_ext.I lvector3_ext.I lvector4_ext.I \
mathNumbers.h mathNumbers.I vector_Colorf.h \
vector_LPoint2f.h vector_LVecBase3f.h vector_Normalf.h \
vector_LPoint2f.h vector_Normalf.h \
vector_TexCoordf.h vector_Vertexf.h
#define INCLUDED_SOURCES \
@ -49,7 +49,7 @@
luse.cxx lvecBase2.cxx lvecBase3.cxx lvecBase4.cxx \
lvector2.cxx lvector3.cxx lvector4.cxx mathNumbers.cxx \
vector_Colorf.cxx vector_LPoint2f.cxx \
vector_LVecBase3f.cxx vector_Normalf.cxx vector_Vertexf.cxx \
vector_Normalf.cxx vector_Vertexf.cxx \
#define INSTALL_HEADERS \
aa_luse.h \
@ -71,7 +71,7 @@
lvecBase4_src.h lvector2.h lvector2_src.I lvector2_src.h \
lvector3.h lvector3_src.I lvector3_src.h lvector4.h lvector4_src.I \
lvector4_src.h mathNumbers.h mathNumbers.I vector_Colorf.h \
vector_LPoint2f.h vector_LVecBase3f.h vector_Normalf.h \
vector_LPoint2f.h vector_Normalf.h \
vector_TexCoordf.h vector_Vertexf.h
#define IGATESCAN all

1
panda/src/linmath/linmath_composite1.cxx
View File

@ -11,6 +11,5 @@
#include "mathNumbers.cxx"
#include "vector_Colorf.cxx"
#include "vector_LPoint2f.cxx"
#include "vector_LVecBase3f.cxx"
#include "vector_Normalf.cxx"
#include "vector_Vertexf.cxx"

27
panda/src/linmath/vector_LVecBase3f.cxx
View File

@ -1,27 +0,0 @@
// Filename: vector_LVecBase3f.cxx
// Created by: drose (11Dec00)
//
////////////////////////////////////////////////////////////////////
//
// PANDA 3D SOFTWARE
// Copyright (c) Carnegie Mellon University. All rights reserved.
//
// All use of this software is subject to the terms of the revised BSD
// license. You should have received a copy of this license along
// with this source code in a file named "LICENSE."
//
////////////////////////////////////////////////////////////////////
#include "vector_LVecBase3f.h"
#define EXPCL EXPCL_PANDA_LINMATH
#define EXPTP EXPTP_PANDA_LINMATH
#define TYPE LVecBase3f
#define NAME vector_LVecBase3f
#include "vector_src.cxx"
// Tell GCC that we'll take care of the instantiation explicitly here.
#ifdef __GNUC__
#pragma implementation
#endif

43
panda/src/linmath/vector_LVecBase3f.h
View File

@ -1,43 +0,0 @@
// Filename: vector_LVecBase3f.h
// Created by: drose (11Dec00)
//
////////////////////////////////////////////////////////////////////
//
// PANDA 3D SOFTWARE
// Copyright (c) Carnegie Mellon University. All rights reserved.
//
// All use of this software is subject to the terms of the revised BSD
// license. You should have received a copy of this license along
// with this source code in a file named "LICENSE."
//
////////////////////////////////////////////////////////////////////
#ifndef VECTOR_LVECBASE3F_H
#define VECTOR_LVECBASE3F_H
#include "pandabase.h"
#include "luse.h"
#include "pvector.h"
////////////////////////////////////////////////////////////////////
// Class : vector_LVecBase3f
// Description : A vector of LVecBase3fs. This class is defined once here,
// and exported to PANDA.DLL; other packages that want
// to use a vector of this type (whether they need to
// export it or not) should include this header file,
// rather than defining the vector again.
////////////////////////////////////////////////////////////////////
#define EXPCL EXPCL_PANDA_LINMATH
#define EXPTP EXPTP_PANDA_LINMATH
#define TYPE LVecBase3f
#define NAME vector_LVecBase3f
#include "vector_src.h"
// Tell GCC that we'll take care of the instantiation explicitly here.
#ifdef __GNUC__
#pragma interface
#endif
#endif

4
panda/src/mathutil/fftCompressor.cxx
View File

@ -689,7 +689,7 @@ read_reals(DatagramIterator &di, vector_float &array) {
// calculation. See temp_hpr_fix.
////////////////////////////////////////////////////////////////////
bool FFTCompressor::
read_hprs(DatagramIterator &di, vector_LVecBase3f &array, bool new_hpr) {
read_hprs(DatagramIterator &di, pvector<LVecBase3f> &array, bool new_hpr) {
#ifndef NDEBUG
if (_quality >= 104) {
// If quality level is at least 104, we don't even convert hpr to
@ -819,7 +819,7 @@ read_hprs(DatagramIterator &di, vector_LVecBase3f &array, bool new_hpr) {
// ensure that the array is initially empty.
////////////////////////////////////////////////////////////////////
bool FFTCompressor::
read_hprs(DatagramIterator &di, vector_LVecBase3f &array) {
read_hprs(DatagramIterator &di, pvector<LVecBase3f> &array) {
return read_hprs(di, array, temp_hpr_fix);
}

7
panda/src/mathutil/fftCompressor.h
View File

@ -17,10 +17,11 @@
#include "pandabase.h"
#include "pvector.h"
#include "pointerToArray.h"
#include "vector_float.h"
#include "vector_double.h"
#include "vector_LVecBase3f.h"
#include "luse.h"
class Datagram;
class DatagramIterator;
@ -62,9 +63,9 @@ public:
bool read_header(DatagramIterator &di, int bam_minor_version);
bool read_reals(DatagramIterator &di, vector_float &array);
bool read_hprs(DatagramIterator &di, vector_LVecBase3f &array,
bool read_hprs(DatagramIterator &di, pvector<LVecBase3f> &array,
bool new_hpr);
bool read_hprs(DatagramIterator &di, vector_LVecBase3f &array);
bool read_hprs(DatagramIterator &di, pvector<LVecBase3f> &array);
static void free_storage();

4
pandatool/src/eggcharbase/eggJointData.cxx
View File

@ -15,7 +15,7 @@
#include "eggJointData.h"
#include "eggJointNodePointer.h"
#include "eggMatrixTablePointer.h"
#include "pvector.h"
#include "dcast.h"
#include "eggGroup.h"
#include "eggTable.h"
@ -199,7 +199,7 @@ score_reparent_to(EggJointData *new_parent, EggCharacterDb &db) {
// would receive in all frames of all models, were it reparented to
// the indicated joint.
vector_float i, j, k, a, b, c, x, y, z;
vector_LVecBase3f hprs;
pvector<LVecBase3f> hprs;
int num_rows = 0;
int num_models = get_num_models();