Changeset 359:44bd3d07db83

Timestamp:

04/09/10 16:40:28 (3 years ago)

Author:

ddangelo

Branch:

default

Convert:

svn:76c98907-0e80-4c83-94c7-b346fc2aefc2/trunk@365

Message:

Bool nodes written in C++. Function to merge the bool fields of two script nodes fixed. Avango node factory declaration moved from init.py to _nodes.py, in order to avoid cyclic references.

Location:

avango-utils

Files:

• include/avango/utils/Bool2And.h (added)
• include/avango/utils/Bool2Or.h (added)
• include/avango/utils/Bool3And.h (added)
• include/avango/utils/Bool3Or.h (added)
• include/avango/utils/SConscript (modified) (1 diff)
• python/SConscript (modified) (1 diff)
• python/__init__.py (modified) (2 diffs)
• python/_bool_script_merge.py (modified) (2 diffs)
• python/_bool_scripts.py (modified) (4 diffs)
• python/_nodes.py (added)
• python/_utils.cpp (modified) (2 diffs)
• src/Bool2And.cpp (added)
• src/Bool2Or.cpp (added)
• src/Bool3And.cpp (added)
• src/Bool3Or.cpp (added)
• src/Init.cpp (modified) (2 diffs)
• src/SConscript (modified) (1 diff)

avango-utils/include/avango/utils/SConscript

@@ -27 +27 @@
 
 headers = Split('''
+    Bool2Or.h
+    Bool2And.h
+    Bool3Or.h
+    Bool3And.h
     ProximitySensor.h
     Init.h

avango-utils/python/SConscript

@@ -33 +33 @@
 avango_utils_python_files = Split("""
     __init__.py
+    _nodes.py
     _bool_script_merge.py
     _bool_scripts.py

avango-utils/python/__init__.py

@@ -22 +22 @@
 ##########################################################################
 
+from _nodes import *
+
 from _utils import *
 from _MFMerger import *
@@ -31 +33 @@
 from _triggers import *
 
-import avango.nodefactory
-nodes = avango.nodefactory.NodeFactory(module=__name__)
+

avango-utils/python/_bool_script_merge.py

@@ -26 +26 @@
         #check if the type of the field is not SFBool and 
         #the merged script already does not already contain a field with the given name
-        if type != "SFBool" and merged_script._get_field(field1_name):
+        if field1_type != "SFBool" and merged_script._get_field(field1_name):
             continue 
         
@@ -32 +32 @@
         merged_script.add_field(new_field, field1_name)
 
-        # connect new field from node's field   
+        # connect new field from node's field
+        # use an OR relationship
         new_field = merged_script._get_field(field1_name)    
-#        new_field.connect_from(script1_field)
-#        new_field.connect_from(script2_field)
         new_field.connect_from(_bool_scripts.make_bool2_or(script1_field,script2_field))
         

avango-utils/python/_bool_scripts.py

@@ +1 @@
+from _nodes import *
+
 import avango
 import avango.script
-
-class Bool2And(avango.script.Script):
-    
-    Input1 = avango.SFBool()
-    Input2 = avango.SFBool()
-    
-    Output = avango.SFBool()
-    
-    def evaluate(self):
-        if self.Input1.value and self.Input2.value:
-            self.Output.value = True
-        else: 
-            self.Output.value = False
-            
-class Bool2Or(avango.script.Script):
-    
-    Input1 = avango.SFBool()
-    Input2 = avango.SFBool()
-    
-    Output = avango.SFBool()
-    
-    def evaluate(self):
-        if self.Input1.value or self.Input2.value:
-            self.Output.value = True
-        else: 
-            self.Output.value = False
-
-class Bool3And(avango.script.Script):
-    
-    Input1 = avango.SFBool()
-    Input2 = avango.SFBool()
-    Input3 = avango.SFBool()
-    
-    Output = avango.SFBool()
-    
-    def evaluate(self):
-        if self.Input1.value and self.Input2.value and self.Input3.value:
-            self.Output.value = True
-        else: 
-            self.Output.value = False
-            
-class Bool3Or(avango.script.Script):
-    
-    Input1 = avango.SFBool()
-    Input2 = avango.SFBool()
-    Input3 = avango.SFBool()
-    
-    Output = avango.SFBool()
-    
-    def evaluate(self):
-        if self.Input1.value or self.Input2.value or self.Input3.value:
-            self.Output.value = True
-        else: 
-            self.Output.value = False
             
 def make_bool2_or(input1,input2):
-    bool2_or = Bool2Or()
+    bool2_or = nodes.Bool2Or()
     bool2_or.Input1.connect_from(input1)
     bool2_or.Input2.connect_from(input2)
@@ -63 +11 @@
             
 def make_bool2_and(input1,input2):
-    bool2_and = Bool2And()
+    bool2_and = nodes.Bool2And()
     bool2_and.Input1.connect_from(input1)
     bool2_and.Input2.connect_from(input2)
@@ -69 +17 @@
 
 def make_bool3_and(input1,input2,input3):
-    bool3_and = Bool3And()
+    bool3_and = nodes.Bool3And()
     bool3_and.Input1.connect_from(input1)
     bool3_and.Input2.connect_from(input2)
@@ -76 +24 @@
 
 def make_bool3_or(input1,input2,input3):
-    bool3_and = Bool3Or()
+    bool3_and = nodes.Bool3Or()
     bool3_and.Input1.connect_from(input1)
     bool3_and.Input2.connect_from(input2)

avango-utils/python/_utils.cpp

@@ -26 +26 @@
 #include "../include/avango/utils/Init.h"
 
+#include "../include/avango/utils/Bool2Or.h"
+#include "../include/avango/utils/Bool2And.h"
+#include "../include/avango/utils/Bool3Or.h"
+#include "../include/avango/utils/Bool3And.h"
+
 using namespace boost::python;
 
@@ -43 +48 @@
 {
   av::utils::Init::initClass();
+
+  class_<av::utils::Bool2Or, av::Link<av::utils::Bool2Or>, bases<av::FieldContainer>, boost::noncopyable >("Bool2Or", "docstring", no_init);
+  class_<av::utils::Bool2And, av::Link<av::utils::Bool2And>, bases<av::FieldContainer>, boost::noncopyable >("Bool2And", "docstring", no_init);
+  class_<av::utils::Bool3Or, av::Link<av::utils::Bool3Or>, bases<av::FieldContainer>, boost::noncopyable >("Bool3Or", "docstring", no_init);
+  class_<av::utils::Bool3And, av::Link<av::utils::Bool3And>, bases<av::FieldContainer>, boost::noncopyable >("Bool3And", "docstring", no_init);
 }

avango-utils/src/Init.cpp

@@ -24 +24 @@
 #include "../include/avango/utils/Init.h"
 #include "../include/avango/utils/ProximitySensor.h"
+#include "../include/avango/utils/Bool2Or.h"
+#include "../include/avango/utils/Bool2And.h"
+#include "../include/avango/utils/Bool3Or.h"
+#include "../include/avango/utils/Bool3And.h"
 
 #include <avango/Logger.h>
@@ -40 +44 @@
   {
     av::utils::ProximitySensor::initClass();
+    av::utils::Bool2Or::initClass();
+    av::utils::Bool2And::initClass();
+    av::utils::Bool3Or::initClass();
+    av::utils::Bool3And::initClass();
 
     AV_TYPED_INIT_ABSTRACT(av::Type::badType(), "av::utils::Init", true);

avango-utils/src/SConscript

@@ -31 +31 @@
 
 sources = Split('''
+    Bool2Or.cpp
+    Bool2And.cpp
+    Bool3Or.cpp
+    Bool3And.cpp
     ProximitySensor.cpp
     Init.cpp