TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

general: fix various compiler warnings and issues exposed thereby

Browse Source
This commit is contained in:
rdb 2018-05-30 11:09:35 +02:00
parent 3029780f88
commit 6b726fa697
92 changed files with 138 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
direct/src/distributed/cConnectionRepository.cxx
View File

@ -849,8 +849,9 @@ handle_update_field_owner() {
vector_uchar data = _di.get_remaining_bytes();
DCPacker packer;
packer.set_unpack_data((const char *)data.data(), data.size(), false);
int field_id = packer.raw_unpack_uint16();
DCField *field = dclass->get_field_by_index(field_id);
//int field_id = packer.raw_unpack_uint16();
//DCField *field = dclass->get_field_by_index(field_id);
if (true) {//field->is_broadcast()) {
// It's a good idea to ensure the reference count to distobj is raised
// while we call the update method--otherwise, the update method might

1
dtool/src/cppparser/cppBison.cxx.prebuilt
View File

@ -110,7 +110,6 @@ static CPPEnumType *current_enum = NULL;
static int current_storage_class = 0;
static CPPType *current_type = NULL;
static CPPExpression *current_expr = NULL;
static CPPClosureType *current_closure = NULL;
static int publish_nest_level = 0;
static CPPVisibility publish_previous;
static YYLTYPE publish_loc;

1
dtool/src/cppparser/cppBison.yxx
View File

@ -45,7 +45,6 @@ static CPPEnumType *current_enum = NULL;
static int current_storage_class = 0;
static CPPType *current_type = NULL;
static CPPExpression *current_expr = NULL;
static CPPClosureType *current_closure = NULL;
static int publish_nest_level = 0;
static CPPVisibility publish_previous;
static YYLTYPE publish_loc;

4
dtool/src/dtoolbase/memoryHook.cxx
View File

@ -216,12 +216,12 @@ MemoryHook() {
*/
MemoryHook::
MemoryHook(const MemoryHook &copy) :
_page_size(copy._page_size),
_total_heap_single_size(copy._total_heap_single_size),
_total_heap_array_size(copy._total_heap_array_size),
_requested_heap_size(copy._requested_heap_size),
_total_mmap_size(copy._total_mmap_size),
_max_heap_size(copy._max_heap_size) {
_max_heap_size(copy._max_heap_size),
_page_size(copy._page_size) {
copy._lock.lock();
_deleted_chains = copy._deleted_chains;

15
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -2636,8 +2636,6 @@ write_module_class(ostream &out, Object *obj) {
if (obj->_properties.size() > 0) {
// Write out the array of properties, telling Python which getter and
// setter to call when they are assigned or queried in Python code.
out << "static PyGetSetDef Dtool_Properties_" << ClassName << "[] = {\n";
Properties::const_iterator pit;
for (pit = obj->_properties.begin(); pit != obj->_properties.end(); ++pit) {
Property *property = (*pit);
@ -2646,6 +2644,10 @@ write_module_class(ostream &out, Object *obj) {
continue;
}
if (num_getset == 0) {
out << "static PyGetSetDef Dtool_Properties_" << ClassName << "[] = {\n";
}
++num_getset;
string name1 = methodNameFromCppName(ielem.get_name(), "", false);
@ -2679,8 +2681,10 @@ write_module_class(ostream &out, Object *obj) {
}*/
}
out << " {NULL},\n";
out << "};\n\n";
if (num_getset != 0) {
out << " {NULL},\n";
out << "};\n\n";
}
}
// These fields are inherited together. We should either write all of them
@ -7077,9 +7081,8 @@ record_object(TypeIndex type_index) {
int num_elements = itype.number_of_elements();
for (int ei = 0; ei < num_elements; ei++) {
ElementIndex element_index = itype.get_element(ei);
const InterrogateElement &ielement = idb->get_element(element_index);
Property *property = record_property(itype, itype.get_element(ei));
Property *property = record_property(itype, element_index);
if (property != nullptr) {
object->_properties.push_back(property);
} else {

2
panda/src/bullet/bulletBodyNode.cxx
View File

@ -864,7 +864,7 @@ cout << "origin " << aabbMin.x() << " " << aabbMin.y() << " " << aabbMin.z() <<
*/
btVector3 center;
btScalar radius;
btScalar radius = 0;
if (_shape) {
_shape->getBoundingSphere(center, radius);

4
panda/src/collide/collisionHandlerFluidPusher.cxx
View File

@ -154,7 +154,7 @@ handle_entries() {
// unit vector pointing out to the right relative to the direction of
// motion, looking into the direction of motion
const LVector3 right_unit(LVector3::up().cross(reverse_vec));
//const LVector3 right_unit(LVector3::up().cross(reverse_vec));
// iterate until the mover runs out of movement or gets stuck
while (true) {
@ -214,7 +214,7 @@ handle_entries() {
from_node_path.set_prev_transform(wrt_node, prev_trans);
{
const LPoint3 new_pos(from_node_path.get_pos(wrt_node));
//const LPoint3 new_pos(from_node_path.get_pos(wrt_node));
CPT(TransformState) new_prev_trans(from_node_path.get_prev_transform(wrt_node));
const LPoint3 new_prev_pos(new_prev_trans->get_pos());
}

1
panda/src/collide/collisionTraverser.h
View File

@ -111,7 +111,6 @@ private:
private:
PT(CollisionHandler) _default_handler;
TypeHandle _graph_type;
class OrderedColliderDef {
public:

2
panda/src/display/graphicsStateGuardian.cxx
View File

@ -551,7 +551,7 @@ get_scene() const {
* call Texture::prepare().
*/
TextureContext *GraphicsStateGuardian::
prepare_texture(Texture *) {
prepare_texture(Texture *, int view) {
return (TextureContext *)NULL;
}

2
panda/src/display/graphicsStateGuardian.h
View File

@ -290,7 +290,7 @@ PUBLISHED:
MAKE_PROPERTY(scene, get_scene, set_scene);
public:
virtual TextureContext *prepare_texture(Texture *tex);
virtual TextureContext *prepare_texture(Texture *tex, int view);
virtual bool update_texture(TextureContext *tc, bool force);
virtual void release_texture(TextureContext *tc);
virtual bool extract_texture_data(Texture *tex);

2
panda/src/egg2pg/eggLoader.cxx
View File

@ -3792,7 +3792,7 @@ TextureStage::CombineOperand EggLoader::
get_combine_operand(const EggTexture *egg_tex,
EggTexture::CombineChannel channel, int n) {
switch (egg_tex->get_combine_operand(channel, n)) {
case EggTexture::CS_unspecified:
case EggTexture::CO_unspecified:
if (channel == EggTexture::CC_rgb) {
// The default operand for RGB is src_color, except for the third
// parameter, which defaults to src_alpha.

1
panda/src/egg2pg/eggSaver.cxx
View File

@ -839,7 +839,6 @@ convert_primitive(const GeomVertexData *vertex_data,
}
// Check the backface flag.
bool bface = false;
const CullFaceAttrib *cfa;
if (net_state->get_attrib(cfa)) {
if (cfa->get_effective_mode() == CullFaceAttrib::M_cull_none) {

4
panda/src/event/asyncFuture.I
View File

@ -17,8 +17,8 @@
INLINE AsyncFuture::
AsyncFuture() :
_manager(nullptr),
_future_state(FS_pending),
_result(nullptr) {
_result(nullptr),
_future_state(FS_pending) {
}
/**

2
panda/src/express/pointerToArray_ext.I
View File

@ -37,6 +37,8 @@ INLINE void set_matrix_view(Py_buffer &view, int flags, int length, int size, bo
mat_size = sizeof(UnalignedLMatrix4f);
} else if (size == 4 && double_prec) {
mat_size = sizeof(UnalignedLMatrix4d);
} else {
assert(false);
}
view.len = length * mat_size;

3
panda/src/express/virtualFileSimple.I
View File

@ -19,8 +19,7 @@ VirtualFileSimple(VirtualFileMount *mount, const Filename &local_filename,
bool implicit_pz_file, int open_flags) :
_mount(mount),
_local_filename(local_filename),
_implicit_pz_file(implicit_pz_file),
_open_flags(open_flags)
_implicit_pz_file(implicit_pz_file)
{
}

1
panda/src/express/virtualFileSimple.h
View File

@ -74,7 +74,6 @@ private:
VirtualFileMount *_mount;
Filename _local_filename;
bool _implicit_pz_file;
int _open_flags;
public:
virtual TypeHandle get_type() const {

12
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -2643,7 +2643,6 @@ reset() {
GLint max_3d_texture_size = 0;
GLint max_2d_texture_array_layers = 0;
GLint max_cube_map_size = 0;
GLint max_buffer_texture_size = 0;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
_max_texture_dimension = max_texture_size;
@ -2671,6 +2670,7 @@ reset() {
#ifndef OPENGLES
if (_supports_buffer_texture) {
GLint max_buffer_texture_size = 0;
glGetIntegerv(GL_MAX_TEXTURE_BUFFER_SIZE, &max_buffer_texture_size);
_max_buffer_texture_size = max_buffer_texture_size;
} else {
@ -2678,8 +2678,8 @@ reset() {
}
#endif // !OPENGLES
GLint max_elements_vertices = 0, max_elements_indices = 0;
#ifndef OPENGLES
GLint max_elements_vertices = 0, max_elements_indices = 0;
if (is_at_least_gl_version(1, 2) || has_extension("GL_EXT_draw_range_elements")) {
glGetIntegerv(GL_MAX_ELEMENTS_VERTICES, &max_elements_vertices);
glGetIntegerv(GL_MAX_ELEMENTS_INDICES, &max_elements_indices);
@ -7604,7 +7604,6 @@ do_issue_blending() {
#endif
if (color_channels == ColorWriteAttrib::C_off) {
int color_write_slot = ColorWriteAttrib::get_class_slot();
enable_multisample_alpha_one(false);
enable_multisample_alpha_mask(false);
if (gl_color_mask) {
@ -8311,7 +8310,6 @@ report_extensions() const {
ostream &out = GLCAT.debug();
out << "GL Extensions:\n";
size_t maxlen = 0;
pset<string>::const_iterator ei;
for (ei = _extensions.begin(); ei != _extensions.end(); ++ei) {
size_t len = (*ei).size();
@ -10915,7 +10913,6 @@ set_state_and_transform(const RenderState *target,
!_state_mask.get_bit(texture_slot)) {
// PStatGPUTimer timer(this, _draw_set_state_texture_pcollector);
determine_target_texture();
int prev_active = _num_active_texture_stages;
do_issue_texture();
// Since the TexGen and TexMatrix states depend partly on the particular
@ -12264,10 +12261,8 @@ upload_texture(CLP(TextureContext) *gtc, bool force, bool uses_mipmaps) {
}
if (image_compression != Texture::CM_off) {
Texture::QualityLevel quality_level = tex->get_effective_quality_level();
#ifndef OPENGLES
switch (quality_level) {
switch (tex->get_effective_quality_level()) {
case Texture::QL_fastest:
glHint(GL_TEXTURE_COMPRESSION_HINT, GL_FASTEST);
break;
@ -13150,7 +13145,6 @@ get_texture_memory_size(CLP(TextureContext) *gtc) {
int height = tex->get_y_size();
int depth = 1;
int scale = 1;
bool has_mipmaps = tex->uses_mipmaps();
size_t num_bytes = 2; // Temporary assumption?

2
panda/src/glstuff/glShaderContext_src.cxx
View File

@ -2660,9 +2660,9 @@ update_shader_texture_bindings(ShaderContext *prev) {
continue;
}
#ifndef OPENGLES
GLint p = spec._id._seqno;
#ifndef OPENGLES
// If it was recently written to, we will have to issue a memory barrier
// soon.
if (gtc->needs_barrier(GL_TEXTURE_FETCH_BARRIER_BIT)) {

2
panda/src/gobj/adaptiveLru.cxx
View File

@ -455,7 +455,6 @@ AdaptiveLruPage(size_t lru_size) :
_update_frame_identifier(0),
_current_frame_usage(0),
_last_frame_usage(0),
_total_usage(0),
_update_total_usage(0),
_average_frame_utilization(1.0f)
{
@ -474,7 +473,6 @@ AdaptiveLruPage(const AdaptiveLruPage &copy) :
_update_frame_identifier(0),
_current_frame_usage(0),
_last_frame_usage(0),
_total_usage(0),
_update_total_usage(0),
_average_frame_utilization(1.0f)
{

1
panda/src/gobj/adaptiveLru.h
View File

@ -172,7 +172,6 @@ private:
int _current_frame_usage;
int _last_frame_usage;
int _total_usage;
int _update_total_usage;
PN_stdfloat _average_frame_utilization;

28
panda/src/gobj/geomVertexColumn.cxx
View File

@ -3869,9 +3869,9 @@ set_data3f(unsigned char *pointer, const LVecBase3f &data) {
{
LVecBase3f scaled = data * 4294967295.0f;
uint32_t *pi = (uint32_t *)pointer;
pi[0] = (unsigned int)data[0];
pi[1] = (unsigned int)data[1];
pi[2] = (unsigned int)data[2];
pi[0] = (unsigned int)scaled[0];
pi[1] = (unsigned int)scaled[1];
pi[2] = (unsigned int)scaled[2];
}
break;
@ -3960,10 +3960,10 @@ set_data4f(unsigned char *pointer, const LVecBase4f &data) {
{
LVecBase4f scaled = data * 4294967295.0f;
uint32_t *pi = (uint32_t *)pointer;
pi[0] = (unsigned int)data[0];
pi[1] = (unsigned int)data[1];
pi[2] = (unsigned int)data[2];
pi[3] = (unsigned int)data[3];
pi[0] = (unsigned int)scaled[0];
pi[1] = (unsigned int)scaled[1];
pi[2] = (unsigned int)scaled[2];
pi[3] = (unsigned int)scaled[3];
}
break;
@ -4072,9 +4072,9 @@ set_data3d(unsigned char *pointer, const LVecBase3d &data) {
{
LVecBase3d scaled = data * 4294967295.0;
uint32_t *pi = (uint32_t *)pointer;
pi[0] = (unsigned int)data[0];
pi[1] = (unsigned int)data[1];
pi[2] = (unsigned int)data[2];
pi[0] = (unsigned int)scaled[0];
pi[1] = (unsigned int)scaled[1];
pi[2] = (unsigned int)scaled[2];
}
break;
@ -4163,10 +4163,10 @@ set_data4d(unsigned char *pointer, const LVecBase4d &data) {
{
LVecBase4d scaled = data * 4294967295.0;
uint32_t *pi = (uint32_t *)pointer;
pi[0] = (unsigned int)data[0];
pi[1] = (unsigned int)data[1];
pi[2] = (unsigned int)data[2];
pi[3] = (unsigned int)data[3];
pi[0] = (unsigned int)scaled[0];
pi[1] = (unsigned int)scaled[1];
pi[2] = (unsigned int)scaled[2];
pi[3] = (unsigned int)scaled[3];
}
break;

1
panda/src/gobj/geomVertexData.I
View File

@ -837,7 +837,6 @@ GeomVertexDataPipelineWriter(GeomVertexData *object, bool force_to_0,
Thread *current_thread) :
GeomVertexDataPipelineBase(object, current_thread,
object->_cycler.write_upstream(force_to_0, current_thread)),
_force_to_0(force_to_0),
_got_array_writers(false)
{
#ifdef _DEBUG

1
panda/src/gobj/geomVertexData.h
View File

@ -530,7 +530,6 @@ private:
void make_array_writers();
void delete_array_writers();
bool _force_to_0;
bool _got_array_writers;
typedef pvector<PT(GeomVertexArrayDataHandle) > ArrayWriters;
ArrayWriters _array_writers;

1
panda/src/gobj/preparedGraphicsObjects.cxx
View File

@ -1580,7 +1580,6 @@ begin_frame(GraphicsStateGuardianBase *gsg, Thread *current_thread) {
qti != _enqueued_textures.end();
++qti) {
Texture *tex = qti->first;
TextureContext *first_tc = nullptr;
for (int view = 0; view < tex->get_num_views(); ++view) {
TextureContext *tc = tex->prepare_now(view, this, gsg);
if (tc != nullptr) {

1
panda/src/gobj/shader.cxx
View File

@ -2709,7 +2709,6 @@ r_preprocess_source(ostream &out, const Filename &fn,
// Check for an #endif after an include. We have to restore the line
// number in case the include happened under an #if block.
out << line << "\n";
int nread = 0;
if (had_include) {
out << "#line " << (lineno + 1) << " " << fileno << "\n";
}

2
panda/src/grutil/movieTexture.cxx
View File

@ -387,7 +387,7 @@ cull_callback(CullTraverser *, const CullTraverserData &) const {
* independently of the original.
*/
PT(Texture) MovieTexture::
make_copy_impl() {
make_copy_impl() const {
Texture::CDReader cdata_tex(Texture::_cycler);
CDReader cdata(_cycler);
PT(MovieTexture) copy = new MovieTexture(get_name());

2
panda/src/grutil/movieTexture.h
View File

@ -80,7 +80,7 @@ public:
protected:
class CData;
virtual PT(Texture) make_copy_impl();
virtual PT(Texture) make_copy_impl() const;
void do_assign(CData *cdata, Texture::CData *cdata_tex, const MovieTexture *copy,
const CData *cdata_copy, const Texture::CData *cdata_copy_tex);

2
panda/src/particlesystem/orientedParticleFactory.h
View File

@ -33,7 +33,7 @@ PUBLISHED:
INLINE LOrientation get_final_orientation() const;
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
virtual void populate_child_particle(BaseParticle *bp) const;

2
panda/src/physics/actorNode.cxx
View File

@ -120,7 +120,7 @@ transform_changed() {
* Write a string representation of this instance to <out>.
*/
void ActorNode::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"ActorNode:\n";
out.width(indent+2); out<<""; out<<"_ok_to_callback "<<_ok_to_callback<<"\n";

2
panda/src/physics/actorNode.h
View File

@ -39,7 +39,7 @@ PUBLISHED:
void update_transform();
void set_transform_limit(PN_stdfloat limit) { _transform_limit = limit; };
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
PhysicsObject *_mass_center;

2
panda/src/physics/angularEulerIntegrator.cxx
View File

@ -152,7 +152,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void AngularEulerIntegrator::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"AngularEulerIntegrator:\n";
AngularIntegrator::write(out, indent+2);

2
panda/src/physics/angularEulerIntegrator.h
View File

@ -26,7 +26,7 @@ PUBLISHED:
virtual ~AngularEulerIntegrator();
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
virtual void child_integrate(Physical *physical,

2
panda/src/physics/angularForce.cxx
View File

@ -69,7 +69,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void AngularForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"AngularForce (id "<<this<<")\n";
BaseForce::write(out, indent+2);

2
panda/src/physics/angularForce.h
View File

@ -28,7 +28,7 @@ PUBLISHED:
virtual bool is_linear() const;
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
protected:
AngularForce();

2
panda/src/physics/angularIntegrator.cxx
View File

@ -59,7 +59,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void AngularIntegrator::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"AngularIntegrator:\n";
out.width(indent+2); out<<""; out<<"_max_angular_dt "<<_max_angular_dt<<" (class const)\n";

2
panda/src/physics/angularIntegrator.h
View File

@ -32,7 +32,7 @@ public:
PUBLISHED:
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
protected:
AngularIntegrator();

2
panda/src/physics/angularVectorForce.cxx
View File

@ -78,7 +78,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void AngularVectorForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"AngularVectorForce:\n";
out.width(indent+2); out<<""; out<<"_fvec "<<_fvec<<"\n";

2
panda/src/physics/angularVectorForce.h
View File

@ -32,7 +32,7 @@ PUBLISHED:
INLINE LRotation get_local_quat() const;
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
LRotation _fvec;

6
panda/src/physics/baseIntegrator.cxx
View File

@ -149,7 +149,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void BaseIntegrator::
write_precomputed_linear_matrices(ostream &out, unsigned int indent) const {
write_precomputed_linear_matrices(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent);
out<<""<<"_precomputed_linear_matrices\n";
@ -165,7 +165,7 @@ write_precomputed_linear_matrices(ostream &out, unsigned int indent) const {
* Write a string representation of this instance to <out>.
*/
void BaseIntegrator::
write_precomputed_angular_matrices(ostream &out, unsigned int indent) const {
write_precomputed_angular_matrices(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent);
out<<""<<"_precomputed_angular_matrices\n";
@ -181,7 +181,7 @@ write_precomputed_angular_matrices(ostream &out, unsigned int indent) const {
* Write a string representation of this instance to <out>.
*/
void BaseIntegrator::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"BaseIntegrator:\n";
write_precomputed_linear_matrices(out, indent+2);

6
panda/src/physics/baseIntegrator.h
View File

@ -42,10 +42,10 @@ public:
PUBLISHED:
virtual void output(ostream &out) const;
virtual void write_precomputed_linear_matrices(ostream &out,
unsigned int indent=0) const;
int indent=0) const;
virtual void write_precomputed_angular_matrices(ostream &out,
unsigned int indent=0) const;
virtual void write(ostream &out, unsigned int indent=0) const;
int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
protected:
BaseIntegrator();

4
panda/src/physics/forceNode.cxx
View File

@ -133,7 +133,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void ForceNode::
write_forces(ostream &out, unsigned int indent) const {
write_forces(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""<<"_forces ("<<_forces.size()<<" forces)"<<"\n";
for (ForceVector::const_iterator i=_forces.begin();
@ -149,7 +149,7 @@ write_forces(ostream &out, unsigned int indent) const {
* Write a string representation of this instance to <out>.
*/
void ForceNode::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"ForceNode (id "<<this<<") ";
// #*#PandaNode::output(out);

4
panda/src/physics/forceNode.h
View File

@ -42,8 +42,8 @@ PUBLISHED:
MAKE_SEQ_PROPERTY(forces, get_num_forces, get_force, set_force, remove_force, insert_force);
virtual void output(ostream &out) const;
virtual void write_forces(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write_forces(ostream &out, int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
public:
virtual ~ForceNode();

2
panda/src/physics/linearControlForce.cxx
View File

@ -81,7 +81,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearControlForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearControlForce:\n";
out.width(indent+2); out<<""; out<<"_fvec "<<_fvec<<"\n";

2
panda/src/physics/linearControlForce.h
View File

@ -39,7 +39,7 @@ PUBLISHED:
INLINE LVector3 get_local_vector() const;
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
CPT(PhysicsObject) _physics_object;

2
panda/src/physics/linearCylinderVortexForce.cxx
View File

@ -127,7 +127,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearCylinderVortexForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearCylinderVortexForce:\n";
LinearForce::write(out, indent+2);

2
panda/src/physics/linearCylinderVortexForce.h
View File

@ -43,7 +43,7 @@ PUBLISHED:
INLINE PN_stdfloat get_length() const;
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
PN_stdfloat _radius;

2
panda/src/physics/linearDistanceForce.cxx
View File

@ -57,7 +57,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearDistanceForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearDistanceForce:\n";
out.width(indent+2); out<<""; out<<"_force_center "<<_force_center<<"\n";

2
panda/src/physics/linearDistanceForce.h
View File

@ -40,7 +40,7 @@ PUBLISHED:
INLINE PN_stdfloat get_scalar_term() const;
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
LPoint3 _force_center;

2
panda/src/physics/linearEulerIntegrator.cxx
View File

@ -199,7 +199,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearEulerIntegrator::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent);
out<<""<<"LinearEulerIntegrator:\n";

2
panda/src/physics/linearEulerIntegrator.h
View File

@ -26,7 +26,7 @@ PUBLISHED:
virtual ~LinearEulerIntegrator();
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
virtual void child_integrate(Physical *physical,

2
panda/src/physics/linearForce.cxx
View File

@ -92,7 +92,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearForce (id "<<this<<")\n";
out.width(indent+2); out<<""; out<<"_amplitude "<<_amplitude<<"\n";

2
panda/src/physics/linearForce.h
View File

@ -40,7 +40,7 @@ PUBLISHED:
virtual bool is_linear() const;
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
protected:
LinearForce(PN_stdfloat a, bool mass);

2
panda/src/physics/linearFrictionForce.cxx
View File

@ -83,7 +83,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearFrictionForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearFrictionForce:\n";
out.width(indent+2); out<<""; out<<"_coef "<<_coef<<":\n";

2
panda/src/physics/linearFrictionForce.h
View File

@ -29,7 +29,7 @@ PUBLISHED:
INLINE PN_stdfloat get_coef() const;
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
PN_stdfloat _coef;

2
panda/src/physics/linearIntegrator.cxx
View File

@ -78,7 +78,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearIntegrator::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearIntegrator:\n";
out.width(indent+2); out<<""; out<<"_max_linear_dt "<<_max_linear_dt<<" (class static)\n";

2
panda/src/physics/linearIntegrator.h
View File

@ -33,7 +33,7 @@ public:
PUBLISHED:
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
protected:
LinearIntegrator();

2
panda/src/physics/linearJitterForce.cxx
View File

@ -68,7 +68,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearJitterForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearJitterForce:\n";
LinearRandomForce::write(out, indent+2);

2
panda/src/physics/linearJitterForce.h
View File

@ -27,7 +27,7 @@ PUBLISHED:
virtual ~LinearJitterForce();
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
virtual LVector3 get_child_vector(const PhysicsObject *po);

2
panda/src/physics/linearNoiseForce.cxx
View File

@ -146,7 +146,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearNoiseForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent);
out<<""<<"LinearNoiseForce:";

2
panda/src/physics/linearNoiseForce.h
View File

@ -28,7 +28,7 @@ PUBLISHED:
virtual ~LinearNoiseForce();
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
public:
static ConfigVariableInt _random_seed;

2
panda/src/physics/linearRandomForce.cxx
View File

@ -60,7 +60,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearRandomForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearRandomForce:\n";
LinearForce::write(out, indent+2);

2
panda/src/physics/linearRandomForce.h
View File

@ -27,7 +27,7 @@ PUBLISHED:
virtual ~LinearRandomForce();
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
protected:
static PN_stdfloat bounded_rand();

2
panda/src/physics/linearSinkForce.cxx
View File

@ -78,7 +78,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearSinkForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearSinkForce:\n";
LinearDistanceForce::write(out, indent+2);

2
panda/src/physics/linearSinkForce.h
View File

@ -28,7 +28,7 @@ PUBLISHED:
virtual ~LinearSinkForce();
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
virtual LVector3 get_child_vector(const PhysicsObject *po);

2
panda/src/physics/linearSourceForce.cxx
View File

@ -78,7 +78,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearSourceForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearSourceForce:\n";
LinearDistanceForce::write(out, indent+2);

2
panda/src/physics/linearSourceForce.h
View File

@ -28,7 +28,7 @@ PUBLISHED:
virtual ~LinearSourceForce();
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
virtual LVector3 get_child_vector(const PhysicsObject *po);

2
panda/src/physics/linearUserDefinedForce.cxx
View File

@ -72,7 +72,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearUserDefinedForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearUserDefinedForce:\n";
LinearForce::write(out, indent+2);

2
panda/src/physics/linearUserDefinedForce.h
View File

@ -29,7 +29,7 @@ PUBLISHED:
INLINE void set_proc(LVector3 (*proc)(const PhysicsObject *));
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
LVector3 (*_proc)(const PhysicsObject *po);

2
panda/src/physics/linearVectorForce.cxx
View File

@ -84,7 +84,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void LinearVectorForce::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"LinearVectorForce:\n";
out.width(indent+2); out<<""; out<<"_fvec "<<_fvec<<"\n";

2
panda/src/physics/linearVectorForce.h
View File

@ -34,7 +34,7 @@ PUBLISHED:
INLINE LVector3 get_local_vector() const;
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
public:
INLINE LinearVectorForce& operator += (const LinearVectorForce &other);

8
panda/src/physics/physical.cxx
View File

@ -134,7 +134,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void Physical::
write_physics_objects(ostream &out, unsigned int indent) const {
write_physics_objects(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent);
out<<""<<"_physics_objects ("<<_physics_objects.size()<<" objects)\n";
@ -150,7 +150,7 @@ write_physics_objects(ostream &out, unsigned int indent) const {
* Write a string representation of this instance to <out>.
*/
void Physical::
write_linear_forces(ostream &out, unsigned int indent) const {
write_linear_forces(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent);
out<<""<<"_linear_forces ("<<_linear_forces.size()<<" forces)\n";
@ -166,7 +166,7 @@ write_linear_forces(ostream &out, unsigned int indent) const {
* Write a string representation of this instance to <out>.
*/
void Physical::
write_angular_forces(ostream &out, unsigned int indent) const {
write_angular_forces(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent);
out<<""<<"_angular_forces ("<<_angular_forces.size()<<" forces)\n";
@ -182,7 +182,7 @@ write_angular_forces(ostream &out, unsigned int indent) const {
* Write a string representation of this instance to <out>.
*/
void Physical::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""<<"Physical\n";
write_physics_objects(out, indent+2);

8
panda/src/physics/physical.h
View File

@ -75,12 +75,12 @@ PUBLISHED:
virtual void output(ostream &out = cout) const;
virtual void write_physics_objects(
ostream &out = cout, unsigned int indent=0) const;
ostream &out = cout, int indent=0) const;
virtual void write_linear_forces(
ostream &out = cout, unsigned int indent=0) const;
ostream &out = cout, int indent=0) const;
virtual void write_angular_forces(
ostream &out = cout, unsigned int indent=0) const;
virtual void write(ostream &out = cout, unsigned int indent=0) const;
ostream &out = cout, int indent=0) const;
virtual void write(ostream &out = cout, int indent=0) const;
public:
INLINE const PhysicsObject::Vector &get_object_vector() const;

2
panda/src/physics/physicalNode.cxx
View File

@ -133,7 +133,7 @@ remove_physical(size_t index) {
* Write a string representation of this instance to <out>.
*/
void PhysicalNode::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""; out<<"PhysicalNode:\n";
// PandaNode::write(out, indent+2);

2
panda/src/physics/physicalNode.h
View File

@ -43,7 +43,7 @@ PUBLISHED:
MAKE_SEQ_PROPERTY(physicals, get_num_physicals, get_physical, set_physical,
remove_physical, insert_physical);
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
public:
virtual ~PhysicalNode();

10
panda/src/physics/physicsManager.cxx
View File

@ -186,7 +186,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void PhysicsManager::
write_physicals(ostream &out, unsigned int indent) const {
write_physicals(ostream &out, int indent) const {
#ifndef NDEBUG //[
if (indent>10) {
return;
@ -206,7 +206,7 @@ write_physicals(ostream &out, unsigned int indent) const {
* Write a string representation of this instance to <out>.
*/
void PhysicsManager::
write_linear_forces(ostream &out, unsigned int indent) const {
write_linear_forces(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent);
out<<""<<"_linear_forces ("<<_linear_forces.size()<<" forces)\n";
@ -222,7 +222,7 @@ write_linear_forces(ostream &out, unsigned int indent) const {
* Write a string representation of this instance to <out>.
*/
void PhysicsManager::
write_angular_forces(ostream &out, unsigned int indent) const {
write_angular_forces(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent);
out<<""<<"_angular_forces ("<<_angular_forces.size()<<" forces)\n";
@ -238,7 +238,7 @@ write_angular_forces(ostream &out, unsigned int indent) const {
* Write a string representation of this instance to <out>.
*/
void PhysicsManager::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""<<"PhysicsManager:\n";
if (indent>20) {
@ -268,7 +268,7 @@ write(ostream &out, unsigned int indent) const {
* Write a string representation of this instance to <out>.
*/
void PhysicsManager::
debug_output(ostream &out, unsigned int indent) const {
debug_output(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""<<"PhysicsManager li"<<(_linear_integrator?1:0)<<" ai"<<(_angular_integrator?1:0)<<"\n";
out<<" _physicals "<<_physicals.size()<<"\n";

10
panda/src/physics/physicsManager.h
View File

@ -72,12 +72,12 @@ PUBLISHED:
void init_random_seed();
virtual void output(ostream &out) const;
virtual void write_physicals(ostream &out, unsigned int indent=0) const;
virtual void write_linear_forces(ostream &out, unsigned int indent=0) const;
virtual void write_angular_forces(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write_physicals(ostream &out, int indent=0) const;
virtual void write_linear_forces(ostream &out, int indent=0) const;
virtual void write_angular_forces(ostream &out, int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
virtual void debug_output(ostream &out, unsigned int indent=0) const;
virtual void debug_output(ostream &out, int indent=0) const;
public:
friend class Physical;

2
panda/src/physics/physicsObject.cxx
View File

@ -160,7 +160,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
void PhysicsObject::
write(ostream &out, unsigned int indent) const {
write(ostream &out, int indent) const {
#ifndef NDEBUG //[
out.width(indent);
out<<""<<"PhysicsObject "<<_name<<"\n";

2
panda/src/physics/physicsObject.h
View File

@ -97,7 +97,7 @@ PUBLISHED:
#endif
virtual void output(ostream &out) const;
virtual void write(ostream &out, unsigned int indent=0) const;
virtual void write(ostream &out, int indent=0) const;
private:
// physical

6
panda/src/pnmimage/pnmImage.cxx
View File

@ -1016,9 +1016,9 @@ blend(int x, int y, float r, float g, float b, float alpha) {
} else {
// Blend the color with the previous color.
LRGBColorf prev_rgb = get_xel(x, y);
r = r + (1.0f - alpha) * (get_red(x, y) - r);
g = g + (1.0f - alpha) * (get_green(x, y) - g);
b = b + (1.0f - alpha) * (get_blue(x, y) - b);
r = r + (1.0f - alpha) * (prev_rgb[0] - r);
g = g + (1.0f - alpha) * (prev_rgb[1] - g);
b = b + (1.0f - alpha) * (prev_rgb[2] - b);
alpha = prev_alpha + alpha * (1.0f - prev_alpha);
if (has_alpha()) {

1
panda/src/pnmimagetypes/pnmFileTypeEXR.h
View File

@ -69,7 +69,6 @@ public:
typedef std::vector<std::string> ChannelNames;
ChannelNames _channel_names;
IMF::PixelType _best_pixel_type;
};
class Writer : public PNMWriter {

12
panda/src/pnmimagetypes/pnmFileTypeJPG.h
View File

@ -89,18 +89,6 @@ public:
};
typedef struct my_error_mgr *_my_error_ptr;
struct my_error_mgr _jerr;
unsigned long pos;
unsigned long offBits;
unsigned short cBitCount;
int indexed;
int classv;
pixval R[256]; /* reds */
pixval G[256]; /* greens */
pixval B[256]; /* blues */
bool _is_valid;
};

1
panda/src/text/staticTextFont.h
View File

@ -55,7 +55,6 @@ private:
typedef pmap<int, PT(TextGlyph)> Glyphs;
Glyphs _glyphs;
PN_stdfloat _font_height;
PT(PandaNode) _font;
CoordinateSystem _cs;

1
panda/src/text/textNode.h
View File

@ -343,7 +343,6 @@ private:
int _max_rows;
GeomEnums::UsageHint _usage_hint;
int _flatten_flags;
bool _dynamic_merge;
PN_stdfloat _frame_width;
PN_stdfloat _card_border_size;
PN_stdfloat _card_border_uv_portion;

8
panda/src/tinydisplay/store_pixel.h
View File

@ -26,8 +26,8 @@ FNAME(store_pixel) (ZBuffer *zb, PIXEL &result, int r, int g, int b, int a) {
r = STORE_PIXEL_0(fr, ((unsigned int)r * OP_A(fr, r) >> 16) + ((unsigned int)fr * OP_B(fr, r) >> 16));
g = STORE_PIXEL_1(fg, ((unsigned int)g * OP_A(fg, g) >> 16) + ((unsigned int)fg * OP_B(fg, g) >> 16));
b = STORE_PIXEL_2(fg, ((unsigned int)b * OP_A(fb, b) >> 16) + ((unsigned int)fb * OP_B(fb, b) >> 16));
a = STORE_PIXEL_3(fg, ((unsigned int)a * OP_A(fa, a) >> 16) + ((unsigned int)fa * OP_B(fa, a) >> 16));
b = STORE_PIXEL_2(fb, ((unsigned int)b * OP_A(fb, b) >> 16) + ((unsigned int)fb * OP_B(fb, b) >> 16));
a = STORE_PIXEL_3(fa, ((unsigned int)a * OP_A(fa, a) >> 16) + ((unsigned int)fa * OP_B(fa, a) >> 16));
result = RGBA_TO_PIXEL(r, g, b, a);
}
@ -43,8 +43,8 @@ FNAME_S(store_pixel) (ZBuffer *zb, PIXEL &result, int r, int g, int b, int a) {
r = STORE_PIXEL_0(fr, ((unsigned int)r * OP_A(fr, r) >> 16) + ((unsigned int)fr * OP_B(fr, r) >> 16));
g = STORE_PIXEL_1(fg, ((unsigned int)g * OP_A(fg, g) >> 16) + ((unsigned int)fg * OP_B(fg, g) >> 16));
b = STORE_PIXEL_2(fg, ((unsigned int)b * OP_A(fb, b) >> 16) + ((unsigned int)fb * OP_B(fb, b) >> 16));
a = STORE_PIXEL_3(fg, ((unsigned int)a * OP_A(fa, a) >> 16) + ((unsigned int)fa * OP_B(fa, a) >> 16));
b = STORE_PIXEL_2(fb, ((unsigned int)b * OP_A(fb, b) >> 16) + ((unsigned int)fb * OP_B(fb, b) >> 16));
a = STORE_PIXEL_3(fa, ((unsigned int)a * OP_A(fa, a) >> 16) + ((unsigned int)fa * OP_B(fa, a) >> 16));
result = SRGBA_TO_PIXEL(r, g, b, a);
}

6
panda/src/tinydisplay/zfeatures.h
View File

@ -39,4 +39,10 @@
/* Number of simultaneous texture stages supported (multitexture). */
#define MAX_TEXTURE_STAGES 3
#ifdef __GNUC__
#define UNUSED __attribute__((unused))
#else
#define UNUSED
#endif
#endif /* _tgl_features_h_ */

18
panda/src/tinydisplay/ztriangle_two.h
View File

@ -187,7 +187,7 @@ FNAME(flat_textured) (ZBuffer *zb,
zz=z >> ZB_POINT_Z_FRAC_BITS; \
if (ZCMP(pz[_a], zz)) { \
tmp = ZB_LOOKUP_TEXTURE(texture_def, s, t, mipmap_level, mipmap_dx); \
int a = PALPHA_MULT(oa0, PIXEL_A(tmp)); \
UNUSED int a = PALPHA_MULT(oa0, PIXEL_A(tmp)); \
if (ACMP(zb, a)) { \
STORE_PIX(pp[_a], \
RGBA_TO_PIXEL(PCOMPONENT_MULT(or0, PIXEL_R(tmp)), \
@ -249,7 +249,7 @@ FNAME(smooth_textured) (ZBuffer *zb,
zz=z >> ZB_POINT_Z_FRAC_BITS; \
if (ZCMP(pz[_a], zz)) { \
tmp = ZB_LOOKUP_TEXTURE(texture_def, s, t, mipmap_level, mipmap_dx); \
int a = PALPHA_MULT(oa1, PIXEL_A(tmp)); \
UNUSED int a = PALPHA_MULT(oa1, PIXEL_A(tmp)); \
if (ACMP(zb, a)) { \
STORE_PIX(pp[_a], \
RGBA_TO_PIXEL(PCOMPONENT_MULT(or1, PIXEL_R(tmp)), \
@ -431,7 +431,7 @@ FNAME(flat_perspective) (ZBuffer *zb,
zz=z >> ZB_POINT_Z_FRAC_BITS; \
if (ZCMP(pz[_a], zz)) { \
tmp = ZB_LOOKUP_TEXTURE(texture_def, s, t, mipmap_level, mipmap_dx); \
int a = PALPHA_MULT(oa0, PIXEL_A(tmp)); \
UNUSED int a = PALPHA_MULT(oa0, PIXEL_A(tmp)); \
if (ACMP(zb, a)) { \
STORE_PIX(pp[_a], \
RGBA_TO_PIXEL(PCOMPONENT_MULT(or0, PIXEL_R(tmp)), \
@ -567,7 +567,7 @@ FNAME(smooth_perspective) (ZBuffer *zb,
zz=z >> ZB_POINT_Z_FRAC_BITS; \
if (ZCMP(pz[_a], zz)) { \
tmp = ZB_LOOKUP_TEXTURE(texture_def, s, t, mipmap_level, mipmap_dx); \
int a = PALPHA_MULT(oa1, PIXEL_A(tmp)); \
UNUSED int a = PALPHA_MULT(oa1, PIXEL_A(tmp)); \
if (ACMP(zb, a)) { \
STORE_PIX(pp[_a], \
RGBA_TO_PIXEL(PCOMPONENT_MULT(or1, PIXEL_R(tmp)), \
@ -695,9 +695,9 @@ FNAME(smooth_multitex2) (ZBuffer *zb,
zz=z >> ZB_POINT_Z_FRAC_BITS; \
if (ZCMP(pz[_a], zz)) { \
tmp = ZB_LOOKUP_TEXTURE(&zb->current_textures[0], s, t, mipmap_level, mipmap_dx); \
int a = PALPHA_MULT(oa1, PIXEL_A(tmp)); \
UNUSED int a = PALPHA_MULT(oa1, PIXEL_A(tmp)); \
if (ACMP(zb, a)) { \
int tmpa = ZB_LOOKUP_TEXTURE(&zb->current_textures[1], sa, ta, mipmap_levela, mipmap_dxa); \
UNUSED int tmpa = ZB_LOOKUP_TEXTURE(&zb->current_textures[1], sa, ta, mipmap_levela, mipmap_dxa); \
STORE_PIX(pp[_a], \
RGBA_TO_PIXEL(PCOMPONENT_MULT3(or1, PIXEL_R(tmp), PIXEL_R(tmpa)), \
PCOMPONENT_MULT3(og1, PIXEL_G(tmp), PIXEL_G(tmpa)), \
@ -853,10 +853,10 @@ FNAME(smooth_multitex3) (ZBuffer *zb,
zz=z >> ZB_POINT_Z_FRAC_BITS; \
if (ZCMP(pz[_a], zz)) { \
tmp = ZB_LOOKUP_TEXTURE(&zb->current_textures[0], s, t, mipmap_level, mipmap_dx); \
int a = PALPHA_MULT(oa1, PIXEL_A(tmp)); \
UNUSED int a = PALPHA_MULT(oa1, PIXEL_A(tmp)); \
if (ACMP(zb, a)) { \
int tmpa = ZB_LOOKUP_TEXTURE(&zb->current_textures[1], sa, ta, mipmap_levela, mipmap_dxa); \
int tmpb = ZB_LOOKUP_TEXTURE(&zb->current_textures[2], sb, tb, mipmap_levelb, mipmap_dxb); \
UNUSED int tmpa = ZB_LOOKUP_TEXTURE(&zb->current_textures[1], sa, ta, mipmap_levela, mipmap_dxa); \
UNUSED int tmpb = ZB_LOOKUP_TEXTURE(&zb->current_textures[2], sb, tb, mipmap_levelb, mipmap_dxb); \
STORE_PIX(pp[_a], \
RGBA_TO_PIXEL(PCOMPONENT_MULT4(or1, PIXEL_R(tmp), PIXEL_R(tmpa), PIXEL_R(tmpb)), \
PCOMPONENT_MULT4(og1, PIXEL_G(tmp), PIXEL_G(tmpa), PIXEL_G(tmpb)), \

1
pandatool/src/egg-palettize/eggPalettize.h
View File

@ -62,7 +62,6 @@ private:
bool _omitall;
bool _redo_all;
bool _redo_eggs;
bool _dont_lock_txa;
bool _describe_input_file;
bool _remove_eggs;

1
pandatool/src/eggbase/eggWriter.h
View File

@ -40,7 +40,6 @@ protected:
private:
ofstream _output_stream;
ostream *_output_ptr;
};
#endif

2
pandatool/src/objegg/eggToObjConverter.h
View File

@ -67,8 +67,6 @@ private:
const UniqueVertices &unique);
private:
bool _triangulate_polygons;
UniqueVertices _unique_vert3, _unique_vert4, _unique_uv2, _unique_uv3, _unique_norm;
VertexMap _vmap;
EggGroupNode *_current_group;

1
pandatool/src/palettizer/eggFile.h
View File

@ -90,7 +90,6 @@ private:
typedef pvector<TextureReference *> Textures;
Textures _textures;
bool _noabs;
bool _first_txa_match;
PaletteGroups _explicitly_assigned_groups;
PaletteGroup *_default_group;

1
pandatool/src/palettizer/texturePlacement.h
View File

@ -127,7 +127,6 @@ private:
// This value is only filled in while reading from the bam file; don't use
// it otherwise.
int _num_references;
int _margin_override;
int _num_textureSwaps;
public:

1
pandatool/src/pfmprogs/pfmBba.h
View File

@ -43,7 +43,6 @@ private:
bool _got_zero_special;
bool _got_output_filename;
Filename _output_filename;
int _reorder_index;
};
#endif