瀏覽代碼

use combined srcs

cxgeorge 24 年之前
父節點
當前提交
c9c98ed057
共有 3 個文件被更改,包括 26 次插入13 次删除
  1. 11 10
      pandatool/src/xfile/Sources.pp
  2. 3 3
      pandatool/src/xfile/xFileMesh.cxx
  3. 12 0
      pandatool/src/xfile/xfile_composite1.cxx

+ 11 - 10
pandatool/src/xfile/Sources.pp

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

+ 3 - 3
pandatool/src/xfile/xFileMesh.cxx

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

+ 12 - 0
pandatool/src/xfile/xfile_composite1.cxx

@@ -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"
+
+