Skip to content

Commit 4eba3be

Browse files
drwrosedrwrose
committed
completely remove NodeAttribute etc.
1 parent 23e26ae commit 4eba3be

File tree

330 files changed

+863
-13925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

330 files changed

+863
-13925
lines changed

‎panda/src/builder/test_builder.cxx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <traverserVisitor.h>
2929
#include <renderRelation.h>
3030
#include <nullTransitionWrapper.h>
31-
#include <nullAttributeWrapper.h>
3231
#include <nullLevelState.h>
3332
#include <pta_Vertexf.h>
3433
#include <pta_Normalf.h>
@@ -48,11 +47,11 @@ extern int num_polys;
4847
class ReportGeoms :
4948
public TraverserVisitor<NullTransitionWrapper, NullLevelState> {
5049
public:
51-
bool reached_node(Node *node, const NullAttributeWrapper &, NullLevelState &);
50+
bool reached_node(Node *node, const NullTransitionWrapper &, NullLevelState &);
5251
};
5352

5453
bool ReportGeoms::
55-
reached_node(Node *node, const NullAttributeWrapper &, NullLevelState &) {
54+
reached_node(Node *node, const NullTransitionWrapper &, NullLevelState &) {
5655
if (node->is_of_type(GeomNode::get_class_type())) {
5756
GeomNode *geomNode = (GeomNode *)node;
5857
nout << "\n" << *geomNode << ", " << geomNode->get_num_geoms()
@@ -107,11 +106,11 @@ main(void) {
107106
nout << "Built " << (void *)gn << "\n";
108107
if (gn != NULL) {
109108
NullLevelState level_state;
110-
rg.reached_node(gn, NullAttributeWrapper(), level_state);
109+
rg.reached_node(gn, NullTransitionWrapper(), level_state);
111110
}
112111

113112
nout << "\nTraversing root:\n";
114-
df_traverse(root, rg, NullAttributeWrapper(), NullLevelState(),
113+
df_traverse(root, rg, NullTransitionWrapper(), NullLevelState(),
115114
RenderRelation::get_class_type());
116115

117116
#else

‎panda/src/chat/chatInput.cxx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
////////////////////////////////////////////////////////////////////
1818

1919
#include "chatInput.h"
20-
#include <buttonEventDataTransition.h>
21-
#include <buttonEventDataAttribute.h>
22-
#include <buttonEvent.h>
23-
#include <keyboardButton.h>
24-
#include <throw_event.h>
20+
21+
#include "buttonEventDataTransition.h"
22+
#include "buttonEvent.h"
23+
#include "keyboardButton.h"
24+
#include "throw_event.h"
2525

2626
////////////////////////////////////////////////////////////////////
2727
// Static variables
@@ -63,11 +63,11 @@ reset() {
6363
// Description:
6464
////////////////////////////////////////////////////////////////////
6565
void ChatInput::
66-
transmit_data(NodeAttributes &data) {
66+
transmit_data(AllTransitionsWrapper &data) {
6767
// Look for keyboard events.
68-
const ButtonEventDataAttribute *b;
69-
if (get_attribute_into(b, data, _button_events_type)) {
70-
ButtonEventDataAttribute::const_iterator bi;
68+
const ButtonEventDataTransition *b;
69+
if (get_transition_into(b, data, _button_events_type)) {
70+
ButtonEventDataTransition::const_iterator bi;
7171
for (bi = b->begin(); bi != b->end(); ++bi) {
7272
const ButtonEvent &be = (*bi);
7373

‎panda/src/chat/chatInput.h‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,16 @@
1515
// panda3d@yahoogroups.com .
1616
//
1717
////////////////////////////////////////////////////////////////////
18+
1819
#ifndef CHATINPUT_H
1920
#define CHATINPUT_H
20-
//
21-
////////////////////////////////////////////////////////////////////
22-
// Includes
23-
////////////////////////////////////////////////////////////////////
24-
#include <pandabase.h>
2521

26-
#include <dataNode.h>
27-
#include <pointerTo.h>
28-
#include <textNode.h>
29-
#include <nodeAttributes.h>
22+
#include "pandabase.h"
3023

31-
////////////////////////////////////////////////////////////////////
32-
// Defines
33-
////////////////////////////////////////////////////////////////////
24+
#include "dataNode.h"
25+
#include "pointerTo.h"
26+
#include "textNode.h"
27+
#include "allTransitionsWrapper.h"
3428

3529
////////////////////////////////////////////////////////////////////
3630
// Class : ChatInput
@@ -66,8 +60,8 @@ class EXPCL_PANDA ChatInput : public DataNode {
6660
////////////////////////////////////////////////////////////////////
6761
public:
6862
virtual void
69-
transmit_data(NodeAttributes &data);
70-
NodeAttributes _attrib;
63+
transmit_data(AllTransitionsWrapper &data);
64+
AllTransitionsWrapper _attrib;
7165
// inputs
7266
static TypeHandle _button_events_type;
7367

‎panda/src/cull/Sources.pp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
cullStateLookup.h cullStateSubtree.I cullStateSubtree.h \
1515
cullTraverser.I cullTraverser.h directRenderTransition.I \
1616
directRenderTransition.h geomBin.I geomBin.h \
17-
geomBinAttribute.I geomBinAttribute.N geomBinAttribute.h \
1817
geomBinBackToFront.I geomBinBackToFront.h geomBinFixed.I \
1918
geomBinFixed.h geomBinGroup.I geomBinGroup.h geomBinNormal.h \
2019
geomBinTransition.I geomBinTransition.h geomBinUnsorted.I \
@@ -23,7 +22,7 @@
2322
#define INCLUDED_SOURCES \
2423
config_cull.cxx cullState.cxx cullStateLookup.cxx \
2524
cullStateSubtree.cxx cullTraverser.cxx \
26-
directRenderTransition.cxx geomBin.cxx geomBinAttribute.cxx \
25+
directRenderTransition.cxx geomBin.cxx \
2726
geomBinBackToFront.cxx geomBinFixed.cxx geomBinGroup.cxx \
2827
geomBinNormal.cxx geomBinTransition.cxx geomBinUnsorted.cxx
2928

@@ -32,7 +31,7 @@
3231
cullStateLookup.I cullStateLookup.h cullStateSubtree.I \
3332
cullStateSubtree.h cullTraverser.I cullTraverser.h \
3433
directRenderTransition.I directRenderTransition.h geomBin.I \
35-
geomBin.h geomBinAttribute.I geomBinAttribute.h \
34+
geomBin.h \
3635
geomBinBackToFront.I geomBinBackToFront.h geomBinFixed.I \
3736
geomBinFixed.h geomBinGroup.I geomBinGroup.h geomBinNormal.h \
3837
geomBinTransition.I geomBinTransition.h geomBinUnsorted.I \

‎panda/src/cull/config_cull.cxx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "geomBinGroup.h"
2626
#include "geomBinNormal.h"
2727
#include "geomBinTransition.h"
28-
#include "geomBinAttribute.h"
2928
#include "geomBinFixed.h"
3029
#include "directRenderTransition.h"
3130

@@ -42,7 +41,6 @@ ConfigureFn(config_cull) {
4241
GeomBinGroup::init_type();
4342
GeomBinNormal::init_type();
4443
GeomBinTransition::init_type();
45-
GeomBinAttribute::init_type();
4644
GeomBinFixed::init_type();
4745
DirectRenderTransition::init_type();
4846

‎panda/src/cull/cullState.cxx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include <indent.h>
2424
#include <graphicsStateGuardian.h>
2525

26-
#include <allAttributesWrapper.h>
27-
2826
////////////////////////////////////////////////////////////////////
2927
// Function: CullState::check_currency
3028
// Access: Public

‎panda/src/cull/cullTraverser.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include "cullTraverser.h"
2121
#include "geomBinTransition.h"
22-
#include "geomBinAttribute.h"
2322
#include "cullStateSubtree.h"
2423
#include "geomBinNormal.h"
2524
#include "geomBinFixed.h"

‎panda/src/cull/cull_composite2.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

22
#include "geomBin.cxx"
3-
#include "geomBinAttribute.cxx"
43
#include "geomBinBackToFront.cxx"
54
#include "geomBinFixed.cxx"
65
#include "geomBinGroup.cxx"

‎panda/src/cull/cull_headers.h‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎panda/src/cull/directRenderTransition.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ class EXPCL_PANDA DirectRenderTransition : public ImmediateTransition {
6767

6868
private:
6969
static TypeHandle _type_handle;
70-
friend class DirectRenderAttribute;
7170
};
7271

7372
#include "directRenderTransition.I"

0 commit comments

Comments
 (0)