Fixing filenames

pandatool/src/maxegg/MaxToEgg.cpp

@@ -67,7 +67,7 @@ void MaxToEgg::Run(ULONG *selection_list, int len)
   converter.setMaxInterface( pMaxInterface );
   Logger::Log( MTE, Logger::SAT_DEBUG_SPAM_LEVEL,
 	       "Setting converter's egg data." );
-  converter.set_egg_data( &_data, false );
+  converter.set_egg_data( _data );
   // applies the parameters from the command line options
   apply_parameters(converter);
   converter.set_double_sided(doubleSided);
@@ -122,4 +122,4 @@ bool MaxToEgg::handle_args(Args &args) {
   }
 
   return SomethingToEgg::handle_args(args);
-}
+}

pandatool/src/maxegg/MaxToEggConverter.h

@@ -1,202 +0,0 @@
-// Filename: mayaToEggConverter.h
-// Created by:  drose (10Nov99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://www.panda3d.org/license.txt .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-#ifndef __MaxToEggConverter__H
-#define __MaxToEggConverter__H
-
-#pragma conform(forScope, off)
-
-#include "pandatoolbase.h"
-
-/* 3ds Max Includes, with bonus(!) memory protection
- */
-
-#ifdef MAX5
-//Disable the "Too many actual parameters in istdplug.h" warning in Max5
-#pragma warning(push)
-#pragma warning(disable: 4002)
-#include "pre_max_include.h"
-#endif
-#include "Max.h"
-#include "iparamb2.h"
-#include "iparamm2.h"
-#include "istdplug.h"
-#include "iskin.h"
-#include "resource.h"
-#include "stdmat.h"
-#include "phyexp.h"
-#include "surf_api.h"
-#ifdef MAX5
-#include "post_max_include.h"
-#pragma warning(pop)
-#endif
-
-
-/* Panda Includes
- */
-#include "eggCoordinateSystem.h"
-#include "eggGroup.h"
-#include "eggPolygon.h"
-#include "eggTextureCollection.h"
-#include "eggTexture.h"
-#include "eggVertex.h"
-#include "eggVertexPool.h"
-#include "eggNurbsCurve.h"
-#include "pandatoolbase.h"
-#include "somethingToEgg.h"
-#include "somethingToEggConverter.h"
-#include "eggXfmSAnim.h"
-
-/* Local Includes
- */
-#include "maxNodeTree.h"
-
-/* Error-Reporting Includes
- */
-#include "Logger.h"
-#define MTEC Logger::ST_MAP_ME_TO_APP_SPECIFIC_SYSTEM4
-
-/* Helpful Defintions and Casts
- */
-#define null 0
-#define PHYSIQUE_CLASSID Class_ID(PHYSIQUE_CLASS_ID_A, PHYSIQUE_CLASS_ID_B)
-
-/* External Helper Functions for UI
- */
-// *** Figure out why this is causing link errors
-//DWORD WINAPI ProgressBarFunction(LPVOID arg);
-
-////////////////////////////////////////////////////////////////////
-//       Class : MaxToEggConverter
-// Description : This class supervises the construction of an EggData
-//               structure from a Max model
-////////////////////////////////////////////////////////////////////
-class MaxToEggConverter : public SomethingToEggConverter {
- public:
-  MaxToEggConverter(const string &program_name = "");
-  MaxToEggConverter(const MaxToEggConverter &copy);
-  virtual ~MaxToEggConverter();
-
-  virtual SomethingToEggConverter *make_copy();
-
-  virtual string get_name() const;
-  virtual string get_extension() const;
-
-  virtual bool convert_file(const Filename &filename);
-  bool convert_max(bool from_selection);
-
-  //Sets the interface to 3dsMax.
-  void setMaxInterface(Interface *pInterface);
-
-  void set_selection_list(ULONG *list, int len) {
-    _selection_list = list; _selection_len = len; }
-  void set_double_sided(bool flag) {double_sided = flag;}
-
- private:
-  double _current_frame;
-  ULONG *_selection_list; int _selection_len;
-
-  bool convert_flip(double start_frame, double end_frame, 
-                    double frame_inc, double output_frame_rate);
-
-  bool convert_char_model();
-  bool convert_char_chan(double start_frame, double end_frame, 
-                         double frame_inc, double output_frame_rate);
-  bool convert_hierarchy(EggGroupNode *egg_root);
-  bool process_model_node(MaxNodeDesc *node_desc);
-
-  void get_transform(INode *max_node, EggGroup *egg_group);
-  LMatrix4d get_object_transform(INode *max_node);
-  void get_joint_transform(INode *max_node, EggGroup *egg_group);
-  void get_joint_transform(INode *max_node, INode *parent_node, 
-			   EggGroup *egg_group);
-
-  // *** Leaving out these functions til there use/support in Max is determined
-  /*
-  void make_nurbs_surface(const MDagPath &dag_path, 
-                          MFnNurbsSurface &surface,
-                          EggGroup *group);
-  EggNurbsCurve *make_trim_curve(const MFnNurbsCurve &curve,
-                                 const string &nurbs_name,
-                                 EggGroupNode *egg_group,
-                                 int trim_curve_index);
- */
-  bool make_nurbs_curve(NURBSCVCurve *curve, const string &name,
-                        TimeValue time, EggGroup *egg_group);
-  void make_polyset(INode *max_node,
-                    Mesh *mesh,
-                    EggGroup *egg_group,
-                    Shader *default_shader = NULL);
-  /*
-  void make_locator(const MDagPath &dag_path, const MFnDagNode &dag_node,
-                    EggGroup *egg_group);
-  */
-
-  //Gets the vertex normal for a given face and vertex. Go figure.
-  Point3 get_max_vertex_normal(Mesh *mesh, int faceNo, int vertNo);
-  
-  void get_vertex_weights(INode *max_node, EggVertexPool *vpool);
-  /*
-  void set_shader_attributes(EggPrimitive &primitive,
-                             const MayaShader &shader);
-  */
-  void set_material_attributes(EggPrimitive &primitive, INode *max_node);
-
-  void set_material_attributes(EggPrimitive &primitive, Mtl *maxMaterial, Face *face);
-
-  void apply_texture_properties(EggTexture &tex, 
-                                StdMat *maxMaterial);
-  /*
-  bool compare_texture_properties(EggTexture &tex, 
-                                  const MayaShaderColorDef &color_def);
-  */
-
-  bool reparent_decals(EggGroupNode *egg_parent);
-
-  string _program_name;
-  bool _from_selection;
-
-  MaxNodeTree _tree;
-  
-  int _cur_tref;
-  bool double_sided;
-
- public:
-  //MayaShaders _shaders;
-  EggTextureCollection _textures;
-  Interface *maxInterface;
-  
-  bool _polygon_output;
-  double _polygon_tolerance;
-
-  enum TransformType {
-    TT_invalid,
-    TT_all,
-    TT_model,
-    TT_dcs,
-    TT_none,
-  };
-  TransformType _transform_type;
-
-  static TransformType string_transform_type(const string &arg);
-
-  Modifier* FindSkinModifier (INode* node, const Class_ID &type);
-};
-
-
-#endif

pandatool/src/maxegg/maxToEggConverter.cxx

@@ -213,7 +213,7 @@ convert_max(bool from_selection) {
     case AC_none:
       // none: just get out a static model, no animation.
       Logger::Log( MTEC, Logger::SAT_MEDIUM_LEVEL, "Converting static model." );
-      all_ok = convert_hierarchy(&get_egg_data());
+      all_ok = convert_hierarchy(get_egg_data());
       break;
       
     case AC_flip:
@@ -250,7 +250,7 @@ convert_max(bool from_selection) {
       break;
     };
 
-    reparent_decals(&get_egg_data());
+    reparent_decals(get_egg_data());
   }
 
   if (all_ok) {
@@ -297,7 +297,7 @@ convert_flip(double start_frame, double end_frame, double frame_inc,
   bool all_ok = true;
 
   EggGroup *sequence_node = new EggGroup(_character_name);
-  get_egg_data().add_child(sequence_node);
+  get_egg_data()->add_child(sequence_node);
   if (_animation_convert == AC_flip) { 
     sequence_node->set_switch_flag(true);
     sequence_node->set_switch_fps(output_frame_rate / frame_inc);
@@ -339,7 +339,7 @@ convert_char_model() {
   }
 
   EggGroup *char_node = new EggGroup(_character_name);
-  get_egg_data().add_child(char_node);
+  get_egg_data()->add_child(char_node);
   char_node->set_dart_type(EggGroup::DT_default);
 
   return convert_hierarchy(char_node);
@@ -357,7 +357,7 @@ convert_char_chan(double start_frame, double end_frame, double frame_inc,
                   double output_frame_rate) {
 
   EggTable *root_table_node = new EggTable();
-  get_egg_data().add_child(root_table_node);
+  get_egg_data()->add_child(root_table_node);
   EggTable *bundle_node = new EggTable(_character_name);
   bundle_node->set_table_type(EggTable::TT_bundle);
   root_table_node->add_child(bundle_node);
@@ -367,7 +367,7 @@ convert_char_chan(double start_frame, double end_frame, double frame_inc,
   // Set the frame rate before we start asking for anim tables to be
   // created.
   _tree._fps = output_frame_rate / frame_inc;
-  _tree.clear_egg(&get_egg_data(), NULL, skeleton_node);
+  _tree.clear_egg(get_egg_data(), NULL, skeleton_node);
 
   // Now we can get the animation data by walking through all of the
   // frames, one at a time, and getting the joint angles at each
@@ -446,7 +446,7 @@ bool MaxToEggConverter::
 convert_hierarchy(EggGroupNode *egg_root) {
   //int num_nodes = _tree.get_num_nodes();
 
-  _tree.clear_egg(&get_egg_data(), egg_root, NULL);
+  _tree.clear_egg(get_egg_data(), egg_root, NULL);
   for (int i = 0; i < _tree.get_num_nodes(); i++) {
     if (!process_model_node(_tree.get_node(i))) {
       return false;