Browse Source

fixed egg2bam problem for PolylightNode

Asad M. Zaman 21 years ago
parent
commit
7a0762a8c7

+ 6 - 6
panda/src/egg2pg/eggLoader.cxx

@@ -1870,14 +1870,14 @@ make_node(EggGroup *egg_group, PandaNode *parent) {
     // use make_sphere to get the center, radius and color
     // use make_sphere to get the center, radius and color
     //egg2pg_cat.debug() << "polylight node\n";
     //egg2pg_cat.debug() << "polylight node\n";
     LPoint3f center;
     LPoint3f center;
-	Colorf color;
-	float radius;
-	
-	if(!make_sphere(egg_group,center,radius,color)) {
+    Colorf color;
+    float radius;
+    
+    if(!make_sphere(egg_group,center,radius,color)) {
       egg2pg_cat.warning()
       egg2pg_cat.warning()
         << "Polylight " << egg_group->get_name() << " make_sphere failed!\n";
         << "Polylight " << egg_group->get_name() << " make_sphere failed!\n";
-	}
-	PolylightNode *pnode = new PolylightNode(egg_group->get_name());
+    }
+    PolylightNode *pnode = new PolylightNode(egg_group->get_name());
     pnode->set_pos(center);
     pnode->set_pos(center);
     pnode->set_color(color);
     pnode->set_color(color);
     pnode->set_radius(radius);
     pnode->set_radius(radius);

+ 1 - 0
panda/src/pgraph/config_pgraph.cxx

@@ -275,6 +275,7 @@ init_libpgraph() {
   PandaNode::register_with_read_factory();
   PandaNode::register_with_read_factory();
   PlaneNode::register_with_read_factory();
   PlaneNode::register_with_read_factory();
   PointLight::register_with_read_factory();
   PointLight::register_with_read_factory();
+  PolylightNode::register_with_read_factory();
   PortalNode::register_with_read_factory();
   PortalNode::register_with_read_factory();
   RenderEffects::register_with_read_factory();
   RenderEffects::register_with_read_factory();
   RenderModeAttrib::register_with_read_factory();
   RenderModeAttrib::register_with_read_factory();

+ 2 - 3
panda/src/pgraph/polylightNode.h

@@ -21,7 +21,6 @@
 
 
 #include "pandabase.h"
 #include "pandabase.h"
 
 
-#include "renderEffect.h"
 #include "luse.h"
 #include "luse.h"
 #include "nodePath.h"
 #include "nodePath.h"
 #include "pmap.h"
 #include "pmap.h"
@@ -141,9 +140,9 @@ public:
     return _type_handle;
     return _type_handle;
   }
   }
   static void init_type() {
   static void init_type() {
-    RenderEffect::init_type();
+    PandaNode::init_type();
     register_type(_type_handle, "PolylightNode",
     register_type(_type_handle, "PolylightNode",
-                  RenderEffect::get_class_type());
+                  PandaNode::get_class_type());
   }
   }
   virtual TypeHandle get_type() const {
   virtual TypeHandle get_type() const {
     return get_class_type();
     return get_class_type();