ソースを参照

-added Triangle Class
-fixed Confidence Threshold for Videos

Anton 11 年 前
コミット
be1a4c2934

+ 4 - 2
bbiwarg/DataSource/IisuDataSource.cs

@@ -54,10 +54,12 @@ namespace bbiwarg.DataSource
             // parameters
             if (moviePath.Length != 0)
                 device.RegisterParameterHandle<int>("SOURCE.MOVIE.PlayMode").Value = 0; // playMode = once
+            else
+                device.RegisterParameterHandle<int>("SOURCE.DEPTHSENSE.AmplitudeThreshold").Value = 100; // confidence-threshhold
+
             frameRate = device.RegisterParameterHandle<float>("SOURCE.FrameRate");
 
-            // confidence-threshhold
-            device.RegisterParameterHandle<int>("SOURCE.DEPTHSENSE.AmplitudeThreshold").Value = 100;
+            
 
             // events
             device.EventManager.RegisterEventListener("DEVICE.Status", new Iisu.EventDelegates.Device.Status(onDeviceStatusChanged));

+ 7 - 5
bbiwarg/Test/OutputTest.cs

@@ -25,7 +25,7 @@ namespace bbiwarg.Test
 
         public void initSource()
         {
-            source = new IIsuDataSource();
+            source = new IIsuDataSource("..\\..\\videos\\1.skv");
             source.init();
             source.start();
 
@@ -51,9 +51,9 @@ namespace bbiwarg.Test
             GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
             Matrix4 modelview = Matrix4.LookAt(Vector3.Zero, -Vector3.UnitZ, Vector3.UnitY);
             GL.MatrixMode(MatrixMode.Modelview);
-            GL.LoadMatrix(ref modelview);
-
-            
+            GL.LoadMatrix(ref modelview);
+
+            GL.Color3(1.0f,1.0f,1.0f);
             
             DepthImage depthImage = source.getDepthImage();
             ConfidenceImage confidenceImage = source.getConfidenceImage();
@@ -80,7 +80,9 @@ namespace bbiwarg.Test
                         GL.End();
                     }
                 }
-            }
+            }
+
+            //Triangle triangle = new Triangle(new DenseVector(new float[] { 0.0f, 0.0f, -100.0f }), new DenseVector(new float[] { 100.0f, 0.0f, -100.0f }), new DenseVector(new float[] { 0.0f, 100.0f, -100.0f }));
 
             /*
             GL.Begin(BeginMode.Triangles);

+ 38 - 0
bbiwarg/Test/Triangle.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Drawing;
+using OpenTK;
+using OpenTK.Graphics.OpenGL;
+using MathNet.Numerics.LinearAlgebra.Single;
+
+namespace bbiwarg.Test
+{
+    class Triangle
+    {
+        private Vector a;
+        private Vector b;
+        private Vector c;
+
+        public Triangle(Vector a, Vector b, Vector c)
+	    {
+            this.a = a;
+            this.b = b;
+            this.c = c;
+	    }
+
+        public void draw()
+        {
+            GL.Color3(1.0f,0.0f,0.0f);
+
+            GL.Begin(BeginMode.Triangles);
+            GL.Vertex3(a[0], a[1], a[2]);
+            GL.Vertex3(b[0], b[1], b[2]);
+            GL.Vertex3(c[0], c[1], c[2]);
+            GL.End();
+        }
+
+    }
+}