Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sebl beta43.2 #75

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open

Sebl beta43.2 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
4f165b7
updated nugets for beta34.2 and raised target framework to 4.5
sebllll Feb 5, 2016
5a327e3
init for a new Node called DetectPedestrian (CV.Image)... works alrea…
sebllll Feb 5, 2016
591460e
on the way...
sebllll Feb 11, 2016
c139d96
working (but still slow because not optimized)
sebllll Feb 11, 2016
3fcad75
all ínput formats working
sebllll Feb 11, 2016
4fbfaa5
little cleanup and tested the pointer-variant
sebllll Feb 12, 2016
9114d0f
minor
sebllll Feb 16, 2016
c0f194b
ximea & flycapture thingys
sebllll Feb 16, 2016
8278821
init uEye plugin suite
sebllll Feb 17, 2016
160f8e7
ListDevices is working like a charm
sebllll Feb 17, 2016
137c147
VideoIn basically working .. at least outputting the Image
sebllll Feb 17, 2016
57cddbb
fps working, format queries working
sebllll Feb 17, 2016
1f2fae6
lot of ImageFormat-testing... this is nonsense. will use aoi and binn…
sebllll Feb 17, 2016
a42a008
adds methods to query festures
sebllll Feb 17, 2016
5460c7c
amend
sebllll Feb 17, 2016
241e24c
Dynamic Enums should work like this ... need to add aaaaall the Params
sebllll Feb 18, 2016
1791ef6
dynamic enums working for binning and subsampling... enums are not sp…
sebllll Feb 18, 2016
16e491e
dynamic enums are not spreadable... so, stopping here and propagate a…
sebllll Feb 18, 2016
3352267
binning and subsampling enums are now 'final'
sebllll Feb 18, 2016
4d804b9
subsampling, binning and aoi working
sebllll Feb 18, 2016
eb12575
binning, subsampling and aoi finished
sebllll Feb 18, 2016
f5c58dd
framreate working and refactoring
sebllll Feb 18, 2016
92af4a9
working fluently; -> next features/parameters
sebllll Feb 19, 2016
1abd0ae
mirror working & better framerate queries
sebllll Feb 19, 2016
a4ec9bd
lot of debugging... seems to work stable now
sebllll Feb 19, 2016
8d3cc07
aoi query working
sebllll Feb 19, 2016
cd5e125
more methods for parameters
sebllll Feb 21, 2016
9bd9bd2
ListDevicesNode.cs can now se camera-ids
sebllll Feb 23, 2016
2c4989c
some more parameters are working, Node is spreadable and working with…
sebllll Feb 23, 2016
e181512
fixed GridView (DX11.Layer).v4p
sebllll Feb 23, 2016
bf33e76
ListDevicesNode.cs got better and can now query deeper info
sebllll Feb 26, 2016
5fdd501
better binning and subsampling query & handling; minor bug on startup…
sebllll Feb 29, 2016
a533351
more parameter tweaking + gain working
sebllll Feb 29, 2016
c6aa319
autogain & queryGain working
sebllll Feb 29, 2016
bdcd596
cleanup, testing, bugfixing, new helppatch
sebllll Feb 29, 2016
adf23fd
connect/disconnect handling working (w/ help from patch)
sebllll Feb 29, 2016
6a1c3ba
lot of debug stuff removed
sebllll Feb 29, 2016
603fbad
camOpen replaced by already managed flag IsOpen
sebllll Mar 2, 2016
db8378f
Merge branch 'detectPedestrian' into sebl_beta43.2
sebllll Mar 2, 2016
968c576
Merge branch 'floyd' into sebl_beta43.2
sebllll Mar 2, 2016
e3f1f5e
adds voronoi and delauney nodes
sebllll Jul 25, 2016
d1f8048
uEye dll updated to SDK version 4.80.2.1
sebllll Jul 26, 2016
703a9ec
adds helppatches for voronoi and delauney
sebllll Jul 26, 2016
c9af2b9
adds uEye dll
sebllll Jul 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ _ReSharper*/
[Tt]est[Rr]esult*

#Archives
.zip
.7z
*.zip
*.7z

#Subversion files
.svn
Expand All @@ -51,7 +51,9 @@ _ReSharper*/
*~.xml

#dll's
*.dll
#*.dll
core/*.dll
factories/*.dll

#media files
*.avi
2,622 changes: 2,622 additions & 0 deletions core/System.Reactive.Core.xml
View file
Open in desktop

Large diffs are not rendered by default.

336 changes: 336 additions & 0 deletions core/System.Reactive.Interfaces.xml
View file
Open in desktop

Large diffs are not rendered by default.

10,724 changes: 10,724 additions & 0 deletions core/System.Reactive.Linq.xml
View file
Open in desktop

Large diffs are not rendered by default.

378 changes: 378 additions & 0 deletions core/System.Reactive.PlatformServices.xml
View file
Open in desktop

Large diffs are not rendered by default.

2,622 changes: 2,622 additions & 0 deletions factories/System.Reactive.Core.xml
View file
Open in desktop

Large diffs are not rendered by default.

336 changes: 336 additions & 0 deletions factories/System.Reactive.Interfaces.xml
View file
Open in desktop

Large diffs are not rendered by default.

10,724 changes: 10,724 additions & 0 deletions factories/System.Reactive.Linq.xml
View file
Open in desktop

Large diffs are not rendered by default.

378 changes: 378 additions & 0 deletions factories/System.Reactive.PlatformServices.xml
View file
Open in desktop

Large diffs are not rendered by default.

84 changes: 45 additions & 39 deletions nodes/modules/Image/OpenCV/GridView (DX11.Layer).v4p
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE PATCH SYSTEM "http://vvvv.org/versions/vvvv45alpha31.1.dtd" >
<PATCH nodename="C:\vvvv-sdk\vvvv45\packs\VVVV.Packs.Image\nodes\modules\Image\OpenCV\GridView (DX11.Layer).v4p" filename="C:\vvvv-sdk\vvvv45\VVVV.Packs.Image\lib\nodes\modules\Image\OpenCV\ImageQuad (OpenCV DX11.Layer).v4p" systemname="ImageQuad (OpenCV DX11.Layer)">
<!DOCTYPE PATCH SYSTEM "http://vvvv.org/versions/vvvv45beta34.2.dtd" >
<PATCH nodename="C:\vvvv\vvvv_45beta34.2_x86\packs\VVVV.Packs.Image\nodes\modules\Image\OpenCV\GridView (DX11.Layer).v4p" filename="C:\vvvv-sdk\vvvv45\VVVV.Packs.Image\lib\nodes\modules\Image\OpenCV\ImageQuad (OpenCV DX11.Layer).v4p" systemname="ImageQuad (OpenCV DX11.Layer)">
<BOUNDS height="10155" left="14340" top="3990" type="Window" width="11880">
</BOUNDS>
<NODE componentmode="InABox" id="0" nodename="IOBox (Node)" systemname="IOBox (Node)">
Expand Down Expand Up @@ -43,9 +43,9 @@
</PIN>
</NODE>
<NODE nodename="IOBox (Node)" componentmode="InABox" id="28" systemname="IOBox (Node)">
<BOUNDS type="Node" left="3780" top="8700" width="0" height="0">
<BOUNDS type="Node" left="3510" top="8820" width="0" height="0">
</BOUNDS>
<BOUNDS type="Box" left="3780" top="8700" width="795" height="240">
<BOUNDS type="Box" left="3510" top="8820" width="795" height="240">
</BOUNDS>
<PIN pinname="Descriptive Name" slicecount="1" encoded="0" values="|Texture Out|">
</PIN>
Expand Down Expand Up @@ -88,12 +88,6 @@
<PIN pinname="Output Node" visible="1">
</PIN>
</NODE>
<LINK srcnodeid="0" srcpinname="Output Node" dstnodeid="36" dstpinname="Input" linkstyle="Bezier">
<LINKPOINT x="3765" y="2865">
</LINKPOINT>
<LINKPOINT x="2070" y="2865">
</LINKPOINT>
</LINK>
<LINK srcnodeid="36" srcpinname="Output Node" dstnodeid="27" dstpinname="Input Node">
</LINK>
<NODE systemname="Count (Node)" nodename="Count (Node)" componentmode="Hidden" id="37">
Expand Down Expand Up @@ -135,7 +129,7 @@
</BOUNDS>
<BOUNDS height="240" left="6645" top="210" type="Box" width="795">
</BOUNDS>
<PIN pinname="Y Input Value" slicecount="1" values="1">
<PIN pinname="Y Input Value" slicecount="1" values="0.46">
</PIN>
<PIN encoded="0" pinname="Units" slicecount="1" values="||">
</PIN>
Expand Down Expand Up @@ -230,24 +224,6 @@
<LINKPOINT x="5340" y="2998">
</LINKPOINT>
</LINK>
<NODE systemname="Quad (DX11.Layer)" filename="%VVVV%\packs\DX11\nodes\plugins\VVVV.DX11.Nodes.dll" nodename="Quad (DX11.Layer)" componentmode="Hidden" id="46">
<BOUNDS type="Node" left="390" top="8145" width="6855" height="270">
</BOUNDS>
<PIN pinname="Layer Out" visible="1">
</PIN>
<PIN pinname="Transform In" visible="1">
</PIN>
<PIN pinname="Texture In" visible="1">
</PIN>
<PIN pinname="Samper State" visible="1" slicecount="1" values="||">
</PIN>
<PIN pinname="Enabled" visible="1">
</PIN>
</NODE>
<LINK srcnodeid="46" srcpinname="Layer Out" dstnodeid="35" dstpinname="Input Node">
</LINK>
<LINK srcnodeid="38" srcpinname="Texture Out" dstnodeid="46" dstpinname="Texture In">
</LINK>
<NODE componentmode="InABox" id="47" nodename="IOBox (Value Advanced)" systemname="IOBox (Value Advanced)">
<BOUNDS height="100" left="8700" top="210" type="Node" width="100">
</BOUNDS>
Expand All @@ -272,8 +248,6 @@
<PIN pinname="Input 2" visible="1">
</PIN>
</NODE>
<LINK srcnodeid="48" srcpinname="Output" dstnodeid="46" dstpinname="Samper State">
</LINK>
<LINK srcnodeid="47" srcpinname="Y Output Value" dstnodeid="48" dstpinname="Switch" linkstyle="Bezier">
<LINKPOINT x="8700" y="3938">
</LINKPOINT>
Expand All @@ -290,12 +264,6 @@
</NODE>
<LINK srcnodeid="49" srcpinname="Sampler" dstnodeid="48" dstpinname="Input 2">
</LINK>
<LINK srcnodeid="21" srcpinname="Y Output Value" dstnodeid="46" dstpinname="Enabled" linkstyle="Bezier">
<LINKPOINT x="10320" y="4418">
</LINKPOINT>
<LINKPOINT x="7215" y="4418">
</LINKPOINT>
</LINK>
<NODE systemname="UniformScale (Transform)" nodename="UniformScale (Transform)" componentmode="Hidden" id="50">
<BOUNDS type="Node" left="1530" top="7185" width="100" height="100">
</BOUNDS>
Expand All @@ -306,12 +274,50 @@
<PIN pinname="XYZ" slicecount="1" values="2">
</PIN>
</NODE>
<LINK srcnodeid="50" srcpinname="Transform Out" dstnodeid="46" dstpinname="Transform In">
</LINK>
<LINK srcnodeid="36" srcpinname="Output Node" dstnodeid="50" dstpinname="Transform In" linkstyle="Bezier">
<LINKPOINT x="2055" y="6368">
</LINKPOINT>
<LINKPOINT x="1560" y="6368">
</LINKPOINT>
</LINK>
<NODE systemname="Quad (DX11.Layer)" filename="%VVVV%\packs\DX11\nodes\plugins\VVVV.DX11.Nodes.dll" nodename="Quad (DX11.Layer)" componentmode="Hidden" id="46">
<BOUNDS type="Node" left="390" top="8145" width="6855" height="270">
</BOUNDS>
<PIN pinname="Layer Out" visible="1">
</PIN>
<PIN pinname="Transform In" visible="1">
</PIN>
<PIN pinname="Texture In" visible="1">
</PIN>
<PIN pinname="Samper State" visible="1" slicecount="1" values="||">
</PIN>
<PIN pinname="Enabled" visible="1">
</PIN>
<PIN pinname="Layer" visible="1">
</PIN>
<PIN pinname="Transform" visible="1">
</PIN>
<PIN pinname="Sampler State" visible="1" slicecount="1" values="||">
</PIN>
<PIN pinname="Texture" visible="1" slicecount="1" values="||">
</PIN>
</NODE>
<LINK srcnodeid="21" srcpinname="Y Output Value" dstnodeid="46" dstpinname="Enabled" linkstyle="Bezier">
<LINKPOINT x="10320" y="4418">
</LINKPOINT>
<LINKPOINT x="7215" y="4418">
</LINKPOINT>
</LINK>
<LINK srcnodeid="46" srcpinname="Layer" dstnodeid="35" dstpinname="Input Node">
</LINK>
<LINK srcnodeid="50" srcpinname="Transform Out" dstnodeid="46" dstpinname="Transform">
</LINK>
<LINK srcnodeid="48" srcpinname="Output" dstnodeid="46" dstpinname="Sampler State">
</LINK>
<PACK Name="VVVV.Packs" Version="0.2.0">
</PACK>
<PACK Name="addonpack" Version="34.1.0">
</PACK>
<LINK srcnodeid="38" srcpinname="Texture Out" dstnodeid="46" dstpinname="Texture">
</LINK>
</PATCH>
5 changes: 3 additions & 2 deletions nodes/plugins/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Dependencies
/
#Dependencies
Dependencies/EDSDK

*.dll
*.xml
Loading