From 31fd59476a472e6a587afbe89f6c26e14084d195 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 7 Apr 2010 22:02:31 +0000 Subject: [PATCH] migrate UvScrollNode -> pgraphnodes --- panda/src/pgraph/Sources.pp | 3 --- panda/src/pgraph/config_pgraph.cxx | 3 --- panda/src/pgraphnodes/Sources.pp | 9 ++++++--- panda/src/pgraphnodes/config_pgraphnodes.cxx | 3 +++ panda/src/{pgraph => pgraphnodes}/uvScrollNode.I | 0 panda/src/{pgraph => pgraphnodes}/uvScrollNode.cxx | 0 panda/src/{pgraph => pgraphnodes}/uvScrollNode.h | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename panda/src/{pgraph => pgraphnodes}/uvScrollNode.I (100%) mode change 100755 => 100644 rename panda/src/{pgraph => pgraphnodes}/uvScrollNode.cxx (100%) mode change 100755 => 100644 rename panda/src/{pgraph => pgraphnodes}/uvScrollNode.h (100%) mode change 100755 => 100644 diff --git a/panda/src/pgraph/Sources.pp b/panda/src/pgraph/Sources.pp index 22ee16a268..acea31e1ee 100644 --- a/panda/src/pgraph/Sources.pp +++ b/panda/src/pgraph/Sources.pp @@ -106,7 +106,6 @@ textureStageCollection.I textureStageCollection.h \ transformState.I transformState.h \ transparencyAttrib.I transparencyAttrib.h \ - uvScrollNode.I uvScrollNode.h \ weakNodePath.I weakNodePath.h \ workingNodePath.I workingNodePath.h @@ -204,7 +203,6 @@ textureStageCollection.cxx \ transformState.cxx \ transparencyAttrib.cxx \ - uvScrollNode.cxx \ weakNodePath.cxx \ workingNodePath.cxx @@ -300,7 +298,6 @@ textureStageCollection.I textureStageCollection.h \ transformState.I transformState.h \ transparencyAttrib.I transparencyAttrib.h \ - uvScrollNode.I uvScrollNode.h \ weakNodePath.I weakNodePath.h \ workingNodePath.I workingNodePath.h diff --git a/panda/src/pgraph/config_pgraph.cxx b/panda/src/pgraph/config_pgraph.cxx index 52e9b86481..f1330a5a3b 100644 --- a/panda/src/pgraph/config_pgraph.cxx +++ b/panda/src/pgraph/config_pgraph.cxx @@ -86,7 +86,6 @@ #include "transformState.h" #include "transparencyAttrib.h" #include "nodePathLerps.h" -#include "uvScrollNode.h" #include "dconfig.h" @@ -484,7 +483,6 @@ init_libpgraph() { PosHprScaleLerpFunctor::init_type(); ColorLerpFunctor::init_type(); ColorScaleLerpFunctor::init_type(); - UvScrollNode::init_type(); AlphaTestAttrib::register_with_read_factory(); AntialiasAttrib::register_with_read_factory(); @@ -534,7 +532,6 @@ init_libpgraph() { TexGenAttrib::register_with_read_factory(); TransformState::register_with_read_factory(); TransparencyAttrib::register_with_read_factory(); - UvScrollNode::register_with_read_factory(); // By initializing the _states map up front, we also guarantee that // the _states_lock mutex gets created before we spawn any threads diff --git a/panda/src/pgraphnodes/Sources.pp b/panda/src/pgraphnodes/Sources.pp index 2598b89d3c..893fec66db 100644 --- a/panda/src/pgraphnodes/Sources.pp +++ b/panda/src/pgraphnodes/Sources.pp @@ -27,7 +27,8 @@ sequenceNode.h sequenceNode.I \ shaderGenerator.h shaderGenerator.I \ spotlight.h spotlight.I \ - switchNode.h switchNode.I + switchNode.h switchNode.I \ + uvScrollNode.I uvScrollNode.h #define INCLUDED_SOURCES \ ambientLight.cxx \ @@ -45,7 +46,8 @@ sequenceNode.cxx \ shaderGenerator.cxx \ spotlight.cxx \ - switchNode.cxx + switchNode.cxx \ + uvScrollNode.cxx #define INSTALL_HEADERS \ ambientLight.h ambientLight.I \ @@ -63,7 +65,8 @@ sequenceNode.h sequenceNode.I \ shaderGenerator.h shaderGenerator.I \ spotlight.h spotlight.I \ - switchNode.h switchNode.I + switchNode.h switchNode.I \ + uvScrollNode.I uvScrollNode.h #define IGATESCAN all diff --git a/panda/src/pgraphnodes/config_pgraphnodes.cxx b/panda/src/pgraphnodes/config_pgraphnodes.cxx index 9bf7c9e454..8da8717a97 100644 --- a/panda/src/pgraphnodes/config_pgraphnodes.cxx +++ b/panda/src/pgraphnodes/config_pgraphnodes.cxx @@ -31,6 +31,7 @@ #include "shaderGenerator.h" #include "spotlight.h" #include "switchNode.h" +#include "uvScrollNode.h" #include "dconfig.h" @@ -90,6 +91,7 @@ init_libpgraphnodes() { ShaderGenerator::init_type(); Spotlight::init_type(); SwitchNode::init_type(); + UvScrollNode::init_type(); AmbientLight::register_with_read_factory(); CallbackNode::register_with_read_factory(); @@ -103,4 +105,5 @@ init_libpgraphnodes() { SequenceNode::register_with_read_factory(); Spotlight::register_with_read_factory(); SwitchNode::register_with_read_factory(); + UvScrollNode::register_with_read_factory(); } diff --git a/panda/src/pgraph/uvScrollNode.I b/panda/src/pgraphnodes/uvScrollNode.I old mode 100755 new mode 100644 similarity index 100% rename from panda/src/pgraph/uvScrollNode.I rename to panda/src/pgraphnodes/uvScrollNode.I diff --git a/panda/src/pgraph/uvScrollNode.cxx b/panda/src/pgraphnodes/uvScrollNode.cxx old mode 100755 new mode 100644 similarity index 100% rename from panda/src/pgraph/uvScrollNode.cxx rename to panda/src/pgraphnodes/uvScrollNode.cxx diff --git a/panda/src/pgraph/uvScrollNode.h b/panda/src/pgraphnodes/uvScrollNode.h old mode 100755 new mode 100644 similarity index 100% rename from panda/src/pgraph/uvScrollNode.h rename to panda/src/pgraphnodes/uvScrollNode.h