Merge pull request #28 from fabric-engine/case-18

Case 18

Author: Helge Mathee

Apps/Sample/Simulation/Flocking.html

@@ -63,6 +63,72 @@
 
     <script type="text/javascript">
 
+    
+FABRIC.SceneGraph.registerNodeType('Flock', {
+  briefDesc: 'The Flock node is a Particles node which simulates flocking behaviour.',
+  detailedDesc: 'The Flock node is a Particles node which simulates flocking behaviour through KL operators. ' +
+                'The node is furthermore able to visualize the current flocking targets for each particle.',
+  parentNodeDesc: 'Particles',
+  optionsDesc: {
+    displayDebugging: 'Set to true to draw the current flocking target for each particle.',
+  },
+  factoryFn: function(options, scene) {
+    scene.assignDefaults(options, {
+      displayDebugging: true
+    });
+
+    options.createSpatialHashTable = true;
+    options.animated = true;
+    options.simulated = true;
+
+    var flockNode = scene.constructNode('Particles', options);
+    flockNode.pub.addVertexAttributeValue('goals', 'Vec3');
+    flockNode.pub.addVertexAttributeValue('neighborIndices', 'Integer[]');
+    flockNode.pub.addVertexAttributeValue('neighborDistances', 'Scalar[]');
+    
+    flockNode.pub.addVertexAttributeValue('initialized', 'Boolean', false );
+    flockNode.pub.addVertexAttributeValue('debugDraw', 'DebugGeometry' );
+    flockNode.pub.addUniformValue('displayDebugging', 'Boolean', options.displayDebugging, true );
+    
+    flockNode.getAttributesDGNode().bindings.append(scene.constructOperator({
+      operatorName: 'simulateParticles',
+      srcFile: 'KL/flocking.kl',
+      entryFunctionName: 'simulateFlock',
+      parameterLayout: [
+        'self.index',
+        'self.initialized',
+
+        'self.positions',
+        'self.velocities',
+        'self.goals',
+        'self.cellindices',
+        'self.cellcoords',
+
+        'self.previousframe_positions<>',
+        'self.previousframe_velocities<>',
+
+        'self.neighborinfluencerange',
+        'uniforms.hashtable',
+
+        'globals.timestep',
+
+        'self.neighborIndices',
+        'self.neighborDistances',
+        'self.debugDraw',
+        'uniforms.displayDebugging'
+      ]
+    }));
+    
+    
+    var debugGeometryDraw = scene.constructNode('DebugGeometryDraw', {
+        dgnode: flockNode.getAttributesDGNode(),
+        debugGemetryMemberName: 'debugDraw'
+    });
+    
+    return flockNode;
+  }});
+
+    
 $(document).ready(function() {
 
   $('#play').button({

SceneGraph/KL/flocking.kl renamed to Apps/Sample/Simulation/KL/flocking.kl

@@ -304,7 +304,7 @@
 
     // create a frame operator to the texture
     texturedgnode.addMember('drawFrame','Boolean',true);
-    texturedgnode.addMember('frameColor','RGBA',FABRIC.RT.rgba(255,255,255,255));
+    texturedgnode.addMember('frameColor','RGBA',FABRIC.RT.rgba(255,0,0,255));
     texturedgnode.bindings.append(scene.constructOperator({
       operatorName: 'setFramePixels',
       entryFunctionName: 'setFramePixels',

Apps/Sample/UseCases/AnimationReviewTool/index.html

@@ -143,68 +143,4 @@ FABRIC.SceneGraph.registerNodeType('Particles', {
 
   }});
 
-FABRIC.SceneGraph.registerNodeType('Flock', {
-  briefDesc: 'The Flock node is a Particles node which simulates flocking behaviour.',
-  detailedDesc: 'The Flock node is a Particles node which simulates flocking behaviour through KL operators. ' +
-                'The node is furthermore able to visualize the current flocking targets for each particle.',
-  parentNodeDesc: 'Particles',
-  optionsDesc: {
-    displayDebugging: 'Set to true to draw the current flocking target for each particle.',
-  },
-  factoryFn: function(options, scene) {
-    scene.assignDefaults(options, {
-      displayDebugging: true
-    });
-
-    options.createSpatialHashTable = true;
-    options.animated = true;
-    options.simulated = true;
-
-    var flockNode = scene.constructNode('Particles', options);
-    flockNode.pub.addVertexAttributeValue('goals', 'Vec3');
-    flockNode.pub.addVertexAttributeValue('neighborIndices', 'Integer[]');
-    flockNode.pub.addVertexAttributeValue('neighborDistances', 'Scalar[]');
-    
-    flockNode.pub.addVertexAttributeValue('initialized', 'Boolean', false );
-    flockNode.pub.addVertexAttributeValue('debugDraw', 'DebugGeometry' );
-    flockNode.pub.addUniformValue('displayDebugging', 'Boolean', options.displayDebugging, true );
-    
-    flockNode.getAttributesDGNode().bindings.append(scene.constructOperator({
-      operatorName: 'simulateParticles',
-      srcFile: 'FABRIC_ROOT/SceneGraph/KL/flocking.kl',
-      entryFunctionName: 'simulateFlock',
-      parameterLayout: [
-        'self.index',
-        'self.initialized',
-
-        'self.positions',
-        'self.velocities',
-        'self.goals',
-        'self.cellindices',
-        'self.cellcoords',
-
-        'self.previousframe_positions<>',
-        'self.previousframe_velocities<>',
-
-        'self.neighborinfluencerange',
-        'uniforms.hashtable',
-
-        'globals.timestep',
-
-        'self.neighborIndices',
-        'self.neighborDistances',
-        'self.debugDraw',
-        'uniforms.displayDebugging'
-      ]
-    }));
-    
-    
-    var debugGeometryDraw = scene.constructNode('DebugGeometryDraw', {
-        dgnode: flockNode.getAttributesDGNode(),
-        debugGemetryMemberName: 'debugDraw'
-    });
-    
-    return flockNode;
-  }});
-