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

texGenAttrib.cxx hardcoded texture corrected

Browse Source
This commit is contained in:
Shalin Shodhan 2004-07-02 17:02:27 +00:00
parent 836cc8224d
commit e0245577d8
4 changed files with 308 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/pgraph/Sources.pp
View File

@ -78,6 +78,7 @@
renderEffects.I renderEffects.h \ renderEffects.I renderEffects.h \
renderModeAttrib.I renderModeAttrib.h \ renderModeAttrib.I renderModeAttrib.h \
renderState.I renderState.h \ renderState.I renderState.h \
seaPatchNode.I seaPatchNode.h \
sceneGraphAnalyzer.h \ sceneGraphAnalyzer.h \
sceneGraphReducer.I sceneGraphReducer.h \ sceneGraphReducer.I sceneGraphReducer.h \
sceneSetup.I sceneSetup.h \ sceneSetup.I sceneSetup.h \
@ -167,6 +168,7 @@
renderEffects.cxx \ renderEffects.cxx \
renderModeAttrib.cxx \ renderModeAttrib.cxx \
renderState.cxx \ renderState.cxx \
seaPatchNode.cxx \
sceneGraphAnalyzer.cxx \ sceneGraphAnalyzer.cxx \
sceneGraphReducer.cxx \ sceneGraphReducer.cxx \
sceneSetup.cxx \ sceneSetup.cxx \
@ -253,6 +255,7 @@
renderEffects.I renderEffects.h \ renderEffects.I renderEffects.h \
renderModeAttrib.I renderModeAttrib.h \ renderModeAttrib.I renderModeAttrib.h \
renderState.I renderState.h \ renderState.I renderState.h \
seaPatchNode.I seaPatchNode.h \
sceneGraphAnalyzer.h \ sceneGraphAnalyzer.h \
sceneGraphReducer.I sceneGraphReducer.h \ sceneGraphReducer.I sceneGraphReducer.h \
sceneSetup.I sceneSetup.h \ sceneSetup.I sceneSetup.h \

4
panda/src/pgraph/config_pgraph.cxx
View File

@ -72,8 +72,10 @@
#include "renderEffects.h" #include "renderEffects.h"
#include "renderModeAttrib.h" #include "renderModeAttrib.h"
#include "renderState.h" #include "renderState.h"
#include "seaPatchNode.h"
#include "selectiveChildNode.h" #include "selectiveChildNode.h"
#include "sequenceNode.h" #include "sequenceNode.h"
//#include "shaderNode.h"
#include "showBoundsEffect.h" #include "showBoundsEffect.h"
#include "spotlight.h" #include "spotlight.h"
#include "switchNode.h" #include "switchNode.h"
@ -224,8 +226,10 @@ init_libpgraph() {
RenderEffects::init_type(); RenderEffects::init_type();
RenderModeAttrib::init_type(); RenderModeAttrib::init_type();
RenderState::init_type(); RenderState::init_type();
SeaPatchNode::init_type();
SelectiveChildNode::init_type(); SelectiveChildNode::init_type();
SequenceNode::init_type(); SequenceNode::init_type();
// ShaderNode::init_type();
ShowBoundsEffect::init_type(); ShowBoundsEffect::init_type();
Spotlight::init_type(); Spotlight::init_type();
SwitchNode::init_type(); SwitchNode::init_type();

2
panda/src/pgraph/pgraph_composite2.cxx
View File

@ -27,10 +27,12 @@
#include "renderEffects.cxx" #include "renderEffects.cxx"
#include "renderModeAttrib.cxx" #include "renderModeAttrib.cxx"
#include "renderState.cxx" #include "renderState.cxx"
#include "seaPatchNode.cxx"
#include "sceneGraphAnalyzer.cxx" #include "sceneGraphAnalyzer.cxx"
#include "sceneGraphReducer.cxx" #include "sceneGraphReducer.cxx"
#include "selectiveChildNode.cxx" #include "selectiveChildNode.cxx"
#include "sequenceNode.cxx" #include "sequenceNode.cxx"
//#include "shaderNode.cxx"
#include "showBoundsEffect.cxx" #include "showBoundsEffect.cxx"
#include "spotlight.cxx" #include "spotlight.cxx"
#include "switchNode.cxx" #include "switchNode.cxx"

2
panda/src/pgraph/texGenAttrib.cxx
View File

@ -35,11 +35,13 @@ TypeHandle TexGenAttrib::_type_handle;
CPT(RenderAttrib) TexGenAttrib:: CPT(RenderAttrib) TexGenAttrib::
make(Mode mode) { make(Mode mode) {
TexGenAttrib *attrib = new TexGenAttrib(mode); TexGenAttrib *attrib = new TexGenAttrib(mode);
#if 0
attrib->_texture = TexturePool::load_texture("/usr/masad/player/pmockup/maps/moon-card.rgb", 1); attrib->_texture = TexturePool::load_texture("/usr/masad/player/pmockup/maps/moon-card.rgb", 1);
if (attrib->_texture) if (attrib->_texture)
pgraph_cat.debug() << *(attrib->_texture) << endl; pgraph_cat.debug() << *(attrib->_texture) << endl;
else else
return (TexGenAttrib *)NULL; return (TexGenAttrib *)NULL;
#endif
return return_new(attrib); return return_new(attrib);
} }