RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
David Rose 2001-05-02 00:08:25 +00:00
parent efd47a12f1
commit 30882d7384
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/egg/eggGroupNode.cxx
View File

@ -14,6 +14,8 @@
#include "eggVertex.h"
#include "eggTextureCollection.h"
#include "eggMaterialCollection.h"
#include "pt_EggTexture.h"
#include "pt_EggMaterial.h"
#include "config_egg.h"
#include <dSearchPath.h>
@ -820,7 +822,7 @@ find_textures(EggTextureCollection *collection) {
EggNode *child = *ci;
if (child->is_of_type(EggTexture::get_class_type())) {
PT(EggTexture) tex = DCAST(EggTexture, child);
PT_EggTexture tex = DCAST(EggTexture, child);
// Now remove the EggTexture entry from our child list.
prepare_remove_child(tex);
@ -866,7 +868,7 @@ find_materials(EggMaterialCollection *collection) {
EggNode *child = *ci;
if (child->is_of_type(EggMaterial::get_class_type())) {
PT(EggMaterial) tex = DCAST(EggMaterial, child);
PT_EggMaterial tex = DCAST(EggMaterial, child);
// Now remove the EggMaterial entry from our child list.
prepare_remove_child(tex);

6
panda/src/egg/eggPrimitive.h
View File

@ -14,6 +14,8 @@
#include "eggTexture.h"
#include "eggMaterial.h"
#include "eggRenderMode.h"
#include "pt_EggTexture.h"
#include "pt_EggMaterial.h"
#include "vector_PT_EggVertex.h"
#include <pointerTo.h>
@ -152,8 +154,8 @@ protected:
private:
PT(EggTexture) _texture;
PT(EggMaterial) _material;
PT_EggTexture _texture;
PT_EggMaterial _material;
bool _bface;
public:

3
panda/src/egg/eggUtilities.h
View File

@ -18,6 +18,7 @@
#include <pandabase.h>
#include "eggTexture.h"
#include "pt_EggTexture.h"
#include <filename.h>
#include <pointerTo.h>
@ -28,7 +29,7 @@
class EggNode;
class EggVertex;
typedef set< PT(EggTexture) > EggTextures;
typedef set< PT_EggTexture > EggTextures;
typedef map<Filename, EggTextures> EggTextureFilenames;

15
panda/src/egg/parser.yxx
View File

@ -26,6 +26,8 @@
#include "eggCoordinateSystem.h"
#include "eggExternalReference.h"
#include "eggData.h"
#include "pt_EggTexture.h"
#include "pt_EggMaterial.h"
#include <string_utils.h>
#include <filename.h>
@ -52,24 +54,21 @@ typedef vector< PT(EggObject) > EggStack;
static EggStack egg_stack;
// There's one "top-level" egg node, which is where we should parent
// things (e.g. textures) encountered in the egg file that don't have
// an explicit place in the tree. If this is NULL, such things won't
// be parented anywhere.
// things (e.g. implicit textures) encountered in the egg file that
// don't have an explicit place in the tree. If this is NULL, such
// things won't be parented anywhere.
static EggGroupNode *egg_top_node;
// We need a table mapping vertex pool names to vertex pools.
typedef map<string, PT(EggVertexPool) > VertexPools;
static VertexPools vertex_pools;
// And another one mapping texture names to textures.
typedef map<string, PT(EggTexture) > Textures;
typedef map<string, PT_EggTexture > Textures;
static Textures textures;
// And again for material names to materials.
typedef map<string, PT(EggMaterial) > Materials;
typedef map<string, PT_EggMaterial > Materials;
static Materials materials;
// We need to be able to save the index number requested for a vertex