Browse Source

texGenAttrib.cxx hardcoded texture corrected

Shalin Shodhan 21 years ago
parent
commit
e0245577d8

+ 300 - 297
panda/src/pgraph/Sources.pp

@@ -1,297 +1,300 @@
-#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
-                   dtoolutil:c dtoolbase:c dtool:m
-#define LOCAL_LIBS \
-    lerp event gsgbase gobj putil linmath \
-    downloader express pandabase pstatclient
-
-#begin lib_target
-  #define TARGET pgraph
-  
-  #define SOURCES \
-    accumulatedAttribs.I accumulatedAttribs.h \
-    alphaTestAttrib.I alphaTestAttrib.h \  
-    ambientLight.I ambientLight.h \
-    bamFile.I bamFile.h \
-    billboardEffect.I billboardEffect.h \
-    binCullHandler.I binCullHandler.h \
-    camera.I camera.h \
-    clipPlaneAttrib.I clipPlaneAttrib.h \
-    colorAttrib.I colorAttrib.h \
-    colorBlendAttrib.I colorBlendAttrib.h \
-    colorScaleAttrib.I colorScaleAttrib.h \
-    colorWriteAttrib.I colorWriteAttrib.h \
-    compassEffect.I compassEffect.h \
-    config_pgraph.h \
-    cullBin.I cullBin.h \
-    cullBinAttrib.I cullBinAttrib.h \
-    cullBinBackToFront.I cullBinBackToFront.h \
-    cullBinFixed.I cullBinFixed.h \
-    cullBinFrontToBack.I cullBinFrontToBack.h \
-    cullBinManager.I cullBinManager.h \
-    cullBinUnsorted.I cullBinUnsorted.h \
-    cullFaceAttrib.I cullFaceAttrib.h \
-    cullHandler.I cullHandler.h \
-    cullResult.I cullResult.h \
-    cullTraverser.I cullTraverser.h \
-    cullTraverserData.I cullTraverserData.h \
-    cullableObject.I cullableObject.h \
-    decalEffect.I decalEffect.h \
-    depthOffsetAttrib.I depthOffsetAttrib.h \
-    depthTestAttrib.I depthTestAttrib.h \
-    depthWriteAttrib.I depthWriteAttrib.h \
-    directionalLight.I directionalLight.h \
-    drawCullHandler.I drawCullHandler.h \
-    fadeLodNode.I fadeLodNode.h \
-    findApproxLevelEntry.I findApproxLevelEntry.h \
-    findApproxPath.I findApproxPath.h \
-    fog.I fog.h \
-    fogAttrib.I fogAttrib.h \
-    geomNode.I geomNode.h \
-    geomTransformer.I geomTransformer.h \
-    lensNode.I lensNode.h \
-    light.I light.h \
-    lightAttrib.I lightAttrib.h \
-    lightLensNode.I lightLensNode.h \
-    lightNode.I lightNode.h \
-    loader.I loader.h  \
-    loaderFileType.h \
-    loaderFileTypeBam.h  \
-    loaderFileTypeRegistry.h \
-    lodNode.I lodNode.h \
-    materialAttrib.I materialAttrib.h \
-    modelNode.I modelNode.h \
-    modelPool.I modelPool.h \
-    modelRoot.I modelRoot.h \
-    nodePath.I nodePath.h nodePath.cxx \
-    nodePathCollection.I nodePathCollection.h \
-    nodePathComponent.I nodePathComponent.h \
-    nodePathLerps.h \
-    pandaNode.I pandaNode.h \
-    planeNode.I planeNode.h \
-    pointLight.I pointLight.h \
-    polylightNode.I polylightNode.h \
-    polylightEffect.I polylightEffect.h \
-    portalNode.I portalNode.h \
-    portalClipper.I portalClipper.h \
-    renderAttrib.I renderAttrib.h \
-    renderEffect.I renderEffect.h \
-    renderEffects.I renderEffects.h \
-    renderModeAttrib.I renderModeAttrib.h \
-    renderState.I renderState.h \
-    sceneGraphAnalyzer.h \
-    sceneGraphReducer.I sceneGraphReducer.h \
-    sceneSetup.I sceneSetup.h \
-    selectiveChildNode.I selectiveChildNode.h \
-    sequenceNode.I sequenceNode.h \
-    showBoundsEffect.I showBoundsEffect.h \
-    spotlight.I spotlight.h \
-    switchNode.I switchNode.h \
-    texMatrixAttrib.I texMatrixAttrib.h \
-    textureApplyAttrib.I textureApplyAttrib.h \
-    textureAttrib.I textureAttrib.h \
-    texGenAttrib.I texGenAttrib.h \
-    textureCollection.I textureCollection.h \
-    transformState.I transformState.h \
-    transparencyAttrib.I transparencyAttrib.h \
-    workingNodePath.I workingNodePath.h
-
-  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx
-  #define INCLUDED_SOURCES \
-    accumulatedAttribs.cxx \
-    alphaTestAttrib.cxx \  
-    ambientLight.cxx \
-    bamFile.cxx \
-    billboardEffect.cxx \
-    binCullHandler.cxx \
-    camera.cxx \
-    clipPlaneAttrib.cxx \
-    colorAttrib.cxx \
-    colorBlendAttrib.cxx \
-    colorScaleAttrib.cxx \
-    colorWriteAttrib.cxx \
-    compassEffect.cxx \
-    config_pgraph.cxx \
-    cullBin.cxx \
-    cullBinAttrib.cxx \
-    cullBinBackToFront.cxx \
-    cullBinFixed.cxx \
-    cullBinFrontToBack.cxx \
-    cullBinManager.cxx \
-    cullBinUnsorted.cxx \
-    cullFaceAttrib.cxx \
-    cullHandler.cxx \
-    cullResult.cxx \
-    cullTraverser.cxx \
-    cullTraverserData.cxx \
-    cullableObject.cxx \
-    decalEffect.cxx \
-    depthOffsetAttrib.cxx \
-    depthTestAttrib.cxx \
-    depthWriteAttrib.cxx \
-    directionalLight.cxx \
-    drawCullHandler.cxx \
-    fadeLodNode.cxx \
-    findApproxLevelEntry.cxx \
-    findApproxPath.cxx \
-    fog.cxx \
-    fogAttrib.cxx \
-    geomNode.cxx \
-    geomTransformer.cxx \
-    lensNode.cxx \
-    light.cxx \
-    lightAttrib.cxx \
-    lightLensNode.cxx \
-    lightNode.cxx \
-    loader.cxx \
-    loaderFileType.cxx  \
-    loaderFileTypeBam.cxx \
-    loaderFileTypeRegistry.cxx  \
-    lodNode.cxx \
-    materialAttrib.cxx \
-    modelNode.cxx \
-    modelPool.cxx \
-    modelRoot.cxx \
-    nodePath.cxx \
-    nodePathCollection.cxx \
-    nodePathComponent.cxx \
-    nodePathLerps.cxx \
-    pandaNode.cxx \
-    planeNode.cxx \
-    pointLight.cxx \
-    polylightNode.cxx \
-    polylightEffect.cxx \
-    portalNode.cxx \
-    portalClipper.cxx \
-    renderAttrib.cxx \
-    renderEffect.cxx \
-    renderEffects.cxx \
-    renderModeAttrib.cxx \
-    renderState.cxx \
-    sceneGraphAnalyzer.cxx \
-    sceneGraphReducer.cxx \
-    sceneSetup.cxx \
-    selectiveChildNode.cxx \
-    sequenceNode.cxx \
-    showBoundsEffect.cxx \
-    spotlight.cxx \
-    switchNode.cxx \
-    texMatrixAttrib.cxx \
-    textureApplyAttrib.cxx \
-    textureAttrib.cxx \
-    texGenAttrib.cxx \
-    textureCollection.cxx \
-    transformState.cxx \
-    transparencyAttrib.cxx \
-    workingNodePath.cxx
-
-  #define INSTALL_HEADERS \
-    accumulatedAttribs.I accumulatedAttribs.h \
-    alphaTestAttrib.I alphaTestAttrib.h \  
-    ambientLight.I ambientLight.h \
-    bamFile.I bamFile.h \
-    billboardEffect.I billboardEffect.h \
-    binCullHandler.I binCullHandler.h \
-    camera.I camera.h \
-    clipPlaneAttrib.I clipPlaneAttrib.h \
-    colorAttrib.I colorAttrib.h \
-    colorBlendAttrib.I colorBlendAttrib.h \
-    colorScaleAttrib.I colorScaleAttrib.h \
-    colorWriteAttrib.I colorWriteAttrib.h \
-    compassEffect.I compassEffect.h \
-    config_pgraph.h \
-    cullBin.I cullBin.h \
-    cullBinAttrib.I cullBinAttrib.h \
-    cullBinBackToFront.I cullBinBackToFront.h \
-    cullBinFixed.I cullBinFixed.h \
-    cullBinFrontToBack.I cullBinFrontToBack.h \
-    cullBinManager.I cullBinManager.h \
-    cullBinUnsorted.I cullBinUnsorted.h \
-    cullFaceAttrib.I cullFaceAttrib.h \
-    cullHandler.I cullHandler.h \
-    cullResult.I cullResult.h \
-    cullTraverser.I cullTraverser.h \
-    cullTraverserData.I cullTraverserData.h \
-    cullableObject.I cullableObject.h \
-    decalEffect.I decalEffect.h \
-    depthOffsetAttrib.I depthOffsetAttrib.h \
-    depthTestAttrib.I depthTestAttrib.h \
-    depthWriteAttrib.I depthWriteAttrib.h \
-    directionalLight.I directionalLight.h \
-    drawCullHandler.I drawCullHandler.h \
-    fadeLodNode.I fadeLodNode.h \
-    fog.I fog.h \
-    fogAttrib.I fogAttrib.h \
-    geomNode.I geomNode.h \
-    geomTransformer.I geomTransformer.h \
-    lensNode.I lensNode.h \
-    light.I light.h \
-    lightAttrib.I lightAttrib.h \
-    lightLensNode.I lightLensNode.h \
-    lightNode.I lightNode.h \
-    loader.I loader.h \
-    loaderFileType.h \
-    loaderFileTypeBam.h \
-    loaderFileTypeRegistry.h \
-    lodNode.I lodNode.h \
-    materialAttrib.I materialAttrib.h \
-    modelNode.I modelNode.h \
-    modelPool.I modelPool.h \
-    modelRoot.I modelRoot.h \
-    nodePath.I nodePath.h \
-    nodePathCollection.I nodePathCollection.h \
-    nodePathComponent.I nodePathComponent.h \
-    nodePathLerps.h \
-    pandaNode.I pandaNode.h \
-    planeNode.I planeNode.h \
-    pointLight.I pointLight.h \
-    polylightNode.I polylightNode.h \
-    polylightEffect.I polylightEffect.h \
-    portalNode.I portalNode.h \
-    portalClipper.I portalClipper.h \
-    renderAttrib.I renderAttrib.h \
-    renderEffect.I renderEffect.h \
-    renderEffects.I renderEffects.h \
-    renderModeAttrib.I renderModeAttrib.h \
-    renderState.I renderState.h \
-    sceneGraphAnalyzer.h \
-    sceneGraphReducer.I sceneGraphReducer.h \
-    sceneSetup.I sceneSetup.h \
-    selectiveChildNode.I selectiveChildNode.h \
-    sequenceNode.I sequenceNode.h \
-    showBoundsEffect.I showBoundsEffect.h \
-    spotlight.I spotlight.h \
-    switchNode.I switchNode.h \
-    texMatrixAttrib.I texMatrixAttrib.h \
-    textureApplyAttrib.I textureApplyAttrib.h \
-    textureAttrib.I textureAttrib.h \
-    texGenAttrib.I texGenAttrib.h \
-    textureCollection.I textureCollection.h \
-    transformState.I transformState.h \
-    transparencyAttrib.I transparencyAttrib.h \
-    workingNodePath.I workingNodePath.h
-
-// No need to install these.
-//    findApproxLevelEntry.I findApproxLevelEntry.h \
-//    findApproxPath.I findApproxPath.h \
-
-  #define IGATESCAN all
-
-// Uncomment these lines to compile everything individually instead of
-// combining into pgraph_composite*.cxx.
-
-//  #define COMBINED_SOURCES
-//  #define SOURCES $[SOURCES] $[INCLUDED_SOURCES]
-
-#end lib_target
-
-
-#begin test_bin_target
-  #define TARGET test_pgraph
-
-  #define SOURCES \
-    test_pgraph.cxx
-
-  #define LOCAL_LIBS $[LOCAL_LIBS] pgraph
-  #define OTHER_LIBS $[OTHER_LIBS] pystub
-
-#end test_bin_target
+#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
+                   dtoolutil:c dtoolbase:c dtool:m
+#define LOCAL_LIBS \
+    lerp event gsgbase gobj putil linmath \
+    downloader express pandabase pstatclient
+
+#begin lib_target
+  #define TARGET pgraph
+  
+  #define SOURCES \
+    accumulatedAttribs.I accumulatedAttribs.h \
+    alphaTestAttrib.I alphaTestAttrib.h \  
+    ambientLight.I ambientLight.h \
+    bamFile.I bamFile.h \
+    billboardEffect.I billboardEffect.h \
+    binCullHandler.I binCullHandler.h \
+    camera.I camera.h \
+    clipPlaneAttrib.I clipPlaneAttrib.h \
+    colorAttrib.I colorAttrib.h \
+    colorBlendAttrib.I colorBlendAttrib.h \
+    colorScaleAttrib.I colorScaleAttrib.h \
+    colorWriteAttrib.I colorWriteAttrib.h \
+    compassEffect.I compassEffect.h \
+    config_pgraph.h \
+    cullBin.I cullBin.h \
+    cullBinAttrib.I cullBinAttrib.h \
+    cullBinBackToFront.I cullBinBackToFront.h \
+    cullBinFixed.I cullBinFixed.h \
+    cullBinFrontToBack.I cullBinFrontToBack.h \
+    cullBinManager.I cullBinManager.h \
+    cullBinUnsorted.I cullBinUnsorted.h \
+    cullFaceAttrib.I cullFaceAttrib.h \
+    cullHandler.I cullHandler.h \
+    cullResult.I cullResult.h \
+    cullTraverser.I cullTraverser.h \
+    cullTraverserData.I cullTraverserData.h \
+    cullableObject.I cullableObject.h \
+    decalEffect.I decalEffect.h \
+    depthOffsetAttrib.I depthOffsetAttrib.h \
+    depthTestAttrib.I depthTestAttrib.h \
+    depthWriteAttrib.I depthWriteAttrib.h \
+    directionalLight.I directionalLight.h \
+    drawCullHandler.I drawCullHandler.h \
+    fadeLodNode.I fadeLodNode.h \
+    findApproxLevelEntry.I findApproxLevelEntry.h \
+    findApproxPath.I findApproxPath.h \
+    fog.I fog.h \
+    fogAttrib.I fogAttrib.h \
+    geomNode.I geomNode.h \
+    geomTransformer.I geomTransformer.h \
+    lensNode.I lensNode.h \
+    light.I light.h \
+    lightAttrib.I lightAttrib.h \
+    lightLensNode.I lightLensNode.h \
+    lightNode.I lightNode.h \
+    loader.I loader.h  \
+    loaderFileType.h \
+    loaderFileTypeBam.h  \
+    loaderFileTypeRegistry.h \
+    lodNode.I lodNode.h \
+    materialAttrib.I materialAttrib.h \
+    modelNode.I modelNode.h \
+    modelPool.I modelPool.h \
+    modelRoot.I modelRoot.h \
+    nodePath.I nodePath.h nodePath.cxx \
+    nodePathCollection.I nodePathCollection.h \
+    nodePathComponent.I nodePathComponent.h \
+    nodePathLerps.h \
+    pandaNode.I pandaNode.h \
+    planeNode.I planeNode.h \
+    pointLight.I pointLight.h \
+    polylightNode.I polylightNode.h \
+    polylightEffect.I polylightEffect.h \
+    portalNode.I portalNode.h \
+    portalClipper.I portalClipper.h \
+    renderAttrib.I renderAttrib.h \
+    renderEffect.I renderEffect.h \
+    renderEffects.I renderEffects.h \
+    renderModeAttrib.I renderModeAttrib.h \
+    renderState.I renderState.h \
+    seaPatchNode.I seaPatchNode.h \
+    sceneGraphAnalyzer.h \
+    sceneGraphReducer.I sceneGraphReducer.h \
+    sceneSetup.I sceneSetup.h \
+    selectiveChildNode.I selectiveChildNode.h \
+    sequenceNode.I sequenceNode.h \
+    showBoundsEffect.I showBoundsEffect.h \
+    spotlight.I spotlight.h \
+    switchNode.I switchNode.h \
+    texMatrixAttrib.I texMatrixAttrib.h \
+    textureApplyAttrib.I textureApplyAttrib.h \
+    textureAttrib.I textureAttrib.h \
+    texGenAttrib.I texGenAttrib.h \
+    textureCollection.I textureCollection.h \
+    transformState.I transformState.h \
+    transparencyAttrib.I transparencyAttrib.h \
+    workingNodePath.I workingNodePath.h
+
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx
+  #define INCLUDED_SOURCES \
+    accumulatedAttribs.cxx \
+    alphaTestAttrib.cxx \  
+    ambientLight.cxx \
+    bamFile.cxx \
+    billboardEffect.cxx \
+    binCullHandler.cxx \
+    camera.cxx \
+    clipPlaneAttrib.cxx \
+    colorAttrib.cxx \
+    colorBlendAttrib.cxx \
+    colorScaleAttrib.cxx \
+    colorWriteAttrib.cxx \
+    compassEffect.cxx \
+    config_pgraph.cxx \
+    cullBin.cxx \
+    cullBinAttrib.cxx \
+    cullBinBackToFront.cxx \
+    cullBinFixed.cxx \
+    cullBinFrontToBack.cxx \
+    cullBinManager.cxx \
+    cullBinUnsorted.cxx \
+    cullFaceAttrib.cxx \
+    cullHandler.cxx \
+    cullResult.cxx \
+    cullTraverser.cxx \
+    cullTraverserData.cxx \
+    cullableObject.cxx \
+    decalEffect.cxx \
+    depthOffsetAttrib.cxx \
+    depthTestAttrib.cxx \
+    depthWriteAttrib.cxx \
+    directionalLight.cxx \
+    drawCullHandler.cxx \
+    fadeLodNode.cxx \
+    findApproxLevelEntry.cxx \
+    findApproxPath.cxx \
+    fog.cxx \
+    fogAttrib.cxx \
+    geomNode.cxx \
+    geomTransformer.cxx \
+    lensNode.cxx \
+    light.cxx \
+    lightAttrib.cxx \
+    lightLensNode.cxx \
+    lightNode.cxx \
+    loader.cxx \
+    loaderFileType.cxx  \
+    loaderFileTypeBam.cxx \
+    loaderFileTypeRegistry.cxx  \
+    lodNode.cxx \
+    materialAttrib.cxx \
+    modelNode.cxx \
+    modelPool.cxx \
+    modelRoot.cxx \
+    nodePath.cxx \
+    nodePathCollection.cxx \
+    nodePathComponent.cxx \
+    nodePathLerps.cxx \
+    pandaNode.cxx \
+    planeNode.cxx \
+    pointLight.cxx \
+    polylightNode.cxx \
+    polylightEffect.cxx \
+    portalNode.cxx \
+    portalClipper.cxx \
+    renderAttrib.cxx \
+    renderEffect.cxx \
+    renderEffects.cxx \
+    renderModeAttrib.cxx \
+    renderState.cxx \
+    seaPatchNode.cxx \
+    sceneGraphAnalyzer.cxx \
+    sceneGraphReducer.cxx \
+    sceneSetup.cxx \
+    selectiveChildNode.cxx \
+    sequenceNode.cxx \
+    showBoundsEffect.cxx \
+    spotlight.cxx \
+    switchNode.cxx \
+    texMatrixAttrib.cxx \
+    textureApplyAttrib.cxx \
+    textureAttrib.cxx \
+    texGenAttrib.cxx \
+    textureCollection.cxx \
+    transformState.cxx \
+    transparencyAttrib.cxx \
+    workingNodePath.cxx
+
+  #define INSTALL_HEADERS \
+    accumulatedAttribs.I accumulatedAttribs.h \
+    alphaTestAttrib.I alphaTestAttrib.h \  
+    ambientLight.I ambientLight.h \
+    bamFile.I bamFile.h \
+    billboardEffect.I billboardEffect.h \
+    binCullHandler.I binCullHandler.h \
+    camera.I camera.h \
+    clipPlaneAttrib.I clipPlaneAttrib.h \
+    colorAttrib.I colorAttrib.h \
+    colorBlendAttrib.I colorBlendAttrib.h \
+    colorScaleAttrib.I colorScaleAttrib.h \
+    colorWriteAttrib.I colorWriteAttrib.h \
+    compassEffect.I compassEffect.h \
+    config_pgraph.h \
+    cullBin.I cullBin.h \
+    cullBinAttrib.I cullBinAttrib.h \
+    cullBinBackToFront.I cullBinBackToFront.h \
+    cullBinFixed.I cullBinFixed.h \
+    cullBinFrontToBack.I cullBinFrontToBack.h \
+    cullBinManager.I cullBinManager.h \
+    cullBinUnsorted.I cullBinUnsorted.h \
+    cullFaceAttrib.I cullFaceAttrib.h \
+    cullHandler.I cullHandler.h \
+    cullResult.I cullResult.h \
+    cullTraverser.I cullTraverser.h \
+    cullTraverserData.I cullTraverserData.h \
+    cullableObject.I cullableObject.h \
+    decalEffect.I decalEffect.h \
+    depthOffsetAttrib.I depthOffsetAttrib.h \
+    depthTestAttrib.I depthTestAttrib.h \
+    depthWriteAttrib.I depthWriteAttrib.h \
+    directionalLight.I directionalLight.h \
+    drawCullHandler.I drawCullHandler.h \
+    fadeLodNode.I fadeLodNode.h \
+    fog.I fog.h \
+    fogAttrib.I fogAttrib.h \
+    geomNode.I geomNode.h \
+    geomTransformer.I geomTransformer.h \
+    lensNode.I lensNode.h \
+    light.I light.h \
+    lightAttrib.I lightAttrib.h \
+    lightLensNode.I lightLensNode.h \
+    lightNode.I lightNode.h \
+    loader.I loader.h \
+    loaderFileType.h \
+    loaderFileTypeBam.h \
+    loaderFileTypeRegistry.h \
+    lodNode.I lodNode.h \
+    materialAttrib.I materialAttrib.h \
+    modelNode.I modelNode.h \
+    modelPool.I modelPool.h \
+    modelRoot.I modelRoot.h \
+    nodePath.I nodePath.h \
+    nodePathCollection.I nodePathCollection.h \
+    nodePathComponent.I nodePathComponent.h \
+    nodePathLerps.h \
+    pandaNode.I pandaNode.h \
+    planeNode.I planeNode.h \
+    pointLight.I pointLight.h \
+    polylightNode.I polylightNode.h \
+    polylightEffect.I polylightEffect.h \
+    portalNode.I portalNode.h \
+    portalClipper.I portalClipper.h \
+    renderAttrib.I renderAttrib.h \
+    renderEffect.I renderEffect.h \
+    renderEffects.I renderEffects.h \
+    renderModeAttrib.I renderModeAttrib.h \
+    renderState.I renderState.h \
+    seaPatchNode.I seaPatchNode.h \
+    sceneGraphAnalyzer.h \
+    sceneGraphReducer.I sceneGraphReducer.h \
+    sceneSetup.I sceneSetup.h \
+    selectiveChildNode.I selectiveChildNode.h \
+    sequenceNode.I sequenceNode.h \
+    showBoundsEffect.I showBoundsEffect.h \
+    spotlight.I spotlight.h \
+    switchNode.I switchNode.h \
+    texMatrixAttrib.I texMatrixAttrib.h \
+    textureApplyAttrib.I textureApplyAttrib.h \
+    textureAttrib.I textureAttrib.h \
+    texGenAttrib.I texGenAttrib.h \
+    textureCollection.I textureCollection.h \
+    transformState.I transformState.h \
+    transparencyAttrib.I transparencyAttrib.h \
+    workingNodePath.I workingNodePath.h
+
+// No need to install these.
+//    findApproxLevelEntry.I findApproxLevelEntry.h \
+//    findApproxPath.I findApproxPath.h \
+
+  #define IGATESCAN all
+
+// Uncomment these lines to compile everything individually instead of
+// combining into pgraph_composite*.cxx.
+
+//  #define COMBINED_SOURCES
+//  #define SOURCES $[SOURCES] $[INCLUDED_SOURCES]
+
+#end lib_target
+
+
+#begin test_bin_target
+  #define TARGET test_pgraph
+
+  #define SOURCES \
+    test_pgraph.cxx
+
+  #define LOCAL_LIBS $[LOCAL_LIBS] pgraph
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
+
+#end test_bin_target

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

@@ -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 - 0
panda/src/pgraph/pgraph_composite2.cxx

@@ -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 - 0
panda/src/pgraph/texGenAttrib.cxx

@@ -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);
 }
 }