TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

use combined srcs

Browse Source
This commit is contained in:
cxgeorge 2002-03-04 06:22:53 +00:00
parent 29fd84c48e
commit c9c98ed057
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pandatool/src/xfile/Sources.pp
View File

@ -12,16 +12,17 @@
#define WIN_SYS_LIBS \ #define WIN_SYS_LIBS \
d3dxof.lib dxguid.lib d3dxof.lib dxguid.lib
#define COMBINED_SOURCES $[TARGET]_composite1.cxx
#define SOURCES \ #define SOURCES \
config_xfile.cxx config_xfile.h \ config_xfile.h xFileFace.h xFileMaker.h xFileMaterial.h \
xFileFace.cxx xFileFace.h \ xFileMesh.h xFileNormal.h xFileTemplates.h \
xFileMaker.cxx xFileMaker.h \ xFileToEggConverter.h xFileVertex.h
xFileMaterial.cxx xFileMaterial.h \
xFileMesh.cxx xFileMesh.h \ #define INCLUDED_SOURCES \
xFileNormal.cxx xFileNormal.h \ config_xfile.cxx xFileFace.cxx xFileMaker.cxx xFileMaterial.cxx \
xFileTemplates.cxx xFileTemplates.h \ xFileMesh.cxx xFileNormal.cxx xFileTemplates.cxx \
xFileToEggConverter.cxx xFileToEggConverter.h \ xFileToEggConverter.cxx xFileVertex.cxx
xFileVertex.cxx xFileVertex.h
#end ss_lib_target #end ss_lib_target

6
pandatool/src/xfile/xFileMesh.cxx
View File

@ -623,7 +623,7 @@ read_color_data(const Datagram &raw_data) {
int num_colors = di.get_int32(); int num_colors = di.get_int32();
int i; int i;
for (i = 0; i < num_colors; i++) { for (i = 0; i < num_colors; i++) {
int vertex_index = di.get_int32(); unsigned int vertex_index = di.get_int32();
if (vertex_index < 0 || vertex_index >= _vertices.size()) { if (vertex_index < 0 || vertex_index >= _vertices.size()) {
cerr << "Vertex index out of range in MeshVertexColors.\n"; cerr << "Vertex index out of range in MeshVertexColors.\n";
return false; return false;
@ -687,7 +687,7 @@ read_material_list_data(const Datagram &raw_data) {
DatagramIterator di(raw_data); DatagramIterator di(raw_data);
di.get_int32(); /* num_materials */ di.get_int32(); /* num_materials */
int num_faces = di.get_int32(); unsigned int num_faces = di.get_int32();
if (num_faces > _faces.size()) { if (num_faces > _faces.size()) {
cerr << "Too many faces in MaterialList.\n"; cerr << "Too many faces in MaterialList.\n";
@ -695,7 +695,7 @@ read_material_list_data(const Datagram &raw_data) {
} }
int material_index = -1; int material_index = -1;
int i = 0; unsigned int i = 0;
while (i < num_faces) { while (i < num_faces) {
XFileFace *face = _faces[i]; XFileFace *face = _faces[i];
material_index = di.get_int32(); material_index = di.get_int32();

12
pandatool/src/xfile/xfile_composite1.cxx Normal file
View File

@ -0,0 +1,12 @@
#include "config_xfile.cxx"
#include "xFileFace.cxx"
#include "xFileMaker.cxx"
#include "xFileMaterial.cxx"
#include "xFileMesh.cxx"
#include "xFileNormal.cxx"
#include "xFileTemplates.cxx"
#include "xFileToEggConverter.cxx"
#include "xFileVertex.cxx"