diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
new file mode 100644
index 0000000..38c5f00
--- /dev/null
+++ b/.vs/ProjectSettings.json
@@ -0,0 +1,3 @@
+{
+ "CurrentProjectSetting": "x86-Debug"
+}
\ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..20c2918
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,8 @@
+{
+ "ExpandedNodes": [
+ "",
+ "\\open3mod"
+ ],
+ "SelectedNode": "\\open3mod\\NDISend.cs",
+ "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
new file mode 100644
index 0000000..b42cd34
--- /dev/null
+++ b/.vs/config/applicationhost.config
@@ -0,0 +1,1030 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.vs/open3mod/v15/Browse.VC.db b/.vs/open3mod/v15/Browse.VC.db
new file mode 100644
index 0000000..6d45f8b
Binary files /dev/null and b/.vs/open3mod/v15/Browse.VC.db differ
diff --git a/.vs/open3mod/v15/Server/sqlite3/db.lock b/.vs/open3mod/v15/Server/sqlite3/db.lock
new file mode 100644
index 0000000..e69de29
diff --git a/.vs/open3mod/v15/Server/sqlite3/storage.ide b/.vs/open3mod/v15/Server/sqlite3/storage.ide
new file mode 100644
index 0000000..26a7518
Binary files /dev/null and b/.vs/open3mod/v15/Server/sqlite3/storage.ide differ
diff --git a/.vs/open3mod/v15/Server/sqlite3/storage.ide-shm b/.vs/open3mod/v15/Server/sqlite3/storage.ide-shm
new file mode 100644
index 0000000..a8a876f
Binary files /dev/null and b/.vs/open3mod/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/.vs/open3mod/v15/Server/sqlite3/storage.ide-wal b/.vs/open3mod/v15/Server/sqlite3/storage.ide-wal
new file mode 100644
index 0000000..e85c330
Binary files /dev/null and b/.vs/open3mod/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
new file mode 100644
index 0000000..04aa8da
Binary files /dev/null and b/.vs/slnx.sqlite differ
diff --git a/.vs/tasks.vs.json b/.vs/tasks.vs.json
new file mode 100644
index 0000000..d9347cd
--- /dev/null
+++ b/.vs/tasks.vs.json
@@ -0,0 +1,10 @@
+{
+ "version": "0.2.1",
+ "tasks": [
+ {
+ "taskName": "task-NDISend",
+ "appliesTo": "open3mod/NDISend.cs",
+ "type": "launch"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Antialias0.png b/Antialias0.png
new file mode 100644
index 0000000..ddf9f11
Binary files /dev/null and b/Antialias0.png differ
diff --git a/Antialias1.png b/Antialias1.png
new file mode 100644
index 0000000..63812f1
Binary files /dev/null and b/Antialias1.png differ
diff --git a/Antialias2.png b/Antialias2.png
new file mode 100644
index 0000000..4f94e2d
Binary files /dev/null and b/Antialias2.png differ
diff --git a/Antialias3.png b/Antialias3.png
new file mode 100644
index 0000000..8beed1c
Binary files /dev/null and b/Antialias3.png differ
diff --git a/Lights Helper.ods b/Lights Helper.ods
new file mode 100644
index 0000000..af171ce
Binary files /dev/null and b/Lights Helper.ods differ
diff --git a/Matice.ods b/Matice.ods
new file mode 100644
index 0000000..598f558
Binary files /dev/null and b/Matice.ods differ
diff --git a/Matice.txt b/Matice.txt
new file mode 100644
index 0000000..1087d53
--- /dev/null
+++ b/Matice.txt
@@ -0,0 +1,48 @@
+ROTX-3,14 {(1, 0, 0, 0)
+(0, -1, 0, 0)
+(0, 0, -1, 0)
+(0, 0, 0, 1)} OpenTK.Matrix4
+ROTX3,14-TR {(1, 0, 0, 0)(0, -1, 0, 0)(0, 0, -1, 0)(0,1, -0,4999996, -4, 1)}
+
+ROTX+3,14 {(1, 0, 0, 0)
+(0, -1, 0, 0)
+(0, 0, -1, 0)
+(0, 0, 0, 1)} OpenTK.Matrix4
+ROTX+1,57 {(1, 0, 0, 0)(0, -0, 1, 0)(0, -1, 0, 0)(0, 0, 0, 1)}
+
+ROTY+1,57 {(0, 0, -1, 0)(0, 1, 0, 0)(1, 0, 0, 0)(0, 0, 0, 1)}
+ROTY+3,14 {(-1, 0, 0, 0)(0, 1, 0, 0)(0, 0, -1, 0)(0, 0, 0, 1)}
+
+Trans: {(1, 0, 0, 0)(0, 1, 0, 0)(0, 0, 1, 0)(-0,1, -0,5, -4, 1)}
+
+TR+ROTY3,14 {(-1, 0, 0, 0)(0, 1, 0, 0)(0, 0, -1, 0)(-0,1, -0,5, -4, 1)}
+
+ROTY3,14+TR {(-1, 0, 0, 0)(0, 1, 0, 0)(0, 0, -1, 0)(0,1000004,-0,5, 4, 1)}
+
+
+{(0,3527755, 0,2131323, 0,9111114, 0,3409168)(0,1259316, 0,9540403, -0,2719342, 0,8571823)(-0,927195, 0,2106694, 0,309722, 1,137835)(0, 0, 0, 1)}
+
+
+
+sted mstnosti dole kvoknu
+{(0,07536846, 0,0187832, 0,9969789, 0)(-0,1007835, -0,9945592, 0,02635653, 0)(0,9920496, -0,1024655, -0,07306531, 0)(-0,4898185, 0,04680252, -0,1685313, 1)}
+rove PC dole kvoknu
+{(0,01734099, 0,0369628, 0,9991663, 0)(-0,1188011, -0,9921611, 0,0387655, 0)(0,9927666, -0,1193743, -0,01281372, 0)(0,2560161, 0,03062713, -0,08846986, 1)}
+
+kvoknu
+{(0,1264207, 0,001443836, 0,9919757, 0)(-0,1496868, -0,9885207, 0,02051538, 0)(0,9806181, -0,1510792, -0,1247532, 0)(0,3554798, 0,8371638, 1,201477, 1)}
+odvokna
+{(-0,06801736, -0,02136107, -0,9974555, 0)(0,0250141, -0,9994931, 0,01969897, 0)(-0,9973705, -0,02361057, 0,06851724, 0)(0,4422003, 0,8333762, 1,195859, 1)}
+ktv
+{(-0,9952727, 0,08472563, 0,04747543, 0)(-0,08766541, -0,9941111, -0,0637024, 0)(0,04179862, -0,06756321, 0,9968391, 0)(0,3758038, 0,8378716, 1,131722, 1)}
+ktv-10cm
+{(-0,9923375, 0,09125067, 0,08330524, 0)(-0,09615158, -0,9937425, -0,05684081, 0)(0,0775972, -0,06441519, 0,9949018, 0)(0,3987336, 0,8381177, 1,252825, 1)}
+
+
+
+
+Mirror:
+1,1,1
+-1,1,1,
+1,-1,1,
+1,1,-1,
diff --git a/OpenTK Manual.pdf b/OpenTK Manual.pdf
new file mode 100644
index 0000000..dede9ee
Binary files /dev/null and b/OpenTK Manual.pdf differ
diff --git "a/Ot\303\241\304\215en\303\255 kontrol\303\251ru.ods" "b/Ot\303\241\304\215en\303\255 kontrol\303\251ru.ods"
new file mode 100644
index 0000000..395ab18
Binary files /dev/null and "b/Ot\303\241\304\215en\303\255 kontrol\303\251ru.ods" differ
diff --git "a/Ovl\303\241d\303\241n\303\255.txt" "b/Ovl\303\241d\303\241n\303\255.txt"
new file mode 100644
index 0000000..35b62ff
--- /dev/null
+++ "b/Ovl\303\241d\303\241n\303\255.txt"
@@ -0,0 +1,35 @@
+PageUp+Left mezi studia
+Next+Right dtto
+F5+Escape: Play/Stop
+OemPeriod resettimeAnim
+WASD - move
+Up+Down . move
+NumPad9+3 Fovy
+NumPad4+5+6: shift
+R-reset camera controller immediatelly
+O:- //reset offset OpenVRInterface.viewOffset = Matrix4.Identity;
+E:- switch backend
+V-reset NDI streams
+G-skip one frame
+FBXC - view
+
+
+
+nejdv nastavit oba offsety ke kamerm,
+
+grip (HORN VEPEDU)+ simultaneously lower pad - start measure fixpos matrix, offset to controller
+
+touch pad alone = end measuring trackerToCamera matrix
+
+
+pak celkov - ten je k podlaze - 6cm nad n
+only grip button podret = reset offset to camera, including ground offset
+
+
+
+touchpadL/R - delay up/down
+
+
+Vyrobit v Blenderu, natat FBX
+
+vMix - cam zpodn 0, NDI zpodn 2 frame , pak je 30ms optom
\ No newline at end of file
diff --git a/Shading forward_plus.pdf b/Shading forward_plus.pdf
new file mode 100644
index 0000000..79bb417
Binary files /dev/null and b/Shading forward_plus.pdf differ
diff --git "a/Sou\305\231adnice v prostoru.pdf" "b/Sou\305\231adnice v prostoru.pdf"
new file mode 100644
index 0000000..fe2c4b7
Binary files /dev/null and "b/Sou\305\231adnice v prostoru.pdf" differ
diff --git a/Todo.txt b/Todo.txt
new file mode 100644
index 0000000..510241e
--- /dev/null
+++ b/Todo.txt
@@ -0,0 +1,329 @@
+resize minimize - size 0 /incomplete attachment
+
+jak vypad Janssen nov studio v renderu-vyrobit...f/bg/gr atd
+test - nastaven FOV pro kameru+screen adekvtn-testovac studio vs rel pedmt(?)
+= do foregroundu render VR pedmt voliteln= kontrola FOV pedmty pes obraz
+
+doplnit studio i po stranch
+noise filter/gauss na um kle-mean 3x3-5x5-ped, nebo po kli??
+shader pedlat na itexturesize+
+je kl ist jako v ediusu?
+
+
+shadery 2 - jeden se switchem, resamplingem a blk,
+druh bez resamplu a s blurem??
+
+
+
+pepnn a piazen ovlada - sna >sn b
+
+stih do druh kamery buttonem ovladae
+zpodn nastavit a s klikem, ne jen drenm nad
+pojistka resetu studia
+
+
+mstnosti ze steamu najt - vmna??
+
+
+load fps+video output sizes z inputu BMD / scalable
+destroy vech kontext
+??assimp411-compile - vymnit dllky?Loadblender??
+show fps/info overlay. switch info hned on/off (render przdn text)
+sample hodnoty pltna pro kl??
+
+
+
+men rozdlu cam 1a 2 - prava zpodn scanu pi pestihu(!!),
+sync druh kamera - potn frame kamery#1, k tomu kdy dorazil frame2, v rendereru kontrola stejnho sla+operace, co kdy ne,
+
+Settings:
+c:\Users\Studio\AppData\Local\open3mod\open3mod.exe_Url_stpzoig5vx2tayffj4l0jhaydooqznaj\
+Textury v Blenderu mus mt UV, tj a po Unwrappingu - jinak UV nemaj
+
+
+
+
+NDI/BMD vstupy cam1,cam2, static pro 3cam, rezerva?? nebo bez NDI?
+scalable 2 cam/1cam out / In podle potu vstup/stroj..???
+
+
+SUMMARY..??
+----
+monitory odkuk vichni, kameraman?? nen-li stien??, speaker,
+SYNC poeit 100%,
+sest lidi - kamery, stih, pepnn studia, teka
+objevovn text ve studiu
+
+
+
+
+zoom nx 100
+00 = fov 77
+15 = 60
+23 = 52
+z5
+zoom 39 = 39
+
+zznam trackingu ve formtu pro fusion!!+tlatko record(=add), jmno v settings record = nereaguje na vstup z klv/myi
+upravit scny - svtlo apod + auto switch /100 pro scny s light >100
+alfa kolem konce textury polasu = hrany vechny
+
+http://www.zenvideo.co.uk/ndi.htm
+
+
+eit svtlo 100% nebo 1.0
+eit targa/png textura - jin pozice loaderu
+update blender all
+
+OBS studio kyt na NDI vstupu, na vstupech se to d nkdy uchytat...
+vMix kyt na vech NDI vstupech, a m nedefin zpodn na kamee
+Kdy bude nejh, natoit 3 kamery extra a 4x vstup multirecordem, lpe - IsoRecorderNEM ALPHA!!
+
+?? NDI vstup poped+pozad pro statickou 3. kameru a generovn jej pozice
+
+
+
+isVRmodel flag dorozchodit (scene m vdy uml svtlo a nem ipky svtla)
+nastavovn - potvrdit reset scny
+bhem sledovn otoen - kamera zelen??
+
+zvit koprovn view pro vechny view
+GLlegacy/modern
+Dodlat ?? selekci vech nod, jejich parent a oni jsou animovan
+render do HMD??
+open3Mod zmnit na VRStudio
+
+
+zasekvn asu pi inspektoru textur - dl to WIN+24MB textura, je poteba pepnout zpt na Animation
+stream IN = dynamic texture zpomaluje, pro SD rozlien je celkem OK
+kontrola prostoru blikakou proti lesklm vcem
+hlavn monitor mus bt AMD!!!
+
+
+
+
+http://roxlu.com/2014/048/fast-pixel-transfers-with-pixel-buffer-objects
+https://www.khronos.org/opengl/wiki/Pixel_Buffer_Object
+
+Blending:
+https://andersriggelsen.dk/glblendfunc.php
+
+
+korekce:
+Matrix4 difference = MainWindow.offsetMatrix * _view;
+Matrix4 diffTrans = Matrix4.CreateTranslation(-difference.M41, -difference.M42, -difference.M43);
+Matrix4 diffAngl = difference * diffTrans;
+MainWindow.fixposMatrix[contIndex] = diffAngl;
+PAK FIXPOS*VIEW VDY KOUK VE Z SMRU x I PO ZMN POLOHY CONTROLERU
+
+
+ComputeDistortion - UV pro kanly L/R
+GetTrackedDeviceClass - co je to za
+GetDeviceToAbsoluteTrackingPose - hlavn pozice
+GetRawZeroPoseToStandingAbsoluteTrackingPose ????
+IsTrackedDeviceConnected - INDEX
+GetControllerState - KNOFLKY
+
+GetTrackedDeviceIndexForControllerRole - L/R zvisl na rel pozici
+GetControllerRoleForTrackedDeviceIndex
+GetButtonIdNameFromEnum ?? char z sla
+TriggerHapticPulse
+GetTrackedDeviceActivityLevel() - e chrpe;
+
+GetSortedTrackedDeviceIndicesOfClass
+GetType???
+ApplyTransform???
+GetXTrackedDeviceProperty....jak jsou ty property?!!!
+
+
+
+
+/** Each entry in this enum represents a property that can be retrieved about a
+* tracked device. Many fields are only valid for one ETrackedDeviceClass. */
+enum ETrackedDeviceProperty
+{
+ Prop_Invalid = 0,
+
+ // general properties that apply to all device classes
+ Prop_TrackingSystemName_String = 1000,
+ Prop_ModelNumber_String = 1001,
+ Prop_SerialNumber_String = 1002,
+ Prop_RenderModelName_String = 1003,
+ Prop_WillDriftInYaw_Bool = 1004,
+ Prop_ManufacturerName_String = 1005,
+ Prop_TrackingFirmwareVersion_String = 1006,
+ Prop_HardwareRevision_String = 1007,
+ Prop_AllWirelessDongleDescriptions_String = 1008,
+ Prop_ConnectedWirelessDongle_String = 1009,
+ Prop_DeviceIsWireless_Bool = 1010,
+ Prop_DeviceIsCharging_Bool = 1011,
+ Prop_DeviceBatteryPercentage_Float = 1012, // 0 is empty, 1 is full
+ Prop_StatusDisplayTransform_Matrix34 = 1013,
+ Prop_Firmware_UpdateAvailable_Bool = 1014,
+ Prop_Firmware_ManualUpdate_Bool = 1015,
+ Prop_Firmware_ManualUpdateURL_String = 1016,
+ Prop_HardwareRevision_Uint64 = 1017,
+ Prop_FirmwareVersion_Uint64 = 1018,
+ Prop_FPGAVersion_Uint64 = 1019,
+ Prop_VRCVersion_Uint64 = 1020,
+ Prop_RadioVersion_Uint64 = 1021,
+ Prop_DongleVersion_Uint64 = 1022,
+ Prop_BlockServerShutdown_Bool = 1023,
+ Prop_CanUnifyCoordinateSystemWithHmd_Bool = 1024,
+ Prop_ContainsProximitySensor_Bool = 1025,
+ Prop_DeviceProvidesBatteryStatus_Bool = 1026,
+ Prop_DeviceCanPowerOff_Bool = 1027,
+ Prop_Firmware_ProgrammingTarget_String = 1028,
+ Prop_DeviceClass_Int32 = 1029,
+ Prop_HasCamera_Bool = 1030,
+ Prop_DriverVersion_String = 1031,
+ Prop_Firmware_ForceUpdateRequired_Bool = 1032,
+ Prop_ViveSystemButtonFixRequired_Bool = 1033,
+ Prop_ParentDriver_Uint64 = 1034,
+ Prop_ResourceRoot_String = 1035,
+ Prop_RegisteredDeviceType_String = 1036,
+ Prop_InputProfilePath_String = 1037, // input profile to use for this device in the input system. Will default to tracking system name if this isn't provided
+ Prop_NeverTracked_Bool = 1038, // Used for devices that will never have a valid pose by design
+ Prop_NumCameras_Int32 = 1039,
+ Prop_CameraFrameLayout_Int32 = 1040, // EVRTrackedCameraFrameLayout value
+
+ // Properties that are unique to TrackedDeviceClass_HMD
+ Prop_ReportsTimeSinceVSync_Bool = 2000,
+ Prop_SecondsFromVsyncToPhotons_Float = 2001,
+ Prop_DisplayFrequency_Float = 2002,
+ Prop_UserIpdMeters_Float = 2003,
+ Prop_CurrentUniverseId_Uint64 = 2004,
+ Prop_PreviousUniverseId_Uint64 = 2005,
+ Prop_DisplayFirmwareVersion_Uint64 = 2006,
+ Prop_IsOnDesktop_Bool = 2007,
+ Prop_DisplayMCType_Int32 = 2008,
+ Prop_DisplayMCOffset_Float = 2009,
+ Prop_DisplayMCScale_Float = 2010,
+ Prop_EdidVendorID_Int32 = 2011,
+ Prop_DisplayMCImageLeft_String = 2012,
+ Prop_DisplayMCImageRight_String = 2013,
+ Prop_DisplayGCBlackClamp_Float = 2014,
+ Prop_EdidProductID_Int32 = 2015,
+ Prop_CameraToHeadTransform_Matrix34 = 2016,
+ Prop_DisplayGCType_Int32 = 2017,
+ Prop_DisplayGCOffset_Float = 2018,
+ Prop_DisplayGCScale_Float = 2019,
+ Prop_DisplayGCPrescale_Float = 2020,
+ Prop_DisplayGCImage_String = 2021,
+ Prop_LensCenterLeftU_Float = 2022,
+ Prop_LensCenterLeftV_Float = 2023,
+ Prop_LensCenterRightU_Float = 2024,
+ Prop_LensCenterRightV_Float = 2025,
+ Prop_UserHeadToEyeDepthMeters_Float = 2026,
+ Prop_CameraFirmwareVersion_Uint64 = 2027,
+ Prop_CameraFirmwareDescription_String = 2028,
+ Prop_DisplayFPGAVersion_Uint64 = 2029,
+ Prop_DisplayBootloaderVersion_Uint64 = 2030,
+ Prop_DisplayHardwareVersion_Uint64 = 2031,
+ Prop_AudioFirmwareVersion_Uint64 = 2032,
+ Prop_CameraCompatibilityMode_Int32 = 2033,
+ Prop_ScreenshotHorizontalFieldOfViewDegrees_Float = 2034,
+ Prop_ScreenshotVerticalFieldOfViewDegrees_Float = 2035,
+ Prop_DisplaySuppressed_Bool = 2036,
+ Prop_DisplayAllowNightMode_Bool = 2037,
+ Prop_DisplayMCImageWidth_Int32 = 2038,
+ Prop_DisplayMCImageHeight_Int32 = 2039,
+ Prop_DisplayMCImageNumChannels_Int32 = 2040,
+ Prop_DisplayMCImageData_Binary = 2041,
+ Prop_SecondsFromPhotonsToVblank_Float = 2042,
+ Prop_DriverDirectModeSendsVsyncEvents_Bool = 2043,
+ Prop_DisplayDebugMode_Bool = 2044,
+ Prop_GraphicsAdapterLuid_Uint64 = 2045,
+ Prop_DriverProvidedChaperonePath_String = 2048,
+ Prop_ExpectedTrackingReferenceCount_Int32 = 2049, // expected number of sensors or basestations to reserve UI space for
+ Prop_ExpectedControllerCount_Int32 = 2050, // expected number of tracked controllers to reserve UI space for
+ Prop_NamedIconPathControllerLeftDeviceOff_String = 2051, // placeholder icon for "left" controller if not yet detected/loaded
+ Prop_NamedIconPathControllerRightDeviceOff_String = 2052, // placeholder icon for "right" controller if not yet detected/loaded
+ Prop_NamedIconPathTrackingReferenceDeviceOff_String = 2053, // placeholder icon for sensor/base if not yet detected/loaded
+ Prop_DoNotApplyPrediction_Bool = 2054,
+ Prop_CameraToHeadTransforms_Matrix34_Array = 2055,
+ Prop_DistortionMeshResolution_Int32 = 2056, // custom resolution of compositor calls to IVRSystem::ComputeDistortion
+ Prop_DriverIsDrawingControllers_Bool = 2057,
+ Prop_DriverRequestsApplicationPause_Bool = 2058,
+ Prop_DriverRequestsReducedRendering_Bool = 2059,
+ Prop_MinimumIpdStepMeters_Float = 2060,
+ Prop_AudioBridgeFirmwareVersion_Uint64 = 2061,
+ Prop_ImageBridgeFirmwareVersion_Uint64 = 2062,
+
+ // Properties that are unique to TrackedDeviceClass_Controller
+ Prop_AttachedDeviceId_String = 3000,
+ Prop_SupportedButtons_Uint64 = 3001,
+ Prop_Axis0Type_Int32 = 3002, // Return value is of type EVRControllerAxisType
+ Prop_Axis1Type_Int32 = 3003, // Return value is of type EVRControllerAxisType
+ Prop_Axis2Type_Int32 = 3004, // Return value is of type EVRControllerAxisType
+ Prop_Axis3Type_Int32 = 3005, // Return value is of type EVRControllerAxisType
+ Prop_Axis4Type_Int32 = 3006, // Return value is of type EVRControllerAxisType
+ Prop_ControllerRoleHint_Int32 = 3007, // Return value is of type ETrackedControllerRole
+
+ // Properties that are unique to TrackedDeviceClass_TrackingReference
+ Prop_FieldOfViewLeftDegrees_Float = 4000,
+ Prop_FieldOfViewRightDegrees_Float = 4001,
+ Prop_FieldOfViewTopDegrees_Float = 4002,
+ Prop_FieldOfViewBottomDegrees_Float = 4003,
+ Prop_TrackingRangeMinimumMeters_Float = 4004,
+ Prop_TrackingRangeMaximumMeters_Float = 4005,
+ Prop_ModeLabel_String = 4006,
+
+ // Properties that are used for user interface like icons names
+ Prop_IconPathName_String = 5000, // DEPRECATED. Value not referenced. Now expected to be part of icon path properties.
+ Prop_NamedIconPathDeviceOff_String = 5001, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceSearching_String = 5002, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceSearchingAlert_String = 5003, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceReady_String = 5004, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceReadyAlert_String = 5005, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceNotReady_String = 5006, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceStandby_String = 5007, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceAlertLow_String = 5008, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+
+ // Properties that are used by helpers, but are opaque to applications
+ Prop_DisplayHiddenArea_Binary_Start = 5100,
+ Prop_DisplayHiddenArea_Binary_End = 5150,
+ Prop_ParentContainer = 5151,
+
+ // Properties that are unique to drivers
+ Prop_UserConfigPath_String = 6000,
+ Prop_InstallPath_String = 6001,
+ Prop_HasDisplayComponent_Bool = 6002,
+ Prop_HasControllerComponent_Bool = 6003,
+ Prop_HasCameraComponent_Bool = 6004,
+ Prop_HasDriverDirectModeComponent_Bool = 6005,
+ Prop_HasVirtualDisplayComponent_Bool = 6006,
+
+ // Properties that are set internally based on other information provided by drivers
+ Prop_ControllerType_String = 7000,
+ Prop_LegacyInputProfile_String = 7001,
+
+ // Vendors are free to expose private debug data in this reserved region
+ Prop_VendorSpecific_Reserved_Start = 10000,
+ Prop_VendorSpecific_Reserved_End = 10999,
+
+ Prop_TrackedDeviceProperty_Max = 1000000,
+};
+
+/** No string property will ever be longer than this length */
+static const uint32_t k_unMaxPropertyStringSize = 32 * 1024;
+
+/** Used to return errors that occur when reading properties. */
+enum ETrackedPropertyError
+{
+ TrackedProp_Success = 0,
+ TrackedProp_WrongDataType = 1,
+ TrackedProp_WrongDeviceClass = 2,
+ TrackedProp_BufferTooSmall = 3,
+ TrackedProp_UnknownProperty = 4, // Driver has not set the property (and may not ever).
+ TrackedProp_InvalidDevice = 5,
+ TrackedProp_CouldNotContactServer = 6,
+ TrackedProp_ValueNotProvidedByDevice = 7,
+ TrackedProp_StringExceedsMaximumLength = 8,
+ TrackedProp_NotYetAvailable = 9, // The property value isn't known yet, but is expected soon. Call again later.
+ TrackedProp_PermissionDenied = 10,
+ TrackedProp_InvalidOperation = 11,
+ TrackedProp_CannotWriteToWildcards = 12,
+};
+
+
diff --git a/Todo00.txt b/Todo00.txt
new file mode 100644
index 0000000..01e2302
--- /dev/null
+++ b/Todo00.txt
@@ -0,0 +1,259 @@
+synchronizace 4 sender - pi voln pozic ??Process buttons?(pak vme 40ms delay)
+2 buffery na sendera / 2 buffery na loading z GPU??
+
+
+reset po zapnut kontrolru
+
+computedistortion
+apply transform
+
+decklink input
+
+
+natn blend a animac+orientace XYZ
+GLlegacy/modern
+OBS kytn - generovat test do SDI
+
+
+poeit zobrazovn = studio sprvn = svtla dodlat a textury natat - Live textura z BMD (replace existing textura)- jak??
+
+pi vpadku aby drel minul stav , ne 001
+automatick udren pozice (daj 1-0-0 pi resetu neakceptovat /nebo validace pozice
+
+vypnout autoscaling modelu pi pickingcontrolleru , ale jinak scalovat view v camcontrolleru, aby byl model vidt
+
+
+varovtko, e nesthme framerate - rezerva je pod 5 ms u 25fps
+
+
+vyrendrovat vechny 4 taby a do _Max a pak je zkoprovat do viewportu
+(ale render 4x viewportu nen nron a sta sthat fps)
+
+AlphaBkgd pokud nen presetfile tak 255
+
+obrzky HUD, menu a modely obj do resource/relativnho adrese + ochrana proti vpadku/neexistenci
+
+render do HMD??
+
+hlavn monitor mus bt AMD!!!
+kontrola prostoru blikakou proti lesklm vcem
+vypnn kontrolr off
+
+
+korekce:
+Matrix4 difference = MainWindow.offsetMatrix * _view;
+Matrix4 diffTrans = Matrix4.CreateTranslation(-difference.M41, -difference.M42, -difference.M43);
+Matrix4 diffAngl = difference * diffTrans;
+MainWindow.fixposMatrix[contIndex] = diffAngl;
+PAK FIXPOS*VIEW VDY KOUK VE ZSMRU x I PO ZMN POLOHY CONTROLERU
+
+ComputeDistortion - UV pro kanly L/R
+GetTrackedDeviceClass - co je to za
+GetDeviceToAbsoluteTrackingPose - hlavn pozice
+GetRawZeroPoseToStandingAbsoluteTrackingPose ????
+IsTrackedDeviceConnected - INDEX
+GetControllerState - KNOFLKY
+
+GetTrackedDeviceIndexForControllerRole - L/R zvisl na rel pozici
+GetControllerRoleForTrackedDeviceIndex
+GetButtonIdNameFromEnum ?? char z sla
+TriggerHapticPulse
+GetTrackedDeviceActivityLevel() - e chrpe;
+
+GetSortedTrackedDeviceIndicesOfClass
+GetType???
+ApplyTransform???
+GetXTrackedDeviceProperty....jak jsou ty property?!!!
+
+
+
+
+/** Each entry in this enum represents a property that can be retrieved about a
+* tracked device. Many fields are only valid for one ETrackedDeviceClass. */
+enum ETrackedDeviceProperty
+{
+ Prop_Invalid = 0,
+
+ // general properties that apply to all device classes
+ Prop_TrackingSystemName_String = 1000,
+ Prop_ModelNumber_String = 1001,
+ Prop_SerialNumber_String = 1002,
+ Prop_RenderModelName_String = 1003,
+ Prop_WillDriftInYaw_Bool = 1004,
+ Prop_ManufacturerName_String = 1005,
+ Prop_TrackingFirmwareVersion_String = 1006,
+ Prop_HardwareRevision_String = 1007,
+ Prop_AllWirelessDongleDescriptions_String = 1008,
+ Prop_ConnectedWirelessDongle_String = 1009,
+ Prop_DeviceIsWireless_Bool = 1010,
+ Prop_DeviceIsCharging_Bool = 1011,
+ Prop_DeviceBatteryPercentage_Float = 1012, // 0 is empty, 1 is full
+ Prop_StatusDisplayTransform_Matrix34 = 1013,
+ Prop_Firmware_UpdateAvailable_Bool = 1014,
+ Prop_Firmware_ManualUpdate_Bool = 1015,
+ Prop_Firmware_ManualUpdateURL_String = 1016,
+ Prop_HardwareRevision_Uint64 = 1017,
+ Prop_FirmwareVersion_Uint64 = 1018,
+ Prop_FPGAVersion_Uint64 = 1019,
+ Prop_VRCVersion_Uint64 = 1020,
+ Prop_RadioVersion_Uint64 = 1021,
+ Prop_DongleVersion_Uint64 = 1022,
+ Prop_BlockServerShutdown_Bool = 1023,
+ Prop_CanUnifyCoordinateSystemWithHmd_Bool = 1024,
+ Prop_ContainsProximitySensor_Bool = 1025,
+ Prop_DeviceProvidesBatteryStatus_Bool = 1026,
+ Prop_DeviceCanPowerOff_Bool = 1027,
+ Prop_Firmware_ProgrammingTarget_String = 1028,
+ Prop_DeviceClass_Int32 = 1029,
+ Prop_HasCamera_Bool = 1030,
+ Prop_DriverVersion_String = 1031,
+ Prop_Firmware_ForceUpdateRequired_Bool = 1032,
+ Prop_ViveSystemButtonFixRequired_Bool = 1033,
+ Prop_ParentDriver_Uint64 = 1034,
+ Prop_ResourceRoot_String = 1035,
+ Prop_RegisteredDeviceType_String = 1036,
+ Prop_InputProfilePath_String = 1037, // input profile to use for this device in the input system. Will default to tracking system name if this isn't provided
+ Prop_NeverTracked_Bool = 1038, // Used for devices that will never have a valid pose by design
+ Prop_NumCameras_Int32 = 1039,
+ Prop_CameraFrameLayout_Int32 = 1040, // EVRTrackedCameraFrameLayout value
+
+ // Properties that are unique to TrackedDeviceClass_HMD
+ Prop_ReportsTimeSinceVSync_Bool = 2000,
+ Prop_SecondsFromVsyncToPhotons_Float = 2001,
+ Prop_DisplayFrequency_Float = 2002,
+ Prop_UserIpdMeters_Float = 2003,
+ Prop_CurrentUniverseId_Uint64 = 2004,
+ Prop_PreviousUniverseId_Uint64 = 2005,
+ Prop_DisplayFirmwareVersion_Uint64 = 2006,
+ Prop_IsOnDesktop_Bool = 2007,
+ Prop_DisplayMCType_Int32 = 2008,
+ Prop_DisplayMCOffset_Float = 2009,
+ Prop_DisplayMCScale_Float = 2010,
+ Prop_EdidVendorID_Int32 = 2011,
+ Prop_DisplayMCImageLeft_String = 2012,
+ Prop_DisplayMCImageRight_String = 2013,
+ Prop_DisplayGCBlackClamp_Float = 2014,
+ Prop_EdidProductID_Int32 = 2015,
+ Prop_CameraToHeadTransform_Matrix34 = 2016,
+ Prop_DisplayGCType_Int32 = 2017,
+ Prop_DisplayGCOffset_Float = 2018,
+ Prop_DisplayGCScale_Float = 2019,
+ Prop_DisplayGCPrescale_Float = 2020,
+ Prop_DisplayGCImage_String = 2021,
+ Prop_LensCenterLeftU_Float = 2022,
+ Prop_LensCenterLeftV_Float = 2023,
+ Prop_LensCenterRightU_Float = 2024,
+ Prop_LensCenterRightV_Float = 2025,
+ Prop_UserHeadToEyeDepthMeters_Float = 2026,
+ Prop_CameraFirmwareVersion_Uint64 = 2027,
+ Prop_CameraFirmwareDescription_String = 2028,
+ Prop_DisplayFPGAVersion_Uint64 = 2029,
+ Prop_DisplayBootloaderVersion_Uint64 = 2030,
+ Prop_DisplayHardwareVersion_Uint64 = 2031,
+ Prop_AudioFirmwareVersion_Uint64 = 2032,
+ Prop_CameraCompatibilityMode_Int32 = 2033,
+ Prop_ScreenshotHorizontalFieldOfViewDegrees_Float = 2034,
+ Prop_ScreenshotVerticalFieldOfViewDegrees_Float = 2035,
+ Prop_DisplaySuppressed_Bool = 2036,
+ Prop_DisplayAllowNightMode_Bool = 2037,
+ Prop_DisplayMCImageWidth_Int32 = 2038,
+ Prop_DisplayMCImageHeight_Int32 = 2039,
+ Prop_DisplayMCImageNumChannels_Int32 = 2040,
+ Prop_DisplayMCImageData_Binary = 2041,
+ Prop_SecondsFromPhotonsToVblank_Float = 2042,
+ Prop_DriverDirectModeSendsVsyncEvents_Bool = 2043,
+ Prop_DisplayDebugMode_Bool = 2044,
+ Prop_GraphicsAdapterLuid_Uint64 = 2045,
+ Prop_DriverProvidedChaperonePath_String = 2048,
+ Prop_ExpectedTrackingReferenceCount_Int32 = 2049, // expected number of sensors or basestations to reserve UI space for
+ Prop_ExpectedControllerCount_Int32 = 2050, // expected number of tracked controllers to reserve UI space for
+ Prop_NamedIconPathControllerLeftDeviceOff_String = 2051, // placeholder icon for "left" controller if not yet detected/loaded
+ Prop_NamedIconPathControllerRightDeviceOff_String = 2052, // placeholder icon for "right" controller if not yet detected/loaded
+ Prop_NamedIconPathTrackingReferenceDeviceOff_String = 2053, // placeholder icon for sensor/base if not yet detected/loaded
+ Prop_DoNotApplyPrediction_Bool = 2054,
+ Prop_CameraToHeadTransforms_Matrix34_Array = 2055,
+ Prop_DistortionMeshResolution_Int32 = 2056, // custom resolution of compositor calls to IVRSystem::ComputeDistortion
+ Prop_DriverIsDrawingControllers_Bool = 2057,
+ Prop_DriverRequestsApplicationPause_Bool = 2058,
+ Prop_DriverRequestsReducedRendering_Bool = 2059,
+ Prop_MinimumIpdStepMeters_Float = 2060,
+ Prop_AudioBridgeFirmwareVersion_Uint64 = 2061,
+ Prop_ImageBridgeFirmwareVersion_Uint64 = 2062,
+
+ // Properties that are unique to TrackedDeviceClass_Controller
+ Prop_AttachedDeviceId_String = 3000,
+ Prop_SupportedButtons_Uint64 = 3001,
+ Prop_Axis0Type_Int32 = 3002, // Return value is of type EVRControllerAxisType
+ Prop_Axis1Type_Int32 = 3003, // Return value is of type EVRControllerAxisType
+ Prop_Axis2Type_Int32 = 3004, // Return value is of type EVRControllerAxisType
+ Prop_Axis3Type_Int32 = 3005, // Return value is of type EVRControllerAxisType
+ Prop_Axis4Type_Int32 = 3006, // Return value is of type EVRControllerAxisType
+ Prop_ControllerRoleHint_Int32 = 3007, // Return value is of type ETrackedControllerRole
+
+ // Properties that are unique to TrackedDeviceClass_TrackingReference
+ Prop_FieldOfViewLeftDegrees_Float = 4000,
+ Prop_FieldOfViewRightDegrees_Float = 4001,
+ Prop_FieldOfViewTopDegrees_Float = 4002,
+ Prop_FieldOfViewBottomDegrees_Float = 4003,
+ Prop_TrackingRangeMinimumMeters_Float = 4004,
+ Prop_TrackingRangeMaximumMeters_Float = 4005,
+ Prop_ModeLabel_String = 4006,
+
+ // Properties that are used for user interface like icons names
+ Prop_IconPathName_String = 5000, // DEPRECATED. Value not referenced. Now expected to be part of icon path properties.
+ Prop_NamedIconPathDeviceOff_String = 5001, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceSearching_String = 5002, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceSearchingAlert_String = 5003, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceReady_String = 5004, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceReadyAlert_String = 5005, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceNotReady_String = 5006, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceStandby_String = 5007, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+ Prop_NamedIconPathDeviceAlertLow_String = 5008, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+
+ // Properties that are used by helpers, but are opaque to applications
+ Prop_DisplayHiddenArea_Binary_Start = 5100,
+ Prop_DisplayHiddenArea_Binary_End = 5150,
+ Prop_ParentContainer = 5151,
+
+ // Properties that are unique to drivers
+ Prop_UserConfigPath_String = 6000,
+ Prop_InstallPath_String = 6001,
+ Prop_HasDisplayComponent_Bool = 6002,
+ Prop_HasControllerComponent_Bool = 6003,
+ Prop_HasCameraComponent_Bool = 6004,
+ Prop_HasDriverDirectModeComponent_Bool = 6005,
+ Prop_HasVirtualDisplayComponent_Bool = 6006,
+
+ // Properties that are set internally based on other information provided by drivers
+ Prop_ControllerType_String = 7000,
+ Prop_LegacyInputProfile_String = 7001,
+
+ // Vendors are free to expose private debug data in this reserved region
+ Prop_VendorSpecific_Reserved_Start = 10000,
+ Prop_VendorSpecific_Reserved_End = 10999,
+
+ Prop_TrackedDeviceProperty_Max = 1000000,
+};
+
+/** No string property will ever be longer than this length */
+static const uint32_t k_unMaxPropertyStringSize = 32 * 1024;
+
+/** Used to return errors that occur when reading properties. */
+enum ETrackedPropertyError
+{
+ TrackedProp_Success = 0,
+ TrackedProp_WrongDataType = 1,
+ TrackedProp_WrongDeviceClass = 2,
+ TrackedProp_BufferTooSmall = 3,
+ TrackedProp_UnknownProperty = 4, // Driver has not set the property (and may not ever).
+ TrackedProp_InvalidDevice = 5,
+ TrackedProp_CouldNotContactServer = 6,
+ TrackedProp_ValueNotProvidedByDevice = 7,
+ TrackedProp_StringExceedsMaximumLength = 8,
+ TrackedProp_NotYetAvailable = 9, // The property value isn't known yet, but is expected soon. Call again later.
+ TrackedProp_PermissionDenied = 10,
+ TrackedProp_InvalidOperation = 11,
+ TrackedProp_CannotWriteToWildcards = 12,
+};
+
+
diff --git a/TrackedDeviceProperties.ods b/TrackedDeviceProperties.ods
new file mode 100644
index 0000000..3e75139
Binary files /dev/null and b/TrackedDeviceProperties.ods differ
diff --git a/UpgradeLog.htm b/UpgradeLog.htm
new file mode 100644
index 0000000..2e35258
Binary files /dev/null and b/UpgradeLog.htm differ
diff --git a/UpgradeLog2.htm b/UpgradeLog2.htm
new file mode 100644
index 0000000..8273267
Binary files /dev/null and b/UpgradeLog2.htm differ
diff --git a/UpgradeLog3.htm b/UpgradeLog3.htm
new file mode 100644
index 0000000..8273267
Binary files /dev/null and b/UpgradeLog3.htm differ
diff --git "a/V\303\275po\304\215ty.txt" "b/V\303\275po\304\215ty.txt"
new file mode 100644
index 0000000..0c559f5
--- /dev/null
+++ "b/V\303\275po\304\215ty.txt"
@@ -0,0 +1,307 @@
+
+http://www.codinglabs.net/article_world_view_projection_matrix.aspx
+
+https://www.andre-gaschler.com/rotationconverter/
+http://www.euclideanspace.com/maths/geometry/rotations/conversions/quaternionToAngle/
+
+https://www.learnopencv.com/rotation-matrix-to-euler-angles/
+
+
+// Calculates rotation matrix to euler angles
+// The result is the same as MATLAB except the order
+// of the euler angles ( x and z are swapped ).
+Vec3f rotationMatrixToEulerAngles(Mat &R)
+{
+
+ assert(isRotationMatrix(R));
+
+ float sy = sqrt(R.at(0,0) * R.at(0,0) + R.at(1,0) * R.at(1,0) );
+
+ bool singular = sy < 1e-6; // If
+
+ float x, y, z;
+ if (!singular)
+ {
+ x = atan2(R.at(2,1) , R.at(2,2));
+ y = atan2(-R.at(2,0), sy);
+ z = atan2(R.at(1,0), R.at(0,0));
+ }
+ else
+ {
+ x = atan2(-R.at(1,2), R.at(1,1));
+ y = atan2(-R.at(2,0), sy);
+ z = 0;
+ }
+ return Vec3f(x, y, z);
+
+
+
+}
+
+
+https://en.wikipedia.org/wiki/Conversion_between_quaternions_and_Euler_angles
+
+static void toEulerAngle(const Quaterniond& q, double& roll, double& pitch, double& yaw)
+{
+ // roll (x-axis rotation)
+ double sinr = +2.0 * (q.w() * q.x() + q.y() * q.z());
+ double cosr = +1.0 - 2.0 * (q.x() * q.x() + q.y() * q.y());
+ roll = atan2(sinr, cosr);
+
+ // pitch (y-axis rotation)
+ double sinp = +2.0 * (q.w() * q.y() - q.z() * q.x());
+ if (fabs(sinp) >= 1)
+ pitch = copysign(M_PI / 2, sinp); // use 90 degrees if out of range
+ else
+ pitch = asin(sinp);
+--
+ // yaw (z-axis rotation)
+ double siny = +2.0 * (q.w() * q.z() + q.x() * q.y());
+ double cosy = +1.0 - 2.0 * (q.y() * q.y() + q.z() * q.z());
+ yaw = atan2(siny, cosy);
+}
+
+
+Matice do Euler XYZ d opan hly jako Transponovan do ZYX (do opanho helpoad)
+
+
+
+Pepoet VALVE zobrazen:
+
+// transMatrix = Matrix4.Invert(tkMatrix);
+// transMatrix = transMatrix * tkMatrix;//zkouka inverze, vsledek je Identity
+
+ //vyndat inverzn translaci
+ transMatrix = Matrix4.CreateTranslation(-tkMatrix.M41, -tkMatrix.M42, -tkMatrix.M43);
+ //odest translaci
+ orientMatrix = tkMatrix * transMatrix;
+ //zjistit hly
+ _rotation = FromRotMatToEulerInt(orientMatrix, "ZXY");
+ _pitchAngle = _rotation.X;
+ _rollAngle = _rotation.Z;
+ _headingAngle = _rotation.Y;
+ // sloit rotace ve sprvnm poad
+ cameraMatrix = Matrix4.Identity;
+ cameraMatrix = Matrix4.CreateRotationZ(_rollAngle) * cameraMatrix;
+ cameraMatrix = Matrix4.CreateRotationX(_pitchAngle) * cameraMatrix;
+ cameraMatrix = Matrix4.CreateRotationY(_headingAngle) *cameraMatrix;
+ _view = Matrix4.Identity;
+ _view = cameraMatrix * _view;
+//co d ovem tot jako _view = orientMatrix * _view;
+// _view.Transpose();
+ _view = transMatrix * _view;
+
+
+
+
+
+
+ public static Vector3 FromRotMatToEulerInt(Matrix4 e, string order)
+ {
+ Vector3 angles = new Vector3(0, 0, 0);
+ // a = e[0] , f = e[4], g = e[8], h = e[1], k = e[5], l = e[9], m = e[2], n = e[6], o = e[10];
+ float a = e.M11;
+ float f = e.M12;
+ float g = e.M13;
+ float h = e.M21;
+ float k = e.M22;
+ float l = e.M23;
+ float m = e.M31;
+ float n = e.M32;
+ float o = e.M33; //ex e
+ switch (order)
+ {
+ case "XYZ":
+ angles.Y = (float)Math.Asin(g);// -Math.Asin(g);
+ if (Math.Abs(angles.Y) * 0x10000 / Tau > (float)0x4000 - 0.5) //Podmnku upravit? me bt.. .99999>Math.abs(g)
+ {
+ angles.Z = 0;
+ angles.X = (float)Math.Atan2(n, k); //(-n, k);
+ }
+ else
+ {
+ angles.Z = (float)Math.Atan2(f, a); //Atan2(-f,a);
+ angles.X = (float)Math.Atan2(l, o); //Atan2(-l,o);
+ }
+ break;
+ case "YXZ":
+ angles.X = (float)Math.Asin(-l);
+ if (Math.Abs(angles.X) * 0x10000 / Tau > (float)0x4000 - 0.5)
+ {
+ angles.Z = 0;
+ angles.Y = (float)Math.Atan2(-m, a);
+ }
+ else
+ {
+ angles.Z = (float)Math.Atan2(h, k);
+ angles.Y = (float)Math.Atan2(g, o);
+ }
+ break;
+ case "ZXY":
+ angles.X = (float)Math.Asin(n);
+ if (Math.Abs(angles.X) * 0x10000 / Tau > (float)0x4000 - 0.5)
+ {
+ angles.Y = 0;
+ angles.Z = (float)Math.Atan2(h, a);
+ }
+ else
+ {
+ angles.Z = (float)Math.Atan2(-f, k);
+ angles.Y = (float)Math.Atan2(-m, o);
+ }
+ break;
+ case "ZYX":
+ angles.Y = (float)Math.Asin(m);
+ if (Math.Abs(angles.Y) * 0x10000 / Tau > (float)0x4000 - 0.5)
+ {
+ angles.Z = 0;
+ angles.X = (float)Math.Atan2(-f, k);
+ }
+ else
+ {
+ angles.Z = (float)Math.Atan2(h, a);
+ angles.X = (float)Math.Atan2(n, o);
+ }
+ break;
+ case "YZX":
+ angles.Z = (float)Math.Asin(h);
+ if (Math.Abs(angles.Z) * 0x10000 / Tau > (float)0x4000 - 0.5)
+ {
+ angles.X = 0;
+ angles.Y = (float)Math.Atan2(g, o);
+ }
+ else
+ {
+ angles.Y = (float)Math.Atan2(-m, a);
+ angles.X = (float)Math.Atan2(-l, k);
+ }
+ break;
+ case "XZY":
+ angles.Z = (float)Math.Asin(f);
+ if (Math.Abs(angles.Z) * 0x10000 / Tau > (float)0x4000 - 0.5)
+ {
+ angles.Y = 0;
+ angles.X = (float)Math.Atan2(-l, o);
+ }
+ else
+ {
+ angles.Y = (float)Math.Atan2(g, a);
+ angles.X = (float)Math.Atan2(n, k);
+ }
+ break;
+ default:
+// Console.WriteLine("Error Mode / used XYZ implicitly");
+ break;
+ }
+
+ return angles;
+ }
+
+
+
+public static void RotationMatrix(ref Matrix4 matrix, out Quaternion result)
+ {
+ float sqrt;
+ float half;
+ float scale = matrix.M11 + matrix.M22 + matrix.M33;
+ result = new Quaternion();
+
+ if (scale > 0.0f)
+ {
+ sqrt = (float)Math.Sqrt(scale + 1.0f);
+ result.W = sqrt * 0.5f;
+ sqrt = 0.5f / sqrt;
+
+ result.X = (matrix.M23 - matrix.M32) * sqrt;
+ result.Y = (matrix.M31 - matrix.M13) * sqrt;
+ result.Z = (matrix.M12 - matrix.M21) * sqrt;
+ }
+ else if ((matrix.M11 >= matrix.M22) && (matrix.M11 >= matrix.M33))
+ {
+ sqrt = (float)Math.Sqrt(1.0f + matrix.M11 - matrix.M22 - matrix.M33);
+ half = 0.5f / sqrt;
+
+ result.X = 0.5f * sqrt;
+ result.Y = (matrix.M12 + matrix.M21) * half;
+ result.Z = (matrix.M13 + matrix.M31) * half;
+ result.W = (matrix.M23 - matrix.M32) * half;
+ }
+ else if (matrix.M22 > matrix.M33)
+ {
+ sqrt = (float)Math.Sqrt(1.0f + matrix.M22 - matrix.M11 - matrix.M33);
+ half = 0.5f / sqrt;
+
+ result.X = (matrix.M21 + matrix.M12) * half;
+ result.Y = 0.5f * sqrt;
+ result.Z = (matrix.M32 + matrix.M23) * half;
+ result.W = (matrix.M31 - matrix.M13) * half;
+ }
+ else
+ {
+ sqrt = (float)Math.Sqrt(1.0f + matrix.M33 - matrix.M11 - matrix.M22);
+ half = 0.5f / sqrt;
+
+ result.X = (matrix.M31 + matrix.M13) * half;
+ result.Y = (matrix.M32 + matrix.M23) * half;
+ result.Z = 0.5f * sqrt;
+ result.W = (matrix.M12 - matrix.M21) * half;
+ }
+ }
+
+ public static bool Decompose(Matrix4 matrix, out Vector3 scale, out Quaternion rotation, out Vector3 translation)
+ {
+ //Get the translation.
+ translation.X = matrix.M41;
+ translation.Y = matrix.M42;
+ translation.Z = matrix.M43;
+
+ //Scaling is the length of the rows.
+ scale.X = (float)Math.Sqrt((matrix.M11 * matrix.M11) + (matrix.M12 * matrix.M12) + (matrix.M13 * matrix.M13));
+ scale.Y = (float)Math.Sqrt((matrix.M21 * matrix.M21) + (matrix.M22 * matrix.M22) + (matrix.M23 * matrix.M23));
+ scale.Z = (float)Math.Sqrt((matrix.M31 * matrix.M31) + (matrix.M32 * matrix.M32) + (matrix.M33 * matrix.M33));
+
+ //If any of the scaling factors are zero, than the rotation matrix can not exist.
+ if (scale.X == 0.0f ||
+ scale.Y == 0.0f ||
+ scale.Z == 0.0f)
+ {
+ rotation = Quaternion.Identity;
+ return false;
+ }
+
+ //The rotation is the left over matrix after dividing out the scaling.
+ Matrix4 rotationmatrix = new Matrix4();
+ rotationmatrix.M11 = matrix.M11 / scale.X;
+ rotationmatrix.M12 = matrix.M12 / scale.X;
+ rotationmatrix.M13 = matrix.M13 / scale.X;
+
+ rotationmatrix.M21 = matrix.M21 / scale.Y;
+ rotationmatrix.M22 = matrix.M22 / scale.Y;
+ rotationmatrix.M23 = matrix.M23 / scale.Y;
+
+ rotationmatrix.M31 = matrix.M31 / scale.Z;
+ rotationmatrix.M32 = matrix.M32 / scale.Z;
+ rotationmatrix.M33 = matrix.M33 / scale.Z;
+
+ rotationmatrix.M44 = 1f;
+ RotationMatrix(ref rotationmatrix, out rotation); //RotationMatrix je OK, Quaternion se pak stejn zahazuje
+ return true;
+ }
+
+ public const float Tau = 2.0f * (float)Math.PI;
+ public const float Deg2Rad = (float)(Tau / 360.0f);
+ public const float Rad2Deg = (float)(360.0f / Tau);
+
+
+ public static void DecomposeSRTMatrix2(Matrix4 matrix, out Vector3 scale, out Vector3 rotation, out Vector3 translation)
+ {
+ Quaternion quat;
+ Decompose(matrix, out scale, out quat, out translation);
+ matrix.Row0 = new Vector4(Vector3.Divide(matrix.Row0.Xyz, scale.X), 0);
+ matrix.Row1 = new Vector4(Vector3.Divide(matrix.Row1.Xyz, scale.Y), 0);
+ matrix.Row2 = new Vector4(Vector3.Divide(matrix.Row2.Xyz, scale.Z), 0);
+ matrix.Row3 = new Vector4(0, 0, 0, 1);
+ rotation = FromRotMatToEulerZYXInt(matrix); //FromRotMatToEulerZYXInt("XYZ")
+ }
+
+
diff --git a/WindowsFormsApp1/App.config b/WindowsFormsApp1/App.config
new file mode 100644
index 0000000..590721f
--- /dev/null
+++ b/WindowsFormsApp1/App.config
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WindowsFormsApp1/Drawing.cs b/WindowsFormsApp1/Drawing.cs
new file mode 100644
index 0000000..88e83e9
--- /dev/null
+++ b/WindowsFormsApp1/Drawing.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using OpenTK.Graphics;
+using OpenTK.Graphics.OpenGL;
+using OpenTK;
+
+namespace WindowsFormsApp1
+{
+ class Drawing
+ {
+ private static Color4 StartColor = new Color4(0.0f, 1.0f, 0.3f, 1.0f);
+ private static Color4 BorderColor = new Color4(1.0f, 0.1f, 0.3f, 1.0f);
+ static ErrorCode err;
+ static Matrix4 projection;
+
+ public static void DrawViewportPost(double xs, double ys, double xe,
+ double ye, int width, int height)
+ {
+ Matrix4 projection = Matrix4.CreatePerspectiveFieldOfView((float)Math.PI / 4, width / (float)height, 1.0f, 64.0f);
+ // update viewport
+ var w = (double)width;
+ var h = (double)height;
+ var vw = (int)((xe - xs) * w);
+ var vh = (int)((ye - ys) * h);
+ int[] oldViewport = new int[4];
+ GL.GetInteger(GetPName.Viewport, oldViewport);
+ GL.Viewport((int)(xs * w), (int)(ys * h), (int)((xe - xs) * w), (int)((ye - ys) * h));
+ DrawViewportColorsPost(vw, vh);
+ GL.Viewport(0,0,width, height);
+ }
+
+
+ public static void Clean(Color4 _backColor)
+ {
+ GL.ClearColor(_backColor);
+ GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
+ GL.UseProgram(0);
+ }
+
+ public static void DrawViewportPre()
+ {
+
+ GL.MatrixMode(MatrixMode.Modelview);
+ GL.LoadIdentity();
+ GL.MatrixMode(MatrixMode.Projection);
+ GL.LoadIdentity();
+ GL.Color4(StartColor);
+ GL.Color4(Color4.Red);
+ GL.Rect(-1, -1, 1, 1);
+ GL.Color4(Color4.White);
+ GL.Rect(-0.95, -0.95, 0.95, 0.95);
+ GL.Color4(Color4.Black);
+ GL.Rect(-0.9, -0.9, 0.9, 0.9);
+ GL.Color4(StartColor);
+ GL.Rect(-0.8, -0.89, 0.5, 0.0);
+ }
+
+ public static void DrawArrays()
+ {
+ // GL.MatrixMode(MatrixMode.Projection);
+ // GL.LoadMatrix(ref projection);
+ // Matrix4 modelview = Matrix4.LookAt(Vector3.Zero, Vector3.UnitZ, Vector3.UnitY);
+ // GL.MatrixMode(MatrixMode.Modelview);
+ // GL.LoadMatrix(ref modelview);
+ // GL.Color4(Color4.Azure);
+ GL.PointSize(100);
+ TestError("point");
+ GL.DrawArrays(PrimitiveType.Points, 0, 1);
+ TestError("drawArr");
+
+ }
+
+ private static void DrawViewportColorsPost(int width, int height)
+ {
+ GL.Hint(HintTarget.LineSmoothHint, HintMode.Nicest);
+
+ var texW = 1.0 / width;
+ var texH = 1.0 / height;
+
+ GL.MatrixMode(MatrixMode.Modelview);
+ GL.LoadIdentity();
+ GL.MatrixMode(MatrixMode.Projection);
+ GL.LoadIdentity();
+ TestError("loadId");
+ var lineWidth = 4;
+ // draw contour line
+ GL.LineWidth(lineWidth);
+ GL.Color4(BorderColor);
+ TestError("color0");
+
+ var xofs = lineWidth * 0.5 * texW;
+ var yofs = lineWidth * 0.5 * texH;
+
+ GL.Begin(BeginMode.LineStrip);
+ GL.Vertex2(-1.0 + xofs, -1.0 + yofs);
+ GL.Vertex2(1.0 - xofs, -1.0 + yofs);
+ GL.Vertex2(1.0 - xofs, 1.0 - yofs);
+ GL.Vertex2(-1.0 + xofs, 1.0 - yofs);
+ GL.Vertex2(-1.0 + xofs, -1.0 + yofs);
+ GL.End();
+ TestError("bg+end");
+ GL.LineWidth(1);
+ GL.MatrixMode(MatrixMode.Modelview);
+
+ GL.Begin(BeginMode.Triangles);
+
+ GL.Color3(1.0f, 1.0f, 0.0f); GL.Vertex3(-1.0f, -1.0f, 4.0f);
+ GL.Color3(1.0f, 0.0f, 0.0f); GL.Vertex3(1.0f, -1.0f, 4.0f);
+ GL.Color3(0.2f, 0.9f, 1.0f); GL.Vertex3(0.0f, 1.0f, 4.0f);
+
+ GL.End();
+ TestError("bgend2");
+ }
+ public static void TestError(string where)
+ {
+ ErrorCode err = GL.GetError();
+ if (err != ErrorCode.NoError) Console.WriteLine(where + " " + err.ToString());
+ }
+ }
+}
diff --git a/WindowsFormsApp1/MainGameWindow.cs b/WindowsFormsApp1/MainGameWindow.cs
new file mode 100644
index 0000000..76619bf
--- /dev/null
+++ b/WindowsFormsApp1/MainGameWindow.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Graphics.OpenGL;
+using OpenTK.Input;
+
+namespace WindowsFormsApp1
+{
+ public sealed class MainGameWindow : GameWindow
+ {
+ private readonly string _title;
+ private int _program;
+ private int _vertexArray;
+ private double _time;
+ private Color4 _backColor = new Color4(0.1f, 0.1f, 0.3f, 1.0f);
+
+ public MainGameWindow()
+ : base(750, // initial width
+ 500, // initial height
+ GraphicsMode.Default,
+ "", // initial title
+ GameWindowFlags.Default,
+ DisplayDevice.Default,
+ 3, // OpenGL major version
+ 3, // OpenGL minor version
+ GraphicsContextFlags.ForwardCompatible)
+ {
+ _title += "dreamstatecoding.blogspot.com: OpenGL Version: " + GL.GetString(StringName.Version);
+ }
+ protected override void OnResize(EventArgs e)
+ {
+ GL.Viewport(0, 0, Width, Height);
+ }
+
+
+ protected override void OnLoad(EventArgs e)
+ {
+
+ // _program = CreateProgram();
+ GL.GenVertexArrays(1, out _vertexArray);
+ GL.BindVertexArray(_vertexArray);
+ Closed += OnClosed;
+ }
+
+ private void OnClosed(object sender, EventArgs eventArgs)
+ {
+ Exit();
+ }
+
+ public override void Exit()
+ {
+ Debug.WriteLine("Exit called");
+ GL.DeleteVertexArrays(1, ref _vertexArray);
+ GL.DeleteProgram(_program);
+ base.Exit();
+ }
+
+ private int CreateProgram()
+ {
+ try
+ {
+ var program = GL.CreateProgram();
+ var shaders = new List();
+ shaders.Add(CompileShader(ShaderType.VertexShader, @"Components\Shaders\1Vert\vertexShader.c"));
+ shaders.Add(CompileShader(ShaderType.FragmentShader, @"Components\Shaders\5Frag\fragmentShader.c"));
+
+ foreach (var shader in shaders)
+ GL.AttachShader(program, shader);
+ GL.LinkProgram(program);
+ var info = GL.GetProgramInfoLog(program);
+ if (!string.IsNullOrWhiteSpace(info))
+ throw new Exception($"CompileShaders ProgramLinking had errors: {info}");
+
+ foreach (var shader in shaders)
+ {
+ GL.DetachShader(program, shader);
+ GL.DeleteShader(shader);
+ }
+ return program;
+ }
+ catch (Exception ex)
+ {
+ Debug.WriteLine(ex.ToString());
+ throw;
+ }
+ }
+
+ private int CompileShader(ShaderType type, string path)
+ {
+ var shader = GL.CreateShader(type);
+ var src = File.ReadAllText(path);
+ GL.ShaderSource(shader, src);
+ GL.CompileShader(shader);
+ var info = GL.GetShaderInfoLog(shader);
+ if (!string.IsNullOrWhiteSpace(info))
+ throw new Exception($"CompileShader {type} had errors: {info}");
+ return shader;
+ }
+
+ protected override void OnRenderFrame(FrameEventArgs e)
+ {
+ _time = DateTime.Now.Millisecond / 100;
+ // GL.VertexAttrib1(1, (float)_time);
+ Drawing.Clean(_backColor);
+ Drawing.DrawViewportPre();
+ Drawing.DrawArrays();
+ Drawing.DrawViewportPost(0.2f, 0.2f, 0.8f, 0.8f, Width, Height);
+ SwapBuffers();
+ }
+
+ }
+}
diff --git a/WindowsFormsApp1/MainWindow.cs b/WindowsFormsApp1/MainWindow.cs
new file mode 100644
index 0000000..51fc8a2
--- /dev/null
+++ b/WindowsFormsApp1/MainWindow.cs
@@ -0,0 +1,502 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Graphics.OpenGL;
+using System.Drawing.Imaging;
+using OpenTK.Input;
+using System.Threading;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+
+using System.Windows.Forms;
+
+
+namespace WindowsFormsApp1
+{
+ public class MainWindow : Form
+ {
+ private int _programExample;
+ private int _programSimple;
+ private int _programChromakey;
+ private int _mVertexArray;
+ private double _time;
+ private RenderControl renderControl;
+ private Color4 _backColor = new Color4(0.1f, 0.1f, 0.3f, 1.0f);
+ int videoSizeX = 1920;
+ int videoSizeY = 1080;
+ private System.Windows.Forms.Timer timer1;
+ private System.ComponentModel.IContainer components;
+ private int count = 0;
+ Matrix4 _projectionMatrix = Matrix4.Identity;
+ private List _renderObjects = new List();
+ int texF;
+ int texB;
+ Bitmap bmpF;
+ Bitmap bmpB;
+
+ public MainWindow()
+ {
+ InitializeComponent();
+ }
+
+ protected override void OnResize(EventArgs e)
+ {
+ //oveřit toto nastavení i pro jiná okna!!!
+ int BorderY = 38;
+ int BorderX = 16;
+ renderControl.ResizeGlControl(Width - BorderX, Height-BorderY, 0, 0);
+ CreateProjection();
+ }
+
+ protected override void OnLoad(EventArgs e)
+ {
+ renderControl.InitGlControl(videoSizeX, videoSizeY);
+ Closed += OnClosed;
+ renderControl.SetRenderTarget(RenderControl.RenderTarget.ScreenCore);
+ _programExample = CreateProgram("example");
+ _programSimple = CreateProgram("simple");
+ _programChromakey = CreateProgram("chromakey");
+ GL.GenVertexArrays(1, out _mVertexArray);
+ GL.BindVertexArray(_mVertexArray);
+ float W = 1.6f;
+ float H = 0.9f;
+ float D = 0f; ;
+ Vertex[] vertices1 =
+ {
+ new Vertex(new Vector4(-W, H, D, 1f), Color4.Yellow),
+ new Vertex(new Vector4(-W, -H, D, 1f), Color4.Yellow),
+ new Vertex(new Vector4( W, H, D, 1f), Color4.Yellow),
+ };
+ _renderObjects.Add(new RenderObject(vertices1));
+ Vertex[] vertices2 =
+ {
+ new Vertex(new Vector4( W, -H, D, 1f), Color4.White),
+ new Vertex(new Vector4(-W, -H, D, 1f), Color4.White),
+ new Vertex(new Vector4( W, H, D, 1f), Color4.White),
+ };
+ _renderObjects.Add(new RenderObject(vertices2));
+
+ Vertex[] verticesB =
+ {
+ new Vertex(new Vector4(-0.25f, 0.25f, 0.5f, 1-0f), Color4.HotPink),
+ new Vertex(new Vector4( 0.0f, -0.25f, 0.5f, 1-0f), Color4.HotPink),
+ new Vertex(new Vector4( 0.25f, 0.25f, 0.5f, 1-0f), Color4.HotPink),
+ };
+ _renderObjects.Add(new RenderObject(verticesB));
+ float side = 0.2f;
+ _renderObjects.Add(new RenderObject(ObjectFactory.CreateSolidCube(side, Color4.HotPink)));
+ _renderObjects.Add(new RenderObject(ObjectFactory.CreateSolidCube(side, Color4.BlueViolet)));
+ _renderObjects.Add(new RenderObject(ObjectFactory.CreateSolidCube(side, Color4.Red)));
+ _renderObjects.Add(new RenderObject(ObjectFactory.CreateSolidCube(side, Color4.LimeGreen)));
+
+ GL.CreateTextures(TextureTarget.Texture2D, 1, out texF);
+ GL.CreateTextures(TextureTarget.Texture2D, 1, out texB);
+
+ //loading test bitmaps
+ bmpF = (Bitmap)Bitmap.FromFile("e:\\vr-software\\Color Bkgd + bars in HD.bmp");
+ bmpB = (Bitmap)Bitmap.FromFile("e:\\vr-software\\PruhyTV 00-255.bmp");
+ var dataF = bmpF.LockBits(
+ new Rectangle(0, 0, bmpF.Width, bmpF.Height),
+ ImageLockMode.ReadWrite,
+ System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+ GL.TextureStorage2D(texF, 1, SizedInternalFormat.Rgba8, bmpF.Width, bmpF.Height);
+ GL.BindTexture(TextureTarget.Texture2D, texF);
+ // GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba8, bmpF.Width, bmpF.Height, 0, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, dataF.Scan0);
+ //Invalid operation - dunno why. Inverse GetTexImage works. Iverye loading works both:
+ //GL.GetTexImage(TextureTarget.Texture2D, 0, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, dataF.Scan0);
+ //GL.GetTextureImage(texF, 0, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, bmpF.Width * bmpF.Height * RenderControl.bytePerPixel, dataF.Scan0);
+
+ GL.TextureSubImage2D(texF, 0, 0, 0, bmpF.Width, bmpF.Height, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, dataF.Scan0);
+ bmpF.UnlockBits(dataF);
+ RenderControl.GLError("BmpFLoaded");
+
+ var dataB = bmpB.LockBits(
+ new Rectangle(0, 0, bmpF.Width, bmpF.Height),
+ ImageLockMode.ReadWrite,
+ System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+ GL.BindTexture(TextureTarget.Texture2D, texB);
+ GL.TextureStorage2D(texB, 1, SizedInternalFormat.Rgba8, bmpB.Width, bmpB.Height);
+ GL.TextureSubImage2D(texB, 0, 0, 0, bmpB.Width, bmpB.Height, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, dataB.Scan0);
+ bmpB.UnlockBits(dataB);
+ RenderControl.GLError("BmpBLoaded");
+
+ GL.ActiveTexture(TextureUnit.Texture0);
+ GL.BindTexture(TextureTarget.Texture2D, texB);
+ GL.ActiveTexture(TextureUnit.Texture1);
+ GL.BindTexture(TextureTarget.Texture2D, texF);
+ }
+
+ private void OnClosed(object sender, EventArgs eventArgs)
+ {
+ Exit();
+ }
+
+ public void Exit()
+ {
+ Debug.WriteLine("Exit called");
+ foreach (var obj in _renderObjects)
+ obj.Dispose();
+ GL.DeleteVertexArrays(1, ref _mVertexArray);
+ GL.DeleteProgram(_programExample);
+ GL.DeleteProgram(_programSimple);
+ GL.DeleteProgram(_programChromakey);
+ this.renderControl.Exit();
+ }
+
+ private int CreateProgram(string shadersPrefix)
+ {
+ try
+ {
+ var program = GL.CreateProgram();
+ var shaders = new List();
+ string sh = "Shader\\" + shadersPrefix+"VertexShader.c";
+ shaders.Add(CompileShader(ShaderType.VertexShader, @sh));
+ sh = "Shader\\" + shadersPrefix + "FragmentShader.c";
+ shaders.Add(CompileShader(ShaderType.FragmentShader, @sh));
+
+ foreach (var shader in shaders)
+ GL.AttachShader(program, shader);
+ GL.LinkProgram(program);
+ var info = GL.GetProgramInfoLog(program);
+ if (!string.IsNullOrWhiteSpace(info))
+ throw new Exception($"CompileShaders ProgramLinking had errors: {info}");
+
+ foreach (var shader in shaders)
+ {
+ GL.DetachShader(program, shader);
+ GL.DeleteShader(shader);
+ }
+ return program;
+ }
+ catch (Exception ex)
+ {
+ Debug.WriteLine(ex.ToString());
+ throw;
+ }
+ }
+
+ private int CompileShader(ShaderType type, string path)
+ {
+ var shader = GL.CreateShader(type);
+ var src = File.ReadAllText(path);
+ GL.ShaderSource(shader, src);
+ GL.CompileShader(shader);
+ var info = GL.GetShaderInfoLog(shader);
+ if (!string.IsNullOrWhiteSpace(info))
+ throw new Exception($"CompileShader {type} had errors: {info}");
+ return shader;
+ }
+
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.renderControl = new WindowsFormsApp1.RenderControl();
+ this.SuspendLayout();
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Interval = 20;
+ this.timer1.Tick += new System.EventHandler(this.OnTimerTick);
+ //
+ // renderControl
+ //
+ this.renderControl.BackColor = System.Drawing.Color.Black;
+ this.renderControl.Location = new System.Drawing.Point(24, 22);
+ this.renderControl.Name = "renderControl";
+ this.renderControl.Size = new System.Drawing.Size(300, 400);
+ this.renderControl.TabIndex = 1;
+ this.renderControl.VSync = false;
+ //
+ // MainWindow
+ //
+ this.ClientSize = new System.Drawing.Size(924, 481);
+ this.Controls.Add(this.renderControl);
+ this.Name = "MainWindow";
+ this.ResumeLayout(false);
+
+ }
+
+ protected void OnPaintTestin(PaintEventArgs e)
+ {
+ GL.Viewport(0, 0, Width, Height);
+ renderControl.SetRenderTarget(RenderControl.RenderTarget.ScreenCompat);
+ Drawing.Clean(_backColor);
+ Drawing.DrawViewportPre();
+ Drawing.DrawViewportPost(0.2f, 0.2f, 0.8f, 0.8f, renderControl.Width, renderControl.Height);
+ renderControl.SetRenderTarget(RenderControl.RenderTarget.ScreenCore);
+ GL.UseProgram(_programSimple);
+ Drawing.DrawArrays();
+ GL.UseProgram(0);
+ renderControl.CopyToScreenFramebuffer();
+ renderControl.SwapBuffers();
+ }
+
+ protected override void OnPaint(PaintEventArgs e)
+ {
+ RenderControl.GLError("Paint");
+
+ if (!renderControl.initialized) return;
+ _time = (double)DateTime.Now.Millisecond / 660;
+
+ renderControl.SetRenderTarget(RenderControl.RenderTarget.ScreenCompat);
+ Drawing.Clean(_backColor);
+ Drawing.DrawViewportPre();
+ RenderControl.GLError("Compatible");
+
+ renderControl.SetRenderTarget(RenderControl.RenderTarget.ScreenCore);
+ Matrix4 identity = Matrix4.Identity;
+ var modelView = identity;
+ GL.UseProgram(_programExample);
+ GL.UniformMatrix4(20, false, ref _projectionMatrix);
+ GL.PolygonMode(MaterialFace.FrontAndBack, PolygonMode.Line);
+ // RenderControl.GLInfo("I");
+ float c = 0f;
+ foreach (var renderObject in _renderObjects)
+ {
+ renderObject.Bind();
+ for (int i = 0; i < 5; i++)
+ {
+ var k = i + (float)(_time * (0.05f + (0.1 * c)));
+ var t2 = Matrix4.CreateTranslation(
+ (float)(Math.Sin(k * 5f) * (c + 0.5f)),
+ (float)(Math.Cos(k * 5f) * (c + 0.5f)),
+ -3.5f);
+ var r1 = Matrix4.CreateRotationX(k * 13.0f + i);
+ var r2 = Matrix4.CreateRotationY(k * 13.0f + i);
+ var r3 = Matrix4.CreateRotationZ(k * 3.0f + i);
+ modelView = r1 * r2 * r3 * t2;
+ GL.UniformMatrix4(21, false, ref modelView);
+ renderObject.Render();
+ }
+ c += 0.3f;
+ }
+
+ GL.UniformMatrix4(21, false, ref identity);
+ GL.UniformMatrix4(20, false, ref identity);
+ GL.PolygonMode(MaterialFace.FrontAndBack, PolygonMode.Fill);
+ foreach (var renderObject in _renderObjects)
+ {
+ if (_renderObjects.IndexOf(renderObject) < 2)
+ {
+ renderObject.Bind();
+ // renderObject.Render();
+ }
+ }
+
+ RenderControl.GLError("Check");
+ GL.UseProgram(_programChromakey);
+ modelView = Matrix4.CreateTranslation(0, 0, -2);
+ modelView = modelView * Matrix4.CreateRotationY((float)_time / 3);
+ GL.UniformMatrix4(21, false, ref modelView);
+ GL.UniformMatrix4(20, false, ref _projectionMatrix);
+ // GL.UniformMatrix4(21, false, ref identity);
+ // GL.UniformMatrix4(20, false, ref identity);
+ Vector2 res = new Vector2(bmpB.Width, bmpB.Height);
+ int[] viewport = new int[4];
+ GL.GetInteger(GetPName.Viewport, viewport);
+ Vector2 vp = new Vector2(viewport[2]-viewport[0], viewport[3]-viewport[1]);
+
+ int ch0Loc = GL.GetUniformLocation(_programChromakey, "iChannel0");
+ int ch1Loc = GL.GetUniformLocation(_programChromakey, "iChannel1");
+ int resLoc = GL.GetUniformLocation(_programChromakey, "iTextureResolution");
+ int vpLoc = GL.GetUniformLocation(_programChromakey, "iViewportSize");
+ int timeLoc = GL.GetUniformLocation(_programChromakey, "time");
+ GL.Uniform1(ch0Loc, 0);
+ GL.Uniform1(ch1Loc, 1);
+ GL.Uniform2(resLoc, ref res);
+ GL.Uniform2(vpLoc, ref vp);
+ GL.VertexAttrib1(2, (float)_time);
+
+ GL.Enable(EnableCap.Blend);
+ GL.BlendFuncSeparate(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha, BlendingFactorSrc.SrcAlpha, BlendingFactorDest.One);
+ GL.DepthMask(false);
+
+
+ GL.PolygonMode(MaterialFace.FrontAndBack, PolygonMode.Fill);
+ foreach (var renderObject in _renderObjects)
+ {
+ if (_renderObjects.IndexOf(renderObject) < 2)
+ {
+ renderObject.Bind();
+ renderObject.Render();
+ }
+ }
+ GL.Disable(EnableCap.Blend);
+ GL.DepthMask(true);
+ RenderControl.GLError("EndChromakey");
+
+ GL.UseProgram(_programSimple);
+ // GL.VertexAttrib4(0, 1d, 0.5d, 0.5d, 1d);
+ // GL.VertexAttrib4(1, 0.5d, 0.5d, 1d, 1d);
+ GL.VertexAttrib1(2, (float)_time);
+ GL.PointSize(20);
+ GL.DrawArrays(PrimitiveType.Points, 0, 1);
+
+ renderControl.SetRenderTarget(RenderControl.RenderTarget.ScreenCompat);
+ Drawing.DrawViewportPost(0.2f, 0.2f, 0.2f + 0.5f * _time/5, 0.8f, renderControl.Width, renderControl.Height);
+
+ renderControl.CopyToScreenFramebuffer();
+ renderControl.SwapBuffers();
+ count++;
+ GL.UseProgram(0);
+
+ //Console.WriteLine(count.ToString()+" - "+ _time.ToString());
+ }
+
+ private void CreateProjection()
+ {
+
+ var aspectRatio = (float)renderControl.Width / renderControl.Height;
+ _projectionMatrix = Matrix4.CreatePerspectiveFieldOfView(
+ 60 * ((float)Math.PI / 180f), // field of view angle, in radians
+ aspectRatio, // current window aspect ratio
+ 0.1f, // near plane
+ 4000f); // far plane
+ }
+ private void OnTimerTick(object sender, EventArgs e)
+ {
+ OnPaint(null);
+ }
+ }
+
+ public struct Vertex
+ {
+ public const int Size = (4 + 4) * 4; // size of struct in bytes
+
+ private readonly Vector4 _position;
+ private readonly Color4 _color;
+
+ public Vertex(Vector4 position, Color4 color)
+ {
+ _position = position;
+ _color = color;
+ }
+ }
+ public class ObjectFactory
+ {
+ public static Vertex[] CreateSolidCube(float side, Color4 color)
+ {
+ side = side / 2f; // half side - and other half
+ Vertex[] vertices =
+ {
+ new Vertex(new Vector4(-side, -side, -side, 1.0f), color),
+ new Vertex(new Vector4(-side, -side, side, 1.0f), color),
+ new Vertex(new Vector4(-side, side, -side, 1.0f), color),
+ new Vertex(new Vector4(-side, side, -side, 1.0f), color),
+ new Vertex(new Vector4(-side, -side, side, 1.0f), color),
+ new Vertex(new Vector4(-side, side, side, 1.0f), color),
+
+ new Vertex(new Vector4(side, -side, -side, 1.0f), color),
+ new Vertex(new Vector4(side, side, -side, 1.0f), color),
+ new Vertex(new Vector4(side, -side, side, 1.0f), color),
+ new Vertex(new Vector4(side, -side, side, 1.0f), color),
+ new Vertex(new Vector4(side, side, -side, 1.0f), color),
+ new Vertex(new Vector4(side, side, side, 1.0f), color),
+
+ new Vertex(new Vector4(-side, -side, -side, 1.0f), color),
+ new Vertex(new Vector4(side, -side, -side, 1.0f), color),
+ new Vertex(new Vector4(-side, -side, side, 1.0f), color),
+ new Vertex(new Vector4(-side, -side, side, 1.0f), color),
+ new Vertex(new Vector4(side, -side, -side, 1.0f), color),
+ new Vertex(new Vector4(side, -side, side, 1.0f), color),
+
+ new Vertex(new Vector4(-side, side, -side, 1.0f), color),
+ new Vertex(new Vector4(-side, side, side, 1.0f), color),
+ new Vertex(new Vector4(side, side, -side, 1.0f), color),
+ new Vertex(new Vector4(side, side, -side, 1.0f), color),
+ new Vertex(new Vector4(-side, side, side, 1.0f), color),
+ new Vertex(new Vector4(side, side, side, 1.0f), color),
+
+ new Vertex(new Vector4(-side, -side, -side, 1.0f), color),
+ new Vertex(new Vector4(-side, side, -side, 1.0f), color),
+ new Vertex(new Vector4(side, -side, -side, 1.0f), color),
+ new Vertex(new Vector4(side, -side, -side, 1.0f), color),
+ new Vertex(new Vector4(-side, side, -side, 1.0f), color),
+ new Vertex(new Vector4(side, side, -side, 1.0f), color),
+
+ new Vertex(new Vector4(-side, -side, side, 1.0f), color),
+ new Vertex(new Vector4(side, -side, side, 1.0f), color),
+ new Vertex(new Vector4(-side, side, side, 1.0f), color),
+ new Vertex(new Vector4(-side, side, side, 1.0f), color),
+ new Vertex(new Vector4(side, -side, side, 1.0f), color),
+ new Vertex(new Vector4(side, side, side, 1.0f), color),
+ };
+ return vertices;
+ }
+ }
+ public class RenderObject : IDisposable
+ {
+ private bool _initialized;
+ private readonly int _vertexArray;
+ private readonly int _buffer;
+ private readonly int _verticeCount;
+ public RenderObject(Vertex[] vertices)
+ {
+ _verticeCount = vertices.Length;
+ _vertexArray = GL.GenVertexArray();
+ GL.BindVertexArray(_vertexArray);
+ _buffer = GL.GenBuffer();
+ GL.BindBuffer(BufferTarget.ArrayBuffer, _buffer);
+ GL.NamedBufferStorage(
+ _buffer,
+ Vertex.Size * vertices.Length, // the size needed by this buffer
+ vertices, // data to initialize with
+ BufferStorageFlags.MapWriteBit); // at this point we will only write to the buffer
+
+ GL.VertexArrayAttribBinding(_vertexArray, 0, 0);
+ GL.EnableVertexArrayAttrib(_vertexArray, 0);
+ GL.VertexArrayAttribFormat(
+ _vertexArray,
+ 0, // attribute index, from the shader location = 0
+ 4, // size of attribute, vec4
+ VertexAttribType.Float, // contains floats
+ false, // does not need to be normalized as it is already, floats ignore this flag anyway
+ 0); // relative offsetm first item
+ GL.VertexArrayAttribBinding(_vertexArray, 1, 0);
+ GL.EnableVertexArrayAttrib(_vertexArray, 1);
+ GL.VertexArrayAttribFormat(
+ _vertexArray,
+ 1, // attribute index, from the shader location = 1
+ 4, // size of attribute, vec4
+ VertexAttribType.Float, // contains floats
+ false, // does not need to be normalized as it is already, floats ignore this flag anyway
+ 16); // relative offset after a vec4
+ GL.VertexArrayVertexBuffer(_vertexArray, 0, _buffer, IntPtr.Zero, Vertex.Size);
+ _initialized = true;
+ }
+ public void Bind()
+ {
+ GL.BindVertexArray(_vertexArray);
+ }
+ public void Render()
+ {
+ GL.DrawArrays(PrimitiveType.Triangles, 0, _verticeCount);
+ }
+
+ public void Dispose()
+ {
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ protected virtual void Dispose(bool disposing)
+ {
+ if (disposing)
+ {
+ if (_initialized)
+ {
+ GL.DeleteVertexArray(_vertexArray);
+ GL.DeleteBuffer(_buffer);
+ _initialized = false;
+ }
+ }
+ }
+ }
+}
+
diff --git a/WindowsFormsApp1/MainWindow.resx b/WindowsFormsApp1/MainWindow.resx
new file mode 100644
index 0000000..1f666f2
--- /dev/null
+++ b/WindowsFormsApp1/MainWindow.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/WindowsFormsApp1/OpenTK.dll.config b/WindowsFormsApp1/OpenTK.dll.config
new file mode 100644
index 0000000..7098d39
--- /dev/null
+++ b/WindowsFormsApp1/OpenTK.dll.config
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WindowsFormsApp1/OpenTKOpenGL4Test.csproj b/WindowsFormsApp1/OpenTKOpenGL4Test.csproj
new file mode 100644
index 0000000..c4e9da1
--- /dev/null
+++ b/WindowsFormsApp1/OpenTKOpenGL4Test.csproj
@@ -0,0 +1,117 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}
+ Exe
+ OpenTKOpenGL4Test
+ OpenTKOpenGL4Test
+ v4.6.1
+ 512
+ true
+
+
+ AnyCPU
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+
+
+ ..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll
+
+
+ ..\packages\OpenTK.GLControl.3.0.1\lib\net20\OpenTK.GLControl.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Form
+
+
+
+
+ UserControl
+
+
+ MainWindow.cs
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+ Designer
+
+
+ True
+ Resources.resx
+ True
+
+
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+ True
+ Settings.settings
+ True
+
+
+
+
+
+
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+
+
\ No newline at end of file
diff --git a/WindowsFormsApp1/Program.cs b/WindowsFormsApp1/Program.cs
new file mode 100644
index 0000000..718ee9f
--- /dev/null
+++ b/WindowsFormsApp1/Program.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace WindowsFormsApp1
+{
+ static class Program
+ {
+ ///
+ /// Hlavní vstupní bod aplikace.
+ ///
+ [MTAThread]
+ static void Main()
+ {
+// for (int i = 0; i < 4; i++)
+ {
+ var mainWindow = new MainWindow();
+ Application.Run(mainWindow);
+ }
+
+ // var mainGameWindow = new MainGameWindow();
+ // mainGameWindow.Run(60);
+
+ }
+ }
+}
diff --git a/WindowsFormsApp1/Properties/AssemblyInfo.cs b/WindowsFormsApp1/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..79aee72
--- /dev/null
+++ b/WindowsFormsApp1/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Obecné informace o sestavení se řídí přes následující
+// sadu atributů. Změnou hodnot těchto atributů se upraví informace
+// přidružené k sestavení.
+[assembly: AssemblyTitle("WindowsFormsApp1")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("WindowsFormsApp1")]
+[assembly: AssemblyCopyright("Copyright © 2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Nastavení ComVisible na false způsobí neviditelnost typů v tomto sestavení
+// pro komponenty modelu COM. Pokud potřebujete přístup k typu v tomto sestavení
+// modelu COM, nastavte atribut ComVisible daného typu na hodnotu True.
+[assembly: ComVisible(false)]
+
+// Následující GUID se používá pro ID knihovny typů, pokud je tento projekt vystavený pro COM.
+[assembly: Guid("07dc153b-dea9-47bf-a6b6-54f4078fed34")]
+
+// Informace o verzi sestavení se skládá z těchto čtyř hodnot:
+//
+// Hlavní verze
+// Podverze
+// Číslo sestavení
+// Revize
+//
+// Můžete zadat všechny hodnoty nebo nastavit výchozí číslo buildu a revize pomocí *, jak je vidět níže:
+// pomocí zástupného znaku * takto:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/WindowsFormsApp1/Properties/Resources.Designer.cs b/WindowsFormsApp1/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..5e11f9a
--- /dev/null
+++ b/WindowsFormsApp1/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+//
+// Tento kód byl generován nástrojem.
+// Verze modulu runtime:4.0.30319.42000
+//
+// Změny tohoto souboru mohou způsobit nesprávné chování a budou ztraceny,
+// dojde-li k novému generování kódu.
+//
+//------------------------------------------------------------------------------
+
+namespace OpenTKOpenGL4Test.Properties {
+ using System;
+
+
+ ///
+ /// Třída prostředků se silnými typy pro vyhledávání lokalizovaných řetězců atp.
+ ///
+ // Tato třída byla automaticky generována třídou StronglyTypedResourceBuilder
+ // pomocí nástroje podobného aplikaci ResGen nebo Visual Studio.
+ // Chcete-li přidat nebo odebrat člena, upravte souboru .ResX a pak znovu spusťte aplikaci ResGen
+ // s parametrem /str nebo znovu sestavte projekt aplikace Visual Studio.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Vrací instanci ResourceManager uloženou v mezipaměti použitou touto třídou.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenTKOpenGL4Test.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Potlačí vlastnost CurrentUICulture aktuálního vlákna pro všechna
+ /// vyhledání prostředků pomocí třídy prostředků se silnými typy.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+ }
+}
diff --git a/WindowsFormsApp1/Properties/Resources.resx b/WindowsFormsApp1/Properties/Resources.resx
new file mode 100644
index 0000000..af7dbeb
--- /dev/null
+++ b/WindowsFormsApp1/Properties/Resources.resx
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/WindowsFormsApp1/Properties/Settings.Designer.cs b/WindowsFormsApp1/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..dc5358b
--- /dev/null
+++ b/WindowsFormsApp1/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+//
+// Tento kód byl generován nástrojem.
+// Verze modulu runtime:4.0.30319.42000
+//
+// Změny tohoto souboru mohou způsobit nesprávné chování a budou ztraceny,
+// dojde-li k novému generování kódu.
+//
+//------------------------------------------------------------------------------
+
+namespace OpenTKOpenGL4Test.Properties {
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default {
+ get {
+ return defaultInstance;
+ }
+ }
+ }
+}
diff --git a/WindowsFormsApp1/Properties/Settings.settings b/WindowsFormsApp1/Properties/Settings.settings
new file mode 100644
index 0000000..3964565
--- /dev/null
+++ b/WindowsFormsApp1/Properties/Settings.settings
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/WindowsFormsApp1/RenderControl.cs b/WindowsFormsApp1/RenderControl.cs
new file mode 100644
index 0000000..a71032f
--- /dev/null
+++ b/WindowsFormsApp1/RenderControl.cs
@@ -0,0 +1,318 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Open 3D Model Viewer (open3mod) (v2.0)
+// [RenderControl.cs]
+// (c) 2012-2015, Open3Mod Contributors
+//
+// Licensed under the terms and conditions of the 3-clause BSD license. See
+// the LICENSE file in the root folder of the repository for the details.
+//
+// HIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+///////////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+
+
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Graphics.OpenGL;
+
+namespace WindowsFormsApp1
+{
+ ///
+ /// Derivative of GLControl to be able to specify constructor
+ /// parameters while still being usable with the WinForms designer.
+ ///
+ /// The RenderControl always requests a stencil buffer and a 24 bit depth
+ /// buffer, which should be natively supported by most hardware in use today.
+ ///
+ /// Sets up two contexts, one Compatible and one Core, both sharing one pair of Renderbuffers
+ /// Render should go always to that Framebuffer(s) and before Swapbuffers we copy everything to onscreen Framebuffer
+ /// RenderControl also sets separate pair of Framebuffers for offscreen rendering of video.
+ ///
+ /// MultiSampling is requested according to the current value of
+ /// GraphicsSettings.Default.UseMultiSampling.
+ /// MultiSampling is requested according to the current value of
+ /// GraphicsSettings.Default.UseMultiSampling.
+ ///
+ ///
+ class RenderControl : GLControl
+ {
+ static int numBuffers = 2;
+ int[] renderBuffer = new int[numBuffers];
+ int[] depthBuffer = new int[numBuffers];
+ int[] frameBuffer = new int[numBuffers*2];
+ int[] pixelPackBuffer = new int[numBuffers];
+ int[] pixelUnpackBuffer = new int[numBuffers];
+ public bool initialized = false;
+ //buffers size: 0 - screen, 1 - video
+ public const byte bytePerPixel = 4;
+ GLControl glCore;
+
+ public RenderControl()
+ : base(new GraphicsMode(new ColorFormat(32), 24, 8, GetSampleCount()))
+// : base(new GraphicsMode(new ColorFormat(32), 24, 8, GetSampleCount(GraphicsSettings.Default.MultiSampling)))
+ {
+ glCore = new OpenTK.GLControl(new GraphicsMode(new ColorFormat(32), 24, 8, 0), 4, 5, 0);
+ //glCompatible GL = 2.1 (2.1.0)
+ }
+
+ ///
+ /// Enumerates available rendering targets.
+ ///
+ ///
+ public enum RenderTarget
+ {
+ ScreenDirect = 0,
+ ScreenCompat = 1,
+ ScreenCore = 2,
+ VideoCompat = 3,
+ VideoCore = 4,
+ }
+
+ ///
+ /// Binds Renderbuffers to Framebuffer.
+ ///
+ ///
+ public void BindBuffers(int frameIndex, int renderIndex)
+ {
+ GL.BindFramebuffer(FramebufferTarget.Framebuffer, frameBuffer[frameIndex]);
+ GL.FramebufferRenderbuffer(FramebufferTarget.Framebuffer, FramebufferAttachment.ColorAttachment0, RenderbufferTarget.Renderbuffer, renderBuffer[renderIndex]);
+ GL.FramebufferRenderbuffer(FramebufferTarget.Framebuffer, FramebufferAttachment.DepthStencilAttachment, RenderbufferTarget.Renderbuffer, depthBuffer[renderIndex]);
+ FramebufferErrorCode status = GL.CheckFramebufferStatus(FramebufferTarget.Framebuffer);
+ if (status != FramebufferErrorCode.FramebufferComplete &&
+ status != FramebufferErrorCode.FramebufferCompleteExt)
+ {
+ Console.WriteLine("Error creating framebuffer: {0}", status);
+ }
+ }
+
+ ///
+ /// Sets up initiate values and buffers.
+ ///
+ ///
+ public void InitGlControl(int videoSizeX, int videoSizeY)
+ {
+ GL.GenFramebuffers(numBuffers * 2, frameBuffer);
+ GL.GenRenderbuffers(numBuffers, renderBuffer);
+ GL.GenRenderbuffers(numBuffers, depthBuffer);
+ GL.GenBuffers(numBuffers, pixelPackBuffer);
+ GL.GenBuffers(numBuffers, pixelUnpackBuffer);
+
+ GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, renderBuffer[0]);
+ GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferStorage.Rgba8, Width, Height);
+ GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, depthBuffer[0]);
+ GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferStorage.Depth24Stencil8, Width, Height);
+
+ GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, renderBuffer[1]);
+ GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferStorage.Rgba8, videoSizeX, videoSizeY);
+ GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, depthBuffer[1]);
+ GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferStorage.Depth24Stencil8, videoSizeX, videoSizeY);
+ this.MakeCurrent();
+ BindBuffers(0, 0);
+ BindBuffers(2, 1);
+ GL.BindBuffer(BufferTarget.PixelPackBuffer, pixelPackBuffer[0]);
+ GL.BufferData(BufferTarget.PixelPackBuffer, (IntPtr)(Width * Height * bytePerPixel), (IntPtr)0, BufferUsageHint.DynamicCopy);
+ GL.BindBuffer(BufferTarget.PixelPackBuffer, 0);
+ GL.BindBuffer(BufferTarget.PixelUnpackBuffer, pixelUnpackBuffer[0]);
+ GL.BufferData(BufferTarget.PixelUnpackBuffer, (IntPtr)(Width * Height * bytePerPixel), (IntPtr)0, BufferUsageHint.DynamicCopy);
+ GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0);
+
+ glCore.MakeCurrent();
+ BindBuffers(1, 0);
+ BindBuffers(3, 1);
+ GL.BindBuffer(BufferTarget.PixelPackBuffer, pixelPackBuffer[1]);
+ GL.BufferData(BufferTarget.PixelPackBuffer, (IntPtr)(videoSizeX * videoSizeY * bytePerPixel), (IntPtr)0, BufferUsageHint.DynamicRead);
+ GL.BindBuffer(BufferTarget.PixelPackBuffer, 0);
+ GL.BindBuffer(BufferTarget.PixelUnpackBuffer, pixelUnpackBuffer[1]);
+ GL.BufferData(BufferTarget.PixelUnpackBuffer, (IntPtr)(videoSizeX * videoSizeY * bytePerPixel), (IntPtr)0, BufferUsageHint.DynamicDraw);
+ GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0);
+ initialized = true;
+ }
+
+ ///
+ /// Changes buffer sizes in case of resizing.
+ /// Video buffers remain unchanged.
+ /// RenderTarget.ScreenCore setting is needed here to keep Core working.
+ ///
+ ///
+ public void ResizeGlControl(int _width, int _height, int _left, int _top)
+ {
+ SetRenderTarget(RenderTarget.ScreenCompat);
+ Width = _width;
+ Height = _height;
+ Left = _left;
+ Top = _top;
+ SetRenderTarget(RenderTarget.ScreenCore);
+ glCore.Width = _width;
+ glCore.Height = _height;
+ glCore.Left = _left;
+ glCore.Top = _top;
+ GL.Viewport(Left, Top, Width, Height);
+ if (!initialized) return;
+ GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, renderBuffer[0]);
+ GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferStorage.Rgba8, Width, Height);
+ GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, depthBuffer[0]);
+ GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferStorage.Depth24Stencil8, Width, Height);
+
+ GL.BindBuffer(BufferTarget.PixelPackBuffer, pixelPackBuffer[0]);
+ GL.BufferData(BufferTarget.PixelPackBuffer, (IntPtr)(Width * Height * bytePerPixel), (IntPtr)0, BufferUsageHint.DynamicCopy);
+ GL.BindBuffer(BufferTarget.PixelPackBuffer, 0);
+ GL.BindBuffer(BufferTarget.PixelUnpackBuffer, pixelUnpackBuffer[0]);
+ GL.BufferData(BufferTarget.PixelUnpackBuffer, (IntPtr)(Width * Height * bytePerPixel), (IntPtr)0, BufferUsageHint.DynamicCopy);
+ GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0);
+
+ }
+
+ ///
+ /// Switches between all available targets.
+ ///
+ ///
+ public void SetRenderTarget(RenderTarget rt)
+ {
+ switch (rt)
+ {
+ case RenderTarget.ScreenDirect:
+ this.MakeCurrent();
+ GL.BindFramebuffer(FramebufferTarget.Framebuffer, 0);
+ break;
+ case RenderTarget.ScreenCompat:
+ this.MakeCurrent();
+ ErrorCode err = GL.GetError();
+ GL.BindFramebuffer(FramebufferTarget.Framebuffer, frameBuffer[0]);
+ break;
+ case RenderTarget.ScreenCore:
+ glCore.MakeCurrent();
+ GL.BindFramebuffer(FramebufferTarget.Framebuffer, frameBuffer[1]);
+ break;
+ case RenderTarget.VideoCompat:
+ this.MakeCurrent();
+ GL.BindFramebuffer(FramebufferTarget.Framebuffer, frameBuffer[2]);
+ break;
+ case RenderTarget.VideoCore:
+ glCore.MakeCurrent();
+ GL.BindFramebuffer(FramebufferTarget.Framebuffer, frameBuffer[3]);
+ break;
+ }
+ }
+
+ ///
+ /// Fast copy from shared Renderbuffer to onscreen Renderbuffer.
+ ///
+ ///
+ public void CopyToScreenFramebuffer()
+ {
+ SetRenderTarget(RenderControl.RenderTarget.ScreenCompat);
+ GL.BindBuffer(BufferTarget.PixelPackBuffer, pixelPackBuffer[0]);
+ GL.BindBuffer(BufferTarget.PixelUnpackBuffer, pixelUnpackBuffer[0]);
+
+ GL.ReadPixels(0, 0, Width, Height, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, (IntPtr)0);
+ GL.CopyBufferSubData(BufferTarget.PixelPackBuffer, BufferTarget.PixelUnpackBuffer, (IntPtr)0, (IntPtr)0, (IntPtr)(Width * Height * bytePerPixel));
+ SetRenderTarget(RenderControl.RenderTarget.ScreenDirect);
+ GL.DrawPixels(Width, Height, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, (IntPtr)0);
+
+ GL.BindBuffer(BufferTarget.PixelPackBuffer, 0);
+ GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0);
+ }
+
+ ///
+ /// Converts a value for GraphicsSettings.Default.MultiSampling into a device-specific
+ /// sample count.
+ ///
+ /// Device-independent quality level in [0,3]
+ /// Sample count for device
+ private static int GetSampleCount()
+ {
+ // UI names:
+ /* None
+ Slight
+ Normal
+ Maximum
+ */
+// int multiSampling = GraphicsSettings.Default.MultiSampling;
+ int multiSampling = 2;
+ switch (multiSampling)
+ {
+ case 0:
+ return 0;
+ case 1:
+ return 2;
+ case 2:
+ return 4;
+ case 3:
+ return MaximumSampleCount();
+
+ }
+ Debug.Assert(false);
+ return 0;
+ }
+
+ ///
+ /// Determines the maximum number of FSAA samples supported by the hardware.
+ ///
+ ///
+ private static int MaximumSampleCount()
+ {
+ // http://www.opentk.com/node/2355 modified to actually work
+ var highest = 0;
+ var aa = 0;
+ do
+ {
+ var mode = new GraphicsMode(32, 0, 0, aa);
+ if(mode.Samples == aa && mode.Samples > highest)
+ {
+ highest = mode.Samples;
+ }
+ aa += 2;
+ } while (aa <= 32);
+ return highest;
+ }
+
+ ///
+ /// Cleanup.
+ ///
+ ///
+ public void Exit()
+ {
+ GL.DeleteFramebuffers(numBuffers*2, frameBuffer);
+ GL.DeleteRenderbuffers(numBuffers, renderBuffer);
+ GL.DeleteRenderbuffers(numBuffers, depthBuffer);
+ GL.DeleteBuffers(numBuffers, pixelPackBuffer);
+ GL.DeleteBuffers(numBuffers, pixelUnpackBuffer);
+ }
+
+ public static void GLInfo(string ID)
+ {
+ Console.WriteLine("Info ID: " + ID);
+ GLError(ID);
+ string ver = GL.GetString(StringName.Version);
+ Console.WriteLine(ver);
+ ver = GL.GetString(StringName.Renderer);
+ Console.WriteLine(ver);
+ ver = GL.GetString(StringName.Vendor);
+ Console.WriteLine(ver);
+ ver = GL.GetString(StringName.ShadingLanguageVersion);
+ Console.WriteLine(ver);
+ }
+
+ public static void GLError(string where)
+ {
+ ErrorCode err = GL.GetError();
+ if (err != ErrorCode.NoError) Console.WriteLine("Error reported at "+ where + ": " + err.ToString());
+ }
+ }
+}
+
+/* vi: set shiftwidth=4 tabstop=4: */
\ No newline at end of file
diff --git a/WindowsFormsApp1/Shader/chromakeyFragmentShader.c b/WindowsFormsApp1/Shader/chromakeyFragmentShader.c
new file mode 100644
index 0000000..f40506c
--- /dev/null
+++ b/WindowsFormsApp1/Shader/chromakeyFragmentShader.c
@@ -0,0 +1,78 @@
+#version 450
+out vec4 fragColor;
+in vec4 vs_color;
+//in vec4 vs_position;
+
+uniform sampler2D iChannel0; // input channel Bkgd
+uniform sampler2D iChannel1; // input channel Frgd
+uniform vec2 iTextureResolution; // image /texture resolution (in pixels)
+uniform vec2 iViewportSize; // image /texture resolution (in pixels)
+
+
+vec3 rgb2hsv(vec3 rgb)
+{
+ float Cmax = max(rgb.r, max(rgb.g, rgb.b));
+ float Cmin = min(rgb.r, min(rgb.g, rgb.b));
+ float delta = Cmax - Cmin;
+
+ vec3 hsv = vec3(0., 0., Cmax);
+
+ if (Cmax > Cmin)
+ {
+ hsv.y = delta / Cmax;
+
+ if (rgb.r == Cmax)
+ hsv.x = (rgb.g - rgb.b) / delta;
+ else
+ {
+ if (rgb.g == Cmax)
+ hsv.x = 2. + (rgb.b - rgb.r) / delta;
+ else
+ hsv.x = 4. + (rgb.r - rgb.g) / delta;
+ }
+ hsv.x = fract(hsv.x / 6.);
+ }
+ return hsv;
+}
+
+float chromaKey(vec3 color)
+{
+ vec3 backgroundColor = vec3(0.157, 0.576, 0.129);
+ vec3 weights = vec3(4.0, 1.0, 2.0);
+
+ vec3 hsv = rgb2hsv(color);
+ vec3 target = rgb2hsv(backgroundColor);
+ float dist = length(weights * (target - hsv));
+ return 1. - clamp(3. * dist - 1.5, 0., 1.0);
+}
+
+vec3 changeSaturation(vec3 color, float saturation)
+{
+ float luma = dot(vec3(0.213, 0.715, 0.072) * color, vec3(1.0));
+ return mix(vec3(luma), color, saturation);
+}
+
+void main(void)
+{
+ vec2 scale = iViewportSize / iTextureResolution;
+ vec2 uv = gl_FragCoord.xy / iTextureResolution.xy;
+ //uv - at the border of image/texture value is 1 - but is positioned where rectangle fits in image;
+// ivec2 texPos = ivec2((vs_position.x + 0.5) * iTextureResolution.x, (-vs_position.y + 0.5) * iTextureResolution.y);
+ ivec2 texPos = ivec2((gl_FragCoord.x - 0.5)/scale.x, iTextureResolution.y-(gl_FragCoord.y - 0.5)/scale.y);
+ // vec3 color = texture(iChannel0, uv).rgb;
+ vec3 color = texelFetch(iChannel1, texPos, 0).rgb;
+ vec3 bg = texelFetch(iChannel0, texPos, 0).rgb;
+
+
+ float incrustation = chromaKey(color);
+ //color = changeSaturation(color, 0.5);
+ //color = mix(color, bg, incrustation);
+
+ //fragColor = vs_color;
+ //fragColor = texture(iChannel0, -uv);
+ //fragColor = texelFetch(iChannel0, texPos, 0);
+ //fragColor = vec4(color, 1.0);
+ fragColor = vec4(color, 1-incrustation);
+ //fragColor = vec4(gl_FragCoord.x/1000, gl_FragCoord.y/1000, 0, 1);
+}
+
diff --git a/WindowsFormsApp1/Shader/chromakeyVertexShader.c b/WindowsFormsApp1/Shader/chromakeyVertexShader.c
new file mode 100644
index 0000000..93765a9
--- /dev/null
+++ b/WindowsFormsApp1/Shader/chromakeyVertexShader.c
@@ -0,0 +1,31 @@
+#version 450
+
+layout(location = 0) in vec4 position;
+layout(location = 1) in vec4 color;
+layout(location = 2) in float time;
+
+out vec4 vs_color;
+//out vec4 vs_position;
+
+layout(location = 20) uniform mat4 projection;
+layout(location = 21) uniform mat4 modelView;
+
+void main(void)
+{
+ vs_color = color;
+ gl_Position = projection * modelView * position;
+ //vs_position = projection * modelView * position;
+
+// gl_Position = vec4(time, -0.25, 0.5, 1.0);
+// vs_position = vec4(time/10, -0.25, 1, 1.0);
+
+ //vs_color = vec4(sin(time * 5) * 0.5 + 0.5, 0, cos(time * 5) * 0.5 + 0.5, 1.0);
+}
+
+
+
+
+
+
+
+//}
diff --git a/WindowsFormsApp1/Shader/exampleFragmentShader.c b/WindowsFormsApp1/Shader/exampleFragmentShader.c
new file mode 100644
index 0000000..b1ce986
--- /dev/null
+++ b/WindowsFormsApp1/Shader/exampleFragmentShader.c
@@ -0,0 +1,10 @@
+#version 450
+out vec4 color;
+in vec4 vs_color;
+
+void main(void)
+{
+// color = vec4(1.0, 0.0, 0.0, 1.0);
+ color = vs_color;
+}
+
diff --git a/WindowsFormsApp1/Shader/exampleVertexShader.c b/WindowsFormsApp1/Shader/exampleVertexShader.c
new file mode 100644
index 0000000..78f0c7f
--- /dev/null
+++ b/WindowsFormsApp1/Shader/exampleVertexShader.c
@@ -0,0 +1,29 @@
+#version 450
+
+layout(location = 0) in vec4 position;
+layout(location = 1) in vec4 color;
+layout(location = 2) in float time;
+
+out vec4 vs_color;
+
+layout(location = 20) uniform mat4 projection;
+layout(location = 21) uniform mat4 modelView;
+
+void main(void)
+{
+ gl_Position = projection * modelView * position;
+ vs_color = color;
+ //vs_color = vec4(sin(time * 5) * 0.5 + 0.5, 0, cos(time * 5) * 0.5 + 0.5, 1.0);
+// gl_Position = vec4(0.25, -0.25, 0.5, 1.0);
+}
+
+
+
+
+
+
+
+
+
+
+//}
diff --git a/WindowsFormsApp1/Shader/simpleFragmentShader.c b/WindowsFormsApp1/Shader/simpleFragmentShader.c
new file mode 100644
index 0000000..b1ce986
--- /dev/null
+++ b/WindowsFormsApp1/Shader/simpleFragmentShader.c
@@ -0,0 +1,10 @@
+#version 450
+out vec4 color;
+in vec4 vs_color;
+
+void main(void)
+{
+// color = vec4(1.0, 0.0, 0.0, 1.0);
+ color = vs_color;
+}
+
diff --git a/WindowsFormsApp1/Shader/simpleVertexShader.c b/WindowsFormsApp1/Shader/simpleVertexShader.c
new file mode 100644
index 0000000..abbb11c
--- /dev/null
+++ b/WindowsFormsApp1/Shader/simpleVertexShader.c
@@ -0,0 +1,22 @@
+#version 450
+
+layout(location = 2) in float time;
+
+out vec4 vs_color;
+
+void main(void)
+{
+ vs_color = vec4(sin(time * 5) * 0.5 + 0.5, 0, cos(time * 5) * 0.5 + 0.5, 1.0);
+// gl_Position = vec4(0.25, -0.25, 0.5, 1.0);
+}
+
+
+
+
+
+
+
+
+
+
+//}
diff --git a/WindowsFormsApp1/packages.config b/WindowsFormsApp1/packages.config
new file mode 100644
index 0000000..c96d3c7
--- /dev/null
+++ b/WindowsFormsApp1/packages.config
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/design/ImagesHUD.comp b/design/ImagesHUD.comp
new file mode 100644
index 0000000..4ef9c49
--- /dev/null
+++ b/design/ImagesHUD.comp
@@ -0,0 +1,1090 @@
+Composition {
+ CurrentTime = 0,
+ RenderRange = { 0, 0 },
+ GlobalRange = { 0, 1 },
+ CurrentID = 146,
+ HiQ = true,
+ MotionBlur = false,
+ PlaybackUpdateMode = 0,
+ Version = "Fusion 9.0.1 build 3",
+ SavedOutputs = 1,
+ HeldTools = 0,
+ DisabledTools = 10,
+ LockedTools = 0,
+ AudioOffset = 0,
+ Resumable = true,
+ OutputClips = {
+ "comp:\\VRModels.png"
+ },
+ Tools = {
+ Loader1 = Loader {
+ Clips = {
+ Clip {
+ ID = "Clip1",
+ Filename = "E:\\vr-software\\open3mod-master\\open3mod\\Images\\HUD_Picking_Hover.png",
+ FormatID = "PNGFormat",
+ StartFrame = -1,
+ LengthSetManually = true,
+ TrimIn = 0,
+ TrimOut = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 0,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = 0,
+ GlobalEnd = 0
+ }
+ },
+ Inputs = {
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ },
+ ViewInfo = OperatorInfo { Pos = { 165, 115.5 } },
+ },
+ Loader2 = Loader {
+ Clips = {
+ Clip {
+ ID = "Clip1",
+ Filename = "E:\\vr-software\\open3mod-master\\open3mod\\Images\\HUD_Picking_Normal.png",
+ FormatID = "PNGFormat",
+ StartFrame = -1,
+ LengthSetManually = true,
+ TrimIn = 0,
+ TrimOut = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 0,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = 0,
+ GlobalEnd = 0
+ }
+ },
+ Inputs = {
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ },
+ ViewInfo = OperatorInfo { Pos = { 165, 148.5 } },
+ },
+ Loader3 = Loader {
+ Clips = {
+ Clip {
+ ID = "Clip1",
+ Filename = "E:\\vr-software\\open3mod-master\\open3mod\\Images\\HUD_Picking_Selected.png",
+ FormatID = "PNGFormat",
+ StartFrame = -1,
+ LengthSetManually = true,
+ TrimIn = 0,
+ TrimOut = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 0,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = 0,
+ GlobalEnd = 0
+ }
+ },
+ Inputs = {
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ },
+ ViewInfo = OperatorInfo { Pos = { 165, 181.5 } },
+ },
+ Loader4 = Loader {
+ Clips = {
+ Clip {
+ ID = "Clip1",
+ Filename = "E:\\vr-software\\open3mod-master\\SteamVRImage.png",
+ FormatID = "PNGFormat",
+ StartFrame = -1,
+ LengthSetManually = true,
+ TrimIn = 0,
+ TrimOut = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 0,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = 0,
+ GlobalEnd = 0
+ }
+ },
+ Inputs = {
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ },
+ ViewInfo = OperatorInfo { Pos = { 165, 247.5 } },
+ },
+ BrightnessContrast4 = BrightnessContrast {
+ Inputs = {
+ Alpha = Input { Value = 1, },
+ Gain = Input { Value = 0, },
+ Input = Input {
+ SourceOp = "Crop1_2",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 605, 379.5 } },
+ },
+ ChannelBooleans1 = ChannelBoolean {
+ Inputs = {
+ ToRed = Input { Value = 1, },
+ ToBlue = Input { Value = 1, },
+ Background = Input {
+ SourceOp = "LumaKeyer1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 440, 313.5 } },
+ },
+ Scale1_2 = Scale {
+ Inputs = {
+ XSize = Input { Value = 0.6, },
+ PixelAspect = Input { Value = { 1, 1 }, },
+ FilterMethod = Input { Value = 8, },
+ Input = Input {
+ SourceOp = "ChannelBooleans1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 715, 346.5 } },
+ },
+ Merge3 = Merge {
+ Inputs = {
+ Background = Input {
+ SourceOp = "BrightnessContrast4",
+ Source = "Output",
+ },
+ Foreground = Input {
+ SourceOp = "Scale1_2",
+ Source = "Output",
+ },
+ Center = Input { Value = { 1.43422733077905, 2.42001114827202 }, },
+ PerformDepthMerge = Input { Value = 0, },
+ },
+ ViewInfo = OperatorInfo { Pos = { 715, 379.5 } },
+ },
+ Crop1_2 = Crop {
+ Inputs = {
+ XOffset = Input { Value = 24, },
+ YOffset = Input { Value = 402, },
+ XSize = Input { Value = 23, },
+ YSize = Input { Value = 22, },
+ Input = Input {
+ SourceOp = "Loader4",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 385, 379.5 } },
+ },
+ PerspectivePositioner1 = PerspectivePositioner {
+ Inputs = {
+ MappingType = Input { Value = 1, },
+ TopLeft = Input { Value = { 0.297183098591549, 0.674509803921569 }, },
+ TopRight = Input { Value = { 0.604225352112676, 0.602941176470588 }, },
+ BottomLeft = Input { Value = { 0.215962441314554, 0.250980392156863 }, },
+ BottomRight = Input { Value = { 0.699530516431925, 0.345098039215686 }, },
+ Input = Input {
+ SourceOp = "Crop1_2",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 770, 412.5 } },
+ },
+ ChannelBooleans2 = ChannelBoolean {
+ CtrlWZoom = false,
+ Inputs = {
+ Operation = Input { Value = 6, },
+ Background = Input {
+ SourceOp = "Merge3",
+ Source = "Output",
+ },
+ Foreground = Input {
+ SourceOp = "PerspectivePositioner1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 825, 379.5 } },
+ },
+ Saver1_3 = Saver {
+ Inputs = {
+ ProcessWhenBlendIs00 = Input { Value = 0, },
+ Clip = Input {
+ Value = Clip {
+ Filename = "comp:\\VRModels.png",
+ FormatID = "PNGFormat",
+ Length = 0,
+ Saving = true,
+ TrimIn = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 1,
+ AspectMode = 0,
+ Depth = 0,
+ GlobalStart = -2000000000,
+ GlobalEnd = 0
+ },
+ },
+ OutputFormat = Input { Value = FuID { "PNGFormat" }, },
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ Input = Input {
+ SourceOp = "ChannelBooleans2",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 935, 379.5 } },
+ },
+ Instance_BrightnessContrast3_1 = BrightnessContrast {
+ SourceOp = "BrightnessContrast3",
+ Inputs = {
+ Input = Input {
+ SourceOp = "Crop1_1",
+ Source = "Output",
+ },
+ StartEndRenderScripts = Input { },
+ EffectMask = Input { }
+ },
+ ViewInfo = OperatorInfo { Pos = { 660, 280.5 } },
+ },
+ Saver1 = Saver {
+ PassThrough = true,
+ Inputs = {
+ ProcessWhenBlendIs00 = Input { Value = 0, },
+ Clip = Input {
+ Value = Clip {
+ Filename = "comp:\\HUD_Cont1_Selected.png",
+ FormatID = "PNGFormat",
+ Length = 0,
+ Saving = true,
+ TrimIn = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 1,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = -2000000000,
+ GlobalEnd = 0
+ },
+ },
+ OutputFormat = Input { Value = FuID { "PNGFormat" }, },
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ Input = Input {
+ SourceOp = "Instance_BrightnessContrast3_1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 770, 280.5 } },
+ },
+ Saver1_1_1_1 = Saver {
+ PassThrough = true,
+ Inputs = {
+ ProcessWhenBlendIs00 = Input { Value = 0, },
+ Clip = Input {
+ Value = Clip {
+ Filename = "comp:\\HUD_Cont2_Hover.png",
+ FormatID = "PNGFormat",
+ Length = 0,
+ Saving = true,
+ TrimIn = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 1,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = -2000000000,
+ GlobalEnd = 0
+ },
+ },
+ OutputFormat = Input { Value = FuID { "PNGFormat" }, },
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ Input = Input {
+ SourceOp = "Instance_BrightnessContrast2_1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 1100, 181.5 } },
+ },
+ Instance_BrightnessContrast2 = BrightnessContrast {
+ SourceOp = "BrightnessContrast2",
+ Inputs = {
+ Input = Input {
+ SourceOp = "Transform1",
+ Source = "Output",
+ },
+ StartEndRenderScripts = Input { },
+ EffectMask = Input { }
+ },
+ ViewInfo = OperatorInfo { Pos = { 880, 148.5 } },
+ },
+ Instance_BrightnessContrast2_1 = BrightnessContrast {
+ SourceOp = "BrightnessContrast2_1",
+ Inputs = {
+ Input = Input {
+ SourceOp = "Instance_BrightnessContrast2",
+ Source = "Output",
+ },
+ StartEndRenderScripts = Input { },
+ EffectMask = Input { }
+ },
+ ViewInfo = OperatorInfo { Pos = { 1155, 148.5 } },
+ },
+ Instance_BrightnessContrast2_1_1 = BrightnessContrast {
+ SourceOp = "BrightnessContrast2_1_1",
+ Inputs = {
+ Input = Input {
+ SourceOp = "Instance_BrightnessContrast2_1",
+ Source = "Output",
+ },
+ StartEndRenderScripts = Input { },
+ EffectMask = Input { }
+ },
+ ViewInfo = OperatorInfo { Pos = { 1265, 148.5 } },
+ },
+ Instance_Shadow1 = Shadow {
+ SourceOp = "Shadow1",
+ Inputs = {
+ Input = Input {
+ SourceOp = "Instance_BrightnessContrast2_1_1",
+ Source = "Output",
+ },
+ Depth = Input { },
+ StartEndRenderScripts = Input { },
+ EffectMask = Input { }
+ },
+ ViewInfo = OperatorInfo { Pos = { 1375, 148.5 } },
+ },
+ Saver1_1_2 = Saver {
+ PassThrough = true,
+ Inputs = {
+ ProcessWhenBlendIs00 = Input { Value = 0, },
+ Clip = Input {
+ Value = Clip {
+ Filename = "comp:\\HUD_Cont2_Normal.png",
+ FormatID = "PNGFormat",
+ Length = 0,
+ Saving = true,
+ TrimIn = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 1,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = -2000000000,
+ GlobalEnd = 0
+ },
+ },
+ OutputFormat = Input { Value = FuID { "PNGFormat" }, },
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ Input = Input {
+ SourceOp = "Instance_Shadow1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 1430, 181.5 } },
+ },
+ Transform1 = Transform {
+ Inputs = {
+ FlipHoriz = Input { Value = 1, },
+ Input = Input {
+ SourceOp = "Crop1_1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 550, 148.5 } },
+ },
+ BrightnessContrast3 = BrightnessContrast {
+ Inputs = {
+ Gain = Input { Value = 1.2, },
+ Input = Input {
+ SourceOp = "Transform1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 660, 181.5 } },
+ },
+ Saver1_2 = Saver {
+ PassThrough = true,
+ Inputs = {
+ ProcessWhenBlendIs00 = Input { Value = 0, },
+ Clip = Input {
+ Value = Clip {
+ Filename = "comp:\\HUD_Cont2_Selected.png",
+ FormatID = "PNGFormat",
+ Length = 0,
+ Saving = true,
+ TrimIn = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 1,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = -2000000000,
+ GlobalEnd = 0
+ },
+ },
+ OutputFormat = Input { Value = FuID { "PNGFormat" }, },
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ Input = Input {
+ SourceOp = "BrightnessContrast3",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 770, 181.5 } },
+ },
+ BrightnessContrast2_1_1 = BrightnessContrast {
+ Inputs = {
+ Gain = Input { Value = 0.274, },
+ Saturation = Input { Value = 0, },
+ Input = Input {
+ SourceOp = "BrightnessContrast2_1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 1265, 247.5 } },
+ },
+ Shadow1 = Shadow {
+ Inputs = {
+ Softness = Input { Value = 0.1, },
+ Red = Input { Value = 1, },
+ Green = Input { Value = 1, },
+ Blue = Input { Value = 1, },
+ Input = Input {
+ SourceOp = "BrightnessContrast2_1_1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 1375, 247.5 } },
+ },
+ Saver1_1 = Saver {
+ PassThrough = true,
+ Inputs = {
+ ProcessWhenBlendIs00 = Input { Value = 0, },
+ Clip = Input {
+ Value = Clip {
+ Filename = "comp:\\HUD_Cont1_Normal.png",
+ FormatID = "PNGFormat",
+ Length = 0,
+ Saving = true,
+ TrimIn = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 1,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = -2000000000,
+ GlobalEnd = 0
+ },
+ },
+ OutputFormat = Input { Value = FuID { "PNGFormat" }, },
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ Input = Input {
+ SourceOp = "Shadow1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 1430, 280.5 } },
+ },
+ Crop1_1 = Crop {
+ Inputs = {
+ XOffset = Input { Value = 55, },
+ YOffset = Input { Value = 5, },
+ XSize = Input { Value = 24, },
+ YSize = Input { Value = 24, },
+ Input = Input {
+ SourceOp = "Scale1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 660, 247.5 } },
+ },
+ BrightnessContrast2 = BrightnessContrast {
+ Inputs = {
+ Gain = Input { Value = 1.3, },
+ Saturation = Input { Value = 0, },
+ Input = Input {
+ SourceOp = "Crop1_1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 880, 247.5 } },
+ },
+ BrightnessContrast2_1 = BrightnessContrast {
+ Inputs = {
+ Gain = Input { Value = 1.2, },
+ Saturation = Input { Value = 0, },
+ Input = Input {
+ SourceOp = "BrightnessContrast2",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 1155, 247.5 } },
+ },
+ Saver1_1_1 = Saver {
+ PassThrough = true,
+ Inputs = {
+ ProcessWhenBlendIs00 = Input { Value = 0, },
+ Clip = Input {
+ Value = Clip {
+ Filename = "comp:\\HUD_Cont1_Hover.png",
+ FormatID = "PNGFormat",
+ Length = 0,
+ Saving = true,
+ TrimIn = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 1,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = -2000000000,
+ GlobalEnd = 0
+ },
+ },
+ OutputFormat = Input { Value = FuID { "PNGFormat" }, },
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ Input = Input {
+ SourceOp = "BrightnessContrast2_1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 1100, 280.5 } },
+ },
+ BrightnessContrast1 = BrightnessContrast {
+ Inputs = {
+ Alpha = Input { Value = 1, },
+ Gain = Input { Value = 0, },
+ Input = Input {
+ SourceOp = "Loader1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 275, 82.5 } },
+ },
+ Merge1_1 = Merge {
+ PassThrough = true,
+ Inputs = {
+ Background = Input {
+ SourceOp = "BrightnessContrast1",
+ Source = "Output",
+ },
+ Foreground = Input {
+ SourceOp = "Loader1",
+ Source = "Output",
+ },
+ PerformDepthMerge = Input { Value = 0, },
+ },
+ ViewInfo = OperatorInfo { Pos = { 275, 115.5 } },
+ },
+ Merge1 = Merge {
+ Inputs = {
+ Background = Input {
+ SourceOp = "Merge1_1",
+ Source = "Output",
+ },
+ Foreground = Input {
+ SourceOp = "Loader2",
+ Source = "Output",
+ },
+ SubtractiveAdditive = Input { Value = 0, },
+ PerformDepthMerge = Input { Value = 0, },
+ },
+ ViewInfo = OperatorInfo { Pos = { 275, 148.5 } },
+ },
+ Merge2 = Merge {
+ Inputs = {
+ Background = Input {
+ SourceOp = "Merge1",
+ Source = "Output",
+ },
+ Foreground = Input {
+ SourceOp = "Loader3",
+ Source = "Output",
+ },
+ PerformDepthMerge = Input { Value = 0, },
+ },
+ ViewInfo = OperatorInfo { Pos = { 275, 181.5 } },
+ },
+ Saver1_1_1_1_1 = Saver {
+ PassThrough = true,
+ Inputs = {
+ ProcessWhenBlendIs00 = Input { Value = 0, },
+ Clip = Input {
+ Value = Clip {
+ Filename = "comp:\\HUD_HMD_Hover.png",
+ FormatID = "PNGFormat",
+ Length = 0,
+ Saving = true,
+ TrimIn = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 1,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = -2000000000,
+ GlobalEnd = 0
+ },
+ },
+ OutputFormat = Input { Value = FuID { "PNGFormat" }, },
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ Input = Input {
+ SourceOp = "Instance_BrightnessContrast2_1_2",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 1100, 82.5 } },
+ },
+ Instance_BrightnessContrast3 = BrightnessContrast {
+ SourceOp = "BrightnessContrast3",
+ Inputs = {
+ Input = Input {
+ SourceOp = "Crop1_1_1",
+ Source = "Output",
+ },
+ StartEndRenderScripts = Input { },
+ EffectMask = Input { }
+ },
+ ViewInfo = OperatorInfo { Pos = { 770, 82.5 } },
+ },
+ Saver1_2_1 = Saver {
+ PassThrough = true,
+ Inputs = {
+ ProcessWhenBlendIs00 = Input { Value = 0, },
+ Clip = Input {
+ Value = Clip {
+ Filename = "comp:\\HUD_HMD_Selected.png",
+ FormatID = "PNGFormat",
+ Length = 0,
+ Saving = true,
+ TrimIn = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 1,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = -2000000000,
+ GlobalEnd = 0
+ },
+ },
+ OutputFormat = Input { Value = FuID { "PNGFormat" }, },
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ Input = Input {
+ SourceOp = "Instance_BrightnessContrast3",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 770, 115.5 } },
+ },
+ Crop1 = Crop {
+ Inputs = {
+ YOffset = Input { Value = 442, },
+ XSize = Input { Value = 259, },
+ YSize = Input { Value = 188, },
+ Input = Input {
+ SourceOp = "Loader4",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 275, 247.5 } },
+ },
+ LumaKeyer1 = LumaKeyer {
+ Inputs = {
+ High = Input { Value = 0.206, },
+ Low = Input { Value = 0.155, },
+ Input = Input {
+ SourceOp = "Crop1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 385, 247.5 } },
+ },
+ Scale1 = Scale {
+ Inputs = {
+ XSize = Input { Value = 0.71, },
+ PixelAspect = Input { Value = { 1, 1 }, },
+ FilterMethod = Input { Value = 8, },
+ Input = Input {
+ SourceOp = "LumaKeyer1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 495, 247.5 } },
+ },
+ Scale1_1 = Scale {
+ Inputs = {
+ XSize = Input { Value = 0.68, },
+ PixelAspect = Input { Value = { 1, 1 }, },
+ FilterMethod = Input { Value = 8, },
+ Input = Input {
+ SourceOp = "Scale1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 495, 49.5 } },
+ },
+ Crop1_1_1 = Crop {
+ Inputs = {
+ XOffset = Input { Value = 7, },
+ YOffset = Input { Value = 68, },
+ XSize = Input { Value = 24, },
+ YSize = Input { Value = 24, },
+ Input = Input {
+ SourceOp = "Scale1_1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 770, 49.5 } },
+ },
+ Instance_BrightnessContrast2_2 = BrightnessContrast {
+ SourceOp = "BrightnessContrast2",
+ Inputs = {
+ Input = Input {
+ SourceOp = "Crop1_1_1",
+ Source = "Output",
+ },
+ StartEndRenderScripts = Input { },
+ EffectMask = Input { }
+ },
+ ViewInfo = OperatorInfo { Pos = { 990, 49.5 } },
+ },
+ Instance_BrightnessContrast2_1_2 = BrightnessContrast {
+ SourceOp = "BrightnessContrast2_1",
+ Inputs = {
+ Input = Input {
+ SourceOp = "Instance_BrightnessContrast2_2",
+ Source = "Output",
+ },
+ StartEndRenderScripts = Input { },
+ EffectMask = Input { }
+ },
+ ViewInfo = OperatorInfo { Pos = { 1155, 49.5 } },
+ },
+ Instance_BrightnessContrast2_1_1_1 = BrightnessContrast {
+ SourceOp = "BrightnessContrast2_1_1",
+ Inputs = {
+ Input = Input {
+ SourceOp = "Instance_BrightnessContrast2_1_2",
+ Source = "Output",
+ },
+ StartEndRenderScripts = Input { },
+ EffectMask = Input { }
+ },
+ ViewInfo = OperatorInfo { Pos = { 1265, 49.5 } },
+ },
+ Instance_Shadow1_1 = Shadow {
+ SourceOp = "Shadow1",
+ Inputs = {
+ Input = Input {
+ SourceOp = "Instance_BrightnessContrast2_1_1_1",
+ Source = "Output",
+ },
+ Depth = Input { },
+ StartEndRenderScripts = Input { },
+ EffectMask = Input { }
+ },
+ ViewInfo = OperatorInfo { Pos = { 1375, 49.5 } },
+ },
+ Saver1_1_2_1 = Saver {
+ PassThrough = true,
+ Inputs = {
+ ProcessWhenBlendIs00 = Input { Value = 0, },
+ Clip = Input {
+ Value = Clip {
+ Filename = "comp:\\HUD_HMD_Normal.png",
+ FormatID = "PNGFormat",
+ Length = 0,
+ Saving = true,
+ TrimIn = 0,
+ ExtendFirst = 0,
+ ExtendLast = 0,
+ Loop = 1,
+ AspectMode = 0,
+ Depth = 0,
+ TimeCode = 0,
+ GlobalStart = -2000000000,
+ GlobalEnd = 0
+ },
+ },
+ OutputFormat = Input { Value = FuID { "PNGFormat" }, },
+ ["Gamut.SLogVersion"] = Input { Value = FuID { "SLog2" }, },
+ Input = Input {
+ SourceOp = "Instance_Shadow1_1",
+ Source = "Output",
+ },
+ },
+ ViewInfo = OperatorInfo { Pos = { 1430, 82.5 } },
+ }
+ },
+ Views = {
+ {
+ FrameTypeID = "ChildFrame",
+ Mode = 3,
+ LayoutPreset = 0,
+ Left = 0,
+ Top = 27,
+ Width = 1920,
+ Height = 1043,
+ Views = ordered() {
+ Main = MultiView {
+ Active = "Flow",
+ ViewList = ordered() {
+ Flow = "FlowView",
+ Console = "ConsoleView",
+ Timeline = "TimelineView",
+ Spline = "SplineEditorView",
+ Info = "InfoView",
+ Chat = "ChatView"
+ },
+ Flow = FlowView {
+ Flags = {
+ AutoHideNavigator = true,
+ GridSnap = true,
+ AutoSnap = true,
+ RemoveRouters = true
+ },
+ NavigatorSize = { 200, 140 },
+ Direction = "Horizontal",
+ PipeStyle = "Direct",
+ Scale = 1,
+ Offset = { -22, 26 }
+ },
+ Timeline = TimelineView {
+ TreeControlState = {
+ },
+ DisplayMode = "All Tools",
+ ShowCurrentTimeTools = false,
+ Filter = "Show All",
+ ShowSelectedTools = false,
+ ShowAnimatedToolsOnly = false,
+ ShowEditBoxes = false,
+ KeyFrameView = {
+ Position = { Left = 150, Bottom = 343 },
+ ScaleX = 0.00214424951267057,
+ OffsetX = -0.0536062378167641,
+ OffsetY = 0,
+ AutoScaling = "scroll",
+ AutoSnapTo = "frame",
+ AutoSnapToGuidelines = false,
+ GuidelinesGrabEnabled = true,
+ GuidelinesSnapTo = "frame"
+ },
+ Spreadsheet = { LeftPos = 150, Visible = false }
+ },
+ Spline = SplineEditorView {
+ LeftPos = 256,
+ ScaleX = 0.2,
+ ScaleY = 0.00338983050847458,
+ OffsetX = -4,
+ OffsetY = 0,
+ AutoScaling = "scroll",
+ AutoSnapTo = "frame",
+ AutoSnapToGuidelines = false,
+ GuidelinesSnapTo = "frame",
+ ShowKeyMarkers = false,
+ IndependentHandles = false,
+ ShowNonSplineModifiers = false,
+ GuidelinesGrabEnabled = true,
+ ShowOneToolOnly = false,
+ ShowSelectedTools = false,
+ ShowAllInputs = false,
+ Filter = "Show All"
+ },
+ },
+ Controls = MultiView {
+ Active = "Tools",
+ ViewList = ordered() {
+ Tools = "ControlView",
+ Modifiers = "ModifierView"
+ },
+ },
+ Left = "PreviewContainer",
+ Right = "PreviewContainer",
+ Transport = "TransportView",
+ Time = "TimeView"
+ },
+ Layout = {
+ Columns = 2,
+ RatioX = 1,
+ RatioY = 1,
+ {
+ Rows = 3,
+ RatioX = 0.820365535248042,
+ RatioY = 104.099903938521,
+ {
+ Columns = 2,
+ RatioX = 1,
+ RatioY = 0.472463768115942,
+ { ID = "Left", RatioX = 0.5, RatioY = 97.799591002045, Pop = true },
+ { ID = "Right", RatioX = 0.5, Pop = true },
+ Pop = true
+ },
+ { ID = "Main", RatioY = 0.471497584541063, Pop = true },
+ { ID = "Time", SnapY = 56, Flat = true }
+ },
+ {
+ Rows = 2,
+ PixelX = 342,
+ { ID = "Controls", RatioX = 1, RatioY = 1 },
+ { ID = "Transport", FixedY = -2 }
+ }
+ }
+ }
+ },
+ Prefs = {
+ Comp = {
+ Interactive = {
+ Proxy = {
+ Auto = false
+ },
+ },
+ AutoSave = {
+ Delay = 180,
+ },
+ Memory = {
+ Render = {
+ SimultaneousBranching = true
+ },
+ Interactive = {
+ SimultaneousBranching = true,
+ }
+ },
+ NumberStyles = {
+ Color = 1,
+ },
+ Views = {
+ Right = {
+ Viewer = {
+ ScaleMode = 1,
+ Channel = 4294967295,
+ },
+ SideB = {
+ PrevCtrlInactiveColor = 4278255360,
+ PickW = 1,
+ PickH = 1,
+ PrevCtrlActiveColor = 4278190335,
+ Viewer = {
+ EnableLUTs = false,
+ LUTPlugin = "FusionViewLUT",
+ FitMarginY = 0,
+ FitMarginX = 0,
+ FitMarginType = 0,
+ FarZ = -1000,
+ NearZ = 0
+ }
+ },
+ },
+ Left = {
+ SideB = {
+ PrevCtrlInactiveColor = 4278255360,
+ PickW = 1,
+ PickH = 1,
+ PrevCtrlActiveColor = 4278190335,
+ Viewer = {
+ EnableLUTs = false,
+ LUTPlugin = "FusionViewLUT",
+ FitMarginY = 0,
+ FitMarginX = 0,
+ FitMarginType = 0,
+ FarZ = -1000,
+ NearZ = 0
+ }
+ },
+ },
+ View1 = {
+ PrevCtrlInactiveColor = 0,
+ PickW = 1,
+ FullScreen = false,
+ PickH = 1,
+ AlwaysOnTop = true,
+ PrevCtrlActiveColor = 0,
+ SideB = {
+ PrevCtrlInactiveColor = 4278255360,
+ PickW = 1,
+ PickH = 1,
+ PrevCtrlActiveColor = 4278190335,
+ Viewer = {
+ EnableLUTs = false,
+ LUTPlugin = "FusionViewLUT",
+ FitMarginY = 0,
+ FitMarginX = 0,
+ FitMarginType = 0,
+ FarZ = -1000,
+ NearZ = 0
+ }
+ }
+ },
+ },
+ Preview = {
+ Scale = false,
+ },
+ FrameFormat = {
+ Rate = 25,
+ GuideRatio = 1.77777777777778,
+ TimeCodeType = 1,
+ },
+ LastFile = "E:\\Janssen Cilag - Web TV\\Fx\\ModelsB\\JanssenTVExportStudioVR",
+ Unsorted = {
+ GlobalEnd = 1,
+ RenderSettings = {
+ Configs = {
+ Final = {
+ StepRender = false,
+ PriorityClasses = "local",
+ SizeType = 1,
+ MotionBlur = true,
+ CustomAspect = true,
+ CustomHeight = 160,
+ ShowSlaves = false,
+ CustomWidth = 200,
+ StepSize = 5,
+ UpdateMode = "Some",
+ UseNetwork = false,
+ Quality = true
+ },
+ Preview = {
+ StepRender = false,
+ PriorityClasses = "local",
+ SizeType = 1,
+ MotionBlur = true,
+ CustomAspect = true,
+ CustomHeight = 160,
+ ShowSlaves = false,
+ CustomWidth = 200,
+ StepSize = 5,
+ UpdateMode = "Some",
+ UseNetwork = false,
+ Quality = false
+ }
+ },
+ PreviewConfig = "Preview",
+ CurrentConfig = "Final"
+ }
+ },
+ AVI = {
+ Saver = {
+ Handler = 1397178700,
+ }
+ },
+ Tweaks = {
+ OpenCL = {
+ Enable = 0,
+ Caching = 0
+ }
+ },
+ Paths = {
+ },
+ QuickTime = {
+ },
+ }
+ }
+}
+
+
\ No newline at end of file
diff --git a/design/SteamVRImage.png b/design/SteamVRImage.png
new file mode 100644
index 0000000..c81ba1a
Binary files /dev/null and b/design/SteamVRImage.png differ
diff --git a/design/VRModels0000.png b/design/VRModels0000.png
new file mode 100644
index 0000000..569be2b
Binary files /dev/null and b/design/VRModels0000.png differ
diff --git a/design/fps.png b/design/fps.png
new file mode 100644
index 0000000..9d1ce6b
Binary files /dev/null and b/design/fps.png differ
diff --git a/design/toolStripButtonShowShaded.Image.png b/design/toolStripButtonShowShaded.Image.png
new file mode 100644
index 0000000..c17ca77
Binary files /dev/null and b/design/toolStripButtonShowShaded.Image.png differ
diff --git a/design/toolStripButtonUseSceneLights.Image.png b/design/toolStripButtonUseSceneLights.Image.png
new file mode 100644
index 0000000..691df1d
Binary files /dev/null and b/design/toolStripButtonUseSceneLights.Image.png differ
diff --git a/design/toolStripButtonUseSceneLights0000.Image b/design/toolStripButtonUseSceneLights0000.Image
new file mode 100644
index 0000000..da0d6f6
Binary files /dev/null and b/design/toolStripButtonUseSceneLights0000.Image differ
diff --git a/hlp matrix.txt b/hlp matrix.txt
new file mode 100644
index 0000000..8ec740f
--- /dev/null
+++ b/hlp matrix.txt
@@ -0,0 +1,35 @@
+Controller ...0 0 -1,8 1
+do ModelView
+globalscale
+
+GetLocalTransform unity
+recursive 80 45 100 // 10,20,-150 - kresl mesh
+
+
+-29 atd - lamp - no meshes
+
+
+
+
+PushWorld(ref Matrix4 world) - ukld se modelview
+ {
+ GL.PushMatrix();
+ GL.MultMatrix(ref world);
+
+separate perpective
+
+model
+ -- model matrix
+world
+ -- view matrix
+camera
+ -- projection
+homogen
+
+
+lm::mat4 MVPmatrix = projection * view * model;
+
+
+http://www.opengl-tutorial.org/beginners-tutorials/tutorial-3-matrices/
+
+https://learnopengl.com/Lighting/Multiple-lights
\ No newline at end of file
diff --git a/libs/Decklink/Interop.DeckLinkAPI.dll b/libs/Decklink/Interop.DeckLinkAPI.dll
new file mode 100644
index 0000000..7ec186a
Binary files /dev/null and b/libs/Decklink/Interop.DeckLinkAPI.dll differ
diff --git a/libs/NewTekNDI/NDILibDotNet2.dll b/libs/NewTekNDI/NDILibDotNet2.dll
new file mode 100644
index 0000000..e4f6894
Binary files /dev/null and b/libs/NewTekNDI/NDILibDotNet2.dll differ
diff --git a/libs/NewTekNDIx64DLL/Processing.NDI.Lib.x64.dll b/libs/NewTekNDIx64DLL/Processing.NDI.Lib.x64.dll
new file mode 100644
index 0000000..4b41568
Binary files /dev/null and b/libs/NewTekNDIx64DLL/Processing.NDI.Lib.x64.dll differ
diff --git a/libs/NewTekNDIx64DLL/Processing.NDI.Lib.x64.lib b/libs/NewTekNDIx64DLL/Processing.NDI.Lib.x64.lib
new file mode 100644
index 0000000..49617de
Binary files /dev/null and b/libs/NewTekNDIx64DLL/Processing.NDI.Lib.x64.lib differ
diff --git a/libs/SmartThreadPool/SmartThreadPool/OpenTK.dll.config b/libs/SmartThreadPool/SmartThreadPool/OpenTK.dll.config
new file mode 100644
index 0000000..7098d39
--- /dev/null
+++ b/libs/SmartThreadPool/SmartThreadPool/OpenTK.dll.config
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libs/SmartThreadPool/SmartThreadPool/SmartThreadPool.csproj b/libs/SmartThreadPool/SmartThreadPool/SmartThreadPool.csproj
index 222cb04..ca5797d 100644
--- a/libs/SmartThreadPool/SmartThreadPool/SmartThreadPool.csproj
+++ b/libs/SmartThreadPool/SmartThreadPool/SmartThreadPool.csproj
@@ -79,9 +79,19 @@
+
+ ..\..\..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll
+
+
+ ..\..\..\packages\OpenTK.GLControl.3.0.1\lib\net20\OpenTK.GLControl.dll
+
+
+
+
+
diff --git a/libs/SmartThreadPool/SmartThreadPool/packages.config b/libs/SmartThreadPool/SmartThreadPool/packages.config
new file mode 100644
index 0000000..71dafaf
--- /dev/null
+++ b/libs/SmartThreadPool/SmartThreadPool/packages.config
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/libs/SteamVR/x64/openvr_api.dll b/libs/SteamVR/x64/openvr_api.dll
new file mode 100644
index 0000000..736677d
Binary files /dev/null and b/libs/SteamVR/x64/openvr_api.dll differ
diff --git a/libs/SteamVR/x86/openvr_api.dll b/libs/SteamVR/x86/openvr_api.dll
new file mode 100644
index 0000000..05cb097
Binary files /dev/null and b/libs/SteamVR/x86/openvr_api.dll differ
diff --git a/libs/assimp-net/.vs/AssimpNet/v15/Server/sqlite3/db.lock b/libs/assimp-net/.vs/AssimpNet/v15/Server/sqlite3/db.lock
new file mode 100644
index 0000000..e69de29
diff --git a/libs/assimp-net/.vs/AssimpNet/v15/Server/sqlite3/storage.ide b/libs/assimp-net/.vs/AssimpNet/v15/Server/sqlite3/storage.ide
new file mode 100644
index 0000000..fa23f29
Binary files /dev/null and b/libs/assimp-net/.vs/AssimpNet/v15/Server/sqlite3/storage.ide differ
diff --git a/libs/assimp-net/AssimpNet.Interop.Generator/App.config b/libs/assimp-net/AssimpNet.Interop.Generator/App.config
index c0e4148..80b665b 100644
--- a/libs/assimp-net/AssimpNet.Interop.Generator/App.config
+++ b/libs/assimp-net/AssimpNet.Interop.Generator/App.config
@@ -2,5 +2,5 @@
-
+
diff --git a/libs/assimp-net/AssimpNet.Interop.Generator/AssimpNet.Interop.Generator.csproj b/libs/assimp-net/AssimpNet.Interop.Generator/AssimpNet.Interop.Generator.csproj
index a60d1bf..e584fd2 100644
--- a/libs/assimp-net/AssimpNet.Interop.Generator/AssimpNet.Interop.Generator.csproj
+++ b/libs/assimp-net/AssimpNet.Interop.Generator/AssimpNet.Interop.Generator.csproj
@@ -1,5 +1,5 @@
-
+
Net45-Debug
@@ -56,7 +56,7 @@
full
AnyCPU
prompt
- v4.5
+ v4.6.1
@@ -78,6 +78,12 @@
..\..\Mono.Cecil\Net20\Mono.Cecil.Pdb.dll
+
+ ..\..\..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll
+
+
+ ..\..\..\packages\OpenTK.GLControl.3.0.1\lib\net20\OpenTK.GLControl.dll
+
@@ -86,6 +92,8 @@
+
+
+
+
+
+
+
+
+
diff --git a/libs/assimp-net/AssimpNet.Interop.Generator/packages.config b/libs/assimp-net/AssimpNet.Interop.Generator/packages.config
new file mode 100644
index 0000000..71dafaf
--- /dev/null
+++ b/libs/assimp-net/AssimpNet.Interop.Generator/packages.config
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/libs/assimp-net/AssimpNet/AssimpNet.csproj b/libs/assimp-net/AssimpNet/AssimpNet.csproj
index 845e36e..e302207 100644
--- a/libs/assimp-net/AssimpNet/AssimpNet.csproj
+++ b/libs/assimp-net/AssimpNet/AssimpNet.csproj
@@ -1,5 +1,5 @@
-
+
Net45-Debug
AnyCPU
@@ -60,9 +60,15 @@
full
AnyCPU
prompt
- v4.5
+ v4.6.1
+
+ ..\..\..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll
+
+
+ ..\..\..\packages\OpenTK.GLControl.3.0.1\lib\net20\OpenTK.GLControl.dll
+
@@ -133,6 +139,8 @@
+
+
diff --git a/libs/assimp-net/AssimpNet/OpenTK.dll.config b/libs/assimp-net/AssimpNet/OpenTK.dll.config
new file mode 100644
index 0000000..7098d39
--- /dev/null
+++ b/libs/assimp-net/AssimpNet/OpenTK.dll.config
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libs/assimp-net/AssimpNet/packages.config b/libs/assimp-net/AssimpNet/packages.config
new file mode 100644
index 0000000..71dafaf
--- /dev/null
+++ b/libs/assimp-net/AssimpNet/packages.config
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/libs/assimp-net/libs/Assimp/Assimp32.dll b/libs/assimp-net/libs/Assimp/Assimp32.dll
index 281d600..ccb9121 100644
Binary files a/libs/assimp-net/libs/Assimp/Assimp32.dll and b/libs/assimp-net/libs/Assimp/Assimp32.dll differ
diff --git a/libs/assimp-net/libs/Assimp/Assimp64.dll b/libs/assimp-net/libs/Assimp/Assimp64.dll
index 147155c..cdaec66 100644
Binary files a/libs/assimp-net/libs/Assimp/Assimp64.dll and b/libs/assimp-net/libs/Assimp/Assimp64.dll differ
diff --git a/libs/devil-net/DevILNet/DevILNet.csproj b/libs/devil-net/DevILNet/DevILNet.csproj
index 15c52c9..379e1dd 100644
--- a/libs/devil-net/DevILNet/DevILNet.csproj
+++ b/libs/devil-net/DevILNet/DevILNet.csproj
@@ -17,10 +17,10 @@
true
- bin\x64\Debug\
+ ..\..\..\open3mod\bin\Debug\
DEBUG;TRACE
full
- x64
+ AnyCPU
bin\Debug\DevILNet.dll.CodeAnalysisLog.xml
true
GlobalSuppressions.cs
@@ -31,7 +31,7 @@
true
- bin\x64\Release\
+ ..\..\..\open3mod\bin\Release\
TRACE
true
pdbonly
@@ -83,6 +83,12 @@
true
+
+ ..\..\..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll
+
+
+ ..\..\..\packages\OpenTK.GLControl.3.0.1\lib\net20\OpenTK.GLControl.dll
+
@@ -106,10 +112,14 @@
+
+
+
+
- copy "$(ProjectDir)\..\Libs\x86\DevIL.dll" "$(OutDir)"
-copy "$(ProjectDir)\..\Libs\x86\ILU.dll" "$(OutDir)"
+ copy "$(ProjectDir)..\Libs\x64\DevIL.dll" "$(OutDir)"
+copy "$(ProjectDir)..\Libs\x64\ILU.dll" "$(OutDir)"
+
+
+
+
+
+
+
diff --git a/libs/devil-net/DevILNet/packages.config b/libs/devil-net/DevILNet/packages.config
new file mode 100644
index 0000000..71dafaf
--- /dev/null
+++ b/libs/devil-net/DevILNet/packages.config
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/libs/kd-sharp/KDTree/KDTree.csproj b/libs/kd-sharp/KDTree/KDTree.csproj
index 2cb5e3e..df23d2d 100644
--- a/libs/kd-sharp/KDTree/KDTree.csproj
+++ b/libs/kd-sharp/KDTree/KDTree.csproj
@@ -32,6 +32,12 @@
4
+
+ ..\..\..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll
+
+
+ ..\..\..\packages\OpenTK.GLControl.3.0.1\lib\net20\OpenTK.GLControl.dll
+
@@ -48,6 +54,10 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libs/kd-sharp/KDTree/packages.config b/libs/kd-sharp/KDTree/packages.config
new file mode 100644
index 0000000..71dafaf
--- /dev/null
+++ b/libs/kd-sharp/KDTree/packages.config
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/open3mod.sln b/open3mod.sln
index 5355f84..7c2dc50 100644
--- a/open3mod.sln
+++ b/open3mod.sln
@@ -1,6 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2026
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "open3mod", "open3mod\open3mod.csproj", "{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssimpNet", "libs\assimp-net\AssimpNet\AssimpNet.csproj", "{3415FF29-C0BE-44FC-AD34-94796118E690}"
@@ -18,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KDTree", "libs\kd-sharp\KDT
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmartThreadPool", "libs\SmartThreadPool\SmartThreadPool\SmartThreadPool.csproj", "{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTKOpenGL4Test", "WindowsFormsApp1\OpenTKOpenGL4Test.csproj", "{07DC153B-DEA9-47BF-A6B6-54F4078FED34}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CD_ROM|Any CPU = CD_ROM|Any CPU
@@ -73,12 +77,14 @@ Global
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Debug|x64.Build.0 = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Debug|x86.ActiveCfg = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.DVD-5|Mixed Platforms.Build.0 = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.DVD-5|x64.ActiveCfg = Debug|Any CPU
+ {8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.DVD-5|x64.Build.0 = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.DVD-5|x86.ActiveCfg = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Net20-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Net20-Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -110,11 +116,12 @@ Global
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Publish|Mixed Platforms.Build.0 = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Publish|x64.ActiveCfg = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Publish|x86.ActiveCfg = Debug|Any CPU
- {8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Release|Any CPU.Build.0 = Debug|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Release|x64.ActiveCfg = Release|Any CPU
+ {8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Release|x64.Build.0 = Release|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.Release|x86.ActiveCfg = Release|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
{8E5A024D-A941-4A4E-B2F9-A97D7CBCE0E9}.SingleImage|Any CPU.Build.0 = Release|Any CPU
@@ -132,13 +139,15 @@ Global
{3415FF29-C0BE-44FC-AD34-94796118E690}.Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.Debug|Mixed Platforms.ActiveCfg = Net45-Debug|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.Debug|Mixed Platforms.Build.0 = Net45-Debug|Any CPU
- {3415FF29-C0BE-44FC-AD34-94796118E690}.Debug|x64.ActiveCfg = Net45-Debug|Any CPU
+ {3415FF29-C0BE-44FC-AD34-94796118E690}.Debug|x64.ActiveCfg = Net45-Release|Any CPU
+ {3415FF29-C0BE-44FC-AD34-94796118E690}.Debug|x64.Build.0 = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.Debug|x86.ActiveCfg = Net45-Debug|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.DVD-5|Any CPU.ActiveCfg = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.DVD-5|Any CPU.Build.0 = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.DVD-5|Mixed Platforms.ActiveCfg = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.DVD-5|Mixed Platforms.Build.0 = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.DVD-5|x64.ActiveCfg = Net45-Release|Any CPU
+ {3415FF29-C0BE-44FC-AD34-94796118E690}.DVD-5|x64.Build.0 = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.DVD-5|x86.ActiveCfg = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.Net20-Debug|Any CPU.ActiveCfg = Net20-Debug|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.Net20-Debug|Any CPU.Build.0 = Net20-Debug|Any CPU
@@ -175,6 +184,7 @@ Global
{3415FF29-C0BE-44FC-AD34-94796118E690}.Release|Mixed Platforms.ActiveCfg = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.Release|Mixed Platforms.Build.0 = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.Release|x64.ActiveCfg = Net45-Release|Any CPU
+ {3415FF29-C0BE-44FC-AD34-94796118E690}.Release|x64.Build.0 = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.Release|x86.ActiveCfg = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.SingleImage|Any CPU.ActiveCfg = Net45-Release|Any CPU
{3415FF29-C0BE-44FC-AD34-94796118E690}.SingleImage|Any CPU.Build.0 = Net45-Release|Any CPU
@@ -196,7 +206,7 @@ Global
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.Debug|x64.Build.0 = Debug|x64
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.Debug|x86.ActiveCfg = Debug|x86
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.Debug|x86.Build.0 = Debug|x86
- {578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.DVD-5|Any CPU.ActiveCfg = Debug|x86
+ {578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.DVD-5|Any CPU.ActiveCfg = Debug|x64
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.DVD-5|Mixed Platforms.ActiveCfg = Debug|x86
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.DVD-5|Mixed Platforms.Build.0 = Debug|x86
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.DVD-5|x64.ActiveCfg = Debug|x64
@@ -238,7 +248,7 @@ Global
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.Publish|x64.Build.0 = Debug|x64
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.Publish|x86.ActiveCfg = Debug|x86
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.Publish|x86.Build.0 = Debug|x86
- {578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.Release|Any CPU.ActiveCfg = Release|x86
+ {578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.Release|Any CPU.ActiveCfg = Debug|x64
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.Release|Mixed Platforms.ActiveCfg = Release|x86
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.Release|Mixed Platforms.Build.0 = Release|x86
{578FD0D9-41AA-4FA4-8D9B-4021978FA48D}.Release|x64.ActiveCfg = Release|x64
@@ -262,13 +272,15 @@ Global
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Debug|Mixed Platforms.ActiveCfg = Net45-Debug|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Debug|Mixed Platforms.Build.0 = Net45-Debug|Any CPU
- {EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Debug|x64.ActiveCfg = Net45-Debug|Any CPU
+ {EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Debug|x64.ActiveCfg = Net45-Release|Any CPU
+ {EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Debug|x64.Build.0 = Net45-Release|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Debug|x86.ActiveCfg = Net45-Debug|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.DVD-5|Any CPU.ActiveCfg = Net45-Release|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.DVD-5|Any CPU.Build.0 = Net45-Release|Any CPU
- {EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.DVD-5|Mixed Platforms.ActiveCfg = Net45-Release|Any CPU
- {EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.DVD-5|Mixed Platforms.Build.0 = Net45-Release|Any CPU
+ {EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.DVD-5|Mixed Platforms.ActiveCfg = Net45-Debug|Any CPU
+ {EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.DVD-5|Mixed Platforms.Build.0 = Net45-Debug|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.DVD-5|x64.ActiveCfg = Net45-Release|Any CPU
+ {EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.DVD-5|x64.Build.0 = Net45-Release|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.DVD-5|x86.ActiveCfg = Net45-Release|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Net20-Debug|Any CPU.ActiveCfg = Net20-Debug|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Net20-Debug|Any CPU.Build.0 = Net20-Debug|Any CPU
@@ -305,6 +317,7 @@ Global
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Release|Mixed Platforms.ActiveCfg = Net45-Release|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Release|Mixed Platforms.Build.0 = Net45-Release|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Release|x64.ActiveCfg = Net45-Release|Any CPU
+ {EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Release|x64.Build.0 = Net45-Release|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.Release|x86.ActiveCfg = Net45-Release|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.SingleImage|Any CPU.ActiveCfg = Net45-Release|Any CPU
{EA4EF0BE-B8A9-4149-8B5A-7E353AD628C0}.SingleImage|Any CPU.Build.0 = Net45-Release|Any CPU
@@ -403,12 +416,14 @@ Global
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {33A00A90-C02E-474B-A8C0-3B0559873EA0}.Debug|x64.Build.0 = Debug|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.Debug|x86.ActiveCfg = Debug|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.DVD-5|Mixed Platforms.Build.0 = Debug|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.DVD-5|x64.ActiveCfg = Debug|Any CPU
+ {33A00A90-C02E-474B-A8C0-3B0559873EA0}.DVD-5|x64.Build.0 = Debug|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.DVD-5|x86.ActiveCfg = Debug|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.Net20-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.Net20-Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -445,6 +460,7 @@ Global
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.Release|x64.ActiveCfg = Release|Any CPU
+ {33A00A90-C02E-474B-A8C0-3B0559873EA0}.Release|x64.Build.0 = Release|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.Release|x86.ActiveCfg = Release|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
{33A00A90-C02E-474B-A8C0-3B0559873EA0}.SingleImage|Any CPU.Build.0 = Release|Any CPU
@@ -463,12 +479,14 @@ Global
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Debug|x64.Build.0 = Debug|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Debug|x86.ActiveCfg = Debug|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.DVD-5|Mixed Platforms.Build.0 = Debug|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.DVD-5|x64.ActiveCfg = Debug|Any CPU
+ {74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.DVD-5|x64.Build.0 = Debug|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.DVD-5|x86.ActiveCfg = Debug|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Net20-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Net20-Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -505,6 +523,7 @@ Global
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Release|x64.ActiveCfg = Release|Any CPU
+ {74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Release|x64.Build.0 = Release|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.Release|x86.ActiveCfg = Release|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.SingleImage|Any CPU.ActiveCfg = Publish|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.SingleImage|Any CPU.Build.0 = Publish|Any CPU
@@ -512,8 +531,91 @@ Global
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.SingleImage|Mixed Platforms.Build.0 = Publish|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.SingleImage|x64.ActiveCfg = Publish|Any CPU
{74D4C33F-7CC8-4B2A-A7DF-D8B6E63B6EBD}.SingleImage|x86.ActiveCfg = Publish|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.CD_ROM|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.CD_ROM|Mixed Platforms.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.CD_ROM|x64.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.CD_ROM|x64.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.CD_ROM|x86.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.CD_ROM|x86.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Debug|x64.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Debug|x86.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.DVD-5|Mixed Platforms.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.DVD-5|x64.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.DVD-5|x64.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.DVD-5|x86.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.DVD-5|x86.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Debug|Any CPU.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Debug|x64.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Debug|x64.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Debug|x86.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Debug|x86.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Release|Any CPU.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Release|Any CPU.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Release|x64.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Release|x64.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Release|x86.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net20-Release|x86.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Debug|x64.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Debug|x64.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Debug|x86.ActiveCfg = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Debug|x86.Build.0 = Debug|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Release|Any CPU.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Release|x64.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Release|x64.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Release|x86.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Net45-Release|x86.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Publish|Any CPU.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Publish|Any CPU.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Publish|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Publish|Mixed Platforms.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Publish|x64.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Publish|x64.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Publish|x86.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Publish|x86.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Release|Any CPU.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Release|x64.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Release|x64.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Release|x86.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.Release|x86.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.SingleImage|Any CPU.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.SingleImage|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.SingleImage|Mixed Platforms.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.SingleImage|x64.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.SingleImage|x64.Build.0 = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.SingleImage|x86.ActiveCfg = Release|Any CPU
+ {07DC153B-DEA9-47BF-A6B6-54F4078FED34}.SingleImage|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {F70EC295-9627-461F-BEBF-87000D527C77}
+ EndGlobalSection
EndGlobal
diff --git "a/open3mod.sln \342\200\223 z\303\241stupce.lnk" "b/open3mod.sln \342\200\223 z\303\241stupce.lnk"
new file mode 100644
index 0000000..2750c92
Binary files /dev/null and "b/open3mod.sln \342\200\223 z\303\241stupce.lnk" differ
diff --git a/open3mod/.gitignore b/open3mod/.gitignore
new file mode 100644
index 0000000..acab74c
--- /dev/null
+++ b/open3mod/.gitignore
@@ -0,0 +1,9 @@
+# git ignore file
+_Resharper*
+obj/
+bin/
+*.suo
+*.user
+*.pyc
+releases/
+*.pdb
diff --git a/open3mod/About.resx b/open3mod/About.resx
index ed1baf3..e5a673f 100644
--- a/open3mod/About.resx
+++ b/open3mod/About.resx
@@ -121,228 +121,228 @@
17, 17
- =====================================================================
-
-Open 3D Model Viewer (open3mod)
-
-Copyright (c) 2012-2015, Open3Mod Contributors
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
- copyright notice, this list of conditions and the
- following disclaimer.
-
-* Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-* Neither the name of the project, nor the names of its
- contributors may be used to endorse or promote products
- derived from this software without specific prior
- written permission of the copyright holders.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=====================================================================
-The following external license files apply to cover third party
-components:
-
-Open Asset Import Library (assimp)
-
-Copyright (c) 2006-2012, assimp team
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
- copyright notice, this list of conditions and the
- following disclaimer.
-
-* Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
- contributors may be used to endorse or promote products
- derived from this software without specific prior
- written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-******************************************************************************
-
-AN EXCEPTION applies to all files in the ./test/models-nonbsd folder.
-These are 3d models for testing purposes, from various free sources
-on the internet. They are - unless otherwise stated - copyright of
-their respective creators, which may impose additional requirements
-on the use of their work. For any of these models, see
-<model-name>.source.txt for more legal information. Contact us if you
-are a copyright holder and believe that we credited you inproperly or
-if you don't want your files to appear in the repository.
-
-
-******************************************************************************
-
-Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
-http://code.google.com/p/poly2tri/
-
-All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-* Neither the name of Poly2Tri nor the names of its contributors may be
- used to endorse or promote products derived from this software without specific
- prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-License conditions for Assimp-net (https://code.google.com/p/assimp-net/):
-
-/*
-* Copyright (c) 2012-2013 Nicholas Woodfield
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-
-
-License conditions for Devil-net (https://code.google.com/p/devil-net):
-
-/*
-* Copyright (c) 2012 Nicholas Woodfield
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-
-
-The Open Toolkit library license
-
-Copyright (c) 2006 - 2010 The Open Toolkit library.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-
-Third parties
-
-
-OpenTK.Platform.Windows and OpenTK.Platform.X11 include portions of the Mono class library. These portions are covered by the following license:
-
-Copyright (c) 2004 Novell, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-OpenTK.Compatibility includes portions of the Tao Framework library (Tao.OpenGl, Tao.OpenAl and Tao.Platform.Windows.SimpleOpenGlControl). These portions are covered by the following license:
-
-Copyright ©2003-2007 Tao Framework Team
-http://www.taoframework.com
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-OpenTK.Half offers Half-to-Single and Single-to-Half conversions based on OpenEXR source code, which is covered by the following license:
-
-Copyright (c) 2002, Industrial Light & Magic, a division of Lucas Digital Ltd. LLC. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of Industrial Light & Magic nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+ =====================================================================
+
+Open 3D Model Viewer (open3mod)
+
+Copyright (c) 2012-2015, Open3Mod Contributors
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the
+following conditions are met:
+
+* Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+* Neither the name of the project, nor the names of its
+ contributors may be used to endorse or promote products
+ derived from this software without specific prior
+ written permission of the copyright holders.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=====================================================================
+The following external license files apply to cover third party
+components:
+
+Open Asset Import Library (assimp)
+
+Copyright (c) 2006-2012, assimp team
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the
+following conditions are met:
+
+* Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+ contributors may be used to endorse or promote products
+ derived from this software without specific prior
+ written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+******************************************************************************
+
+AN EXCEPTION applies to all files in the ./test/models-nonbsd folder.
+These are 3d models for testing purposes, from various free sources
+on the internet. They are - unless otherwise stated - copyright of
+their respective creators, which may impose additional requirements
+on the use of their work. For any of these models, see
+<model-name>.source.txt for more legal information. Contact us if you
+are a copyright holder and believe that we credited you inproperly or
+if you don't want your files to appear in the repository.
+
+
+******************************************************************************
+
+Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
+http://code.google.com/p/poly2tri/
+
+All rights reserved.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+* Neither the name of Poly2Tri nor the names of its contributors may be
+ used to endorse or promote products derived from this software without specific
+ prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+License conditions for Assimp-net (https://code.google.com/p/assimp-net/):
+
+/*
+* Copyright (c) 2012-2013 Nicholas Woodfield
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*/
+
+
+License conditions for Devil-net (https://code.google.com/p/devil-net):
+
+/*
+* Copyright (c) 2012 Nicholas Woodfield
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*/
+
+
+The Open Toolkit library license
+
+Copyright (c) 2006 - 2010 The Open Toolkit library.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+
+Third parties
+
+
+OpenTK.Platform.Windows and OpenTK.Platform.X11 include portions of the Mono class library. These portions are covered by the following license:
+
+Copyright (c) 2004 Novell, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+OpenTK.Compatibility includes portions of the Tao Framework library (Tao.OpenGl, Tao.OpenAl and Tao.Platform.Windows.SimpleOpenGlControl). These portions are covered by the following license:
+
+Copyright ©2003-2007 Tao Framework Team
+http://www.taoframework.com
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+OpenTK.Half offers Half-to-Single and Single-to-Half conversions based on OpenEXR source code, which is covered by the following license:
+
+Copyright (c) 2002, Industrial Light & Magic, a division of Lucas Digital Ltd. LLC. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name of Industrial Light & Magic nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/open3mod/AnimationInspectionView.cs b/open3mod/AnimationInspectionView.cs
index 5abfac2..4756247 100644
--- a/open3mod/AnimationInspectionView.cs
+++ b/open3mod/AnimationInspectionView.cs
@@ -54,15 +54,15 @@ public AnimationInspectionView(Scene scene, TabPage tabPageAnimations)
tabPageAnimations.Controls.Add(this);
listBoxAnimations.Items.Add("None (Bind Pose)");
-
+ listBoxAnimations.SelectedIndex = 0;
if (scene.Raw.Animations != null)
{
foreach (var anim in scene.Raw.Animations)
{
listBoxAnimations.Items.Add(FormatAnimationName(anim));
+ listBoxAnimations.SelectedIndex = 1;
}
}
- listBoxAnimations.SelectedIndex = 0;
checkBoxLoop.Checked = _scene.SceneAnimator.Loop;
_imagePlay = ImageFromResource.Get("open3mod.Images.PlayAnim.png");
@@ -198,6 +198,16 @@ private void StartPlayingTimer()
}
}
+ public void SetTime(double pos)
+ {
+ if (pos < 0 || pos > _duration)
+ {
+ return;
+ }
+ Debug.Assert(pos >= 0);
+ _scene.SceneAnimator.AnimationCursor = pos;
+ timeSlideControl.Position = pos;
+ }
private void OnChangeSelectedAnimation(object sender, EventArgs e)
{
@@ -235,7 +245,7 @@ private void OnChangeSelectedAnimation(object sender, EventArgs e)
}
}
- private void OnPlay(object sender, EventArgs e)
+ public void OnPlay(object sender, EventArgs e)
{
Playing = !Playing;
buttonPlay.Image = Playing ? _imageStop : _imagePlay;
@@ -297,6 +307,7 @@ private void OnGoTo(object sender, KeyEventArgs e)
}
Debug.Assert(pos >= 0);
_scene.SceneAnimator.AnimationCursor = pos;
+ timeSlideControl.Position = pos;
}
private void OnDeleteAnimation(object sender, EventArgs e)
diff --git a/open3mod/Antialias0.png b/open3mod/Antialias0.png
new file mode 100644
index 0000000..ddf9f11
Binary files /dev/null and b/open3mod/Antialias0.png differ
diff --git a/open3mod/Antialias1.png b/open3mod/Antialias1.png
new file mode 100644
index 0000000..63812f1
Binary files /dev/null and b/open3mod/Antialias1.png differ
diff --git a/open3mod/Antialias2.png b/open3mod/Antialias2.png
new file mode 100644
index 0000000..4f94e2d
Binary files /dev/null and b/open3mod/Antialias2.png differ
diff --git a/open3mod/Antialias3.png b/open3mod/Antialias3.png
new file mode 100644
index 0000000..8beed1c
Binary files /dev/null and b/open3mod/Antialias3.png differ
diff --git a/open3mod/App.config b/open3mod/App.config
index 9735940..bd6e700 100644
--- a/open3mod/App.config
+++ b/open3mod/App.config
@@ -1,10 +1,10 @@
-
+
-
-
-
+
+
+
@@ -28,7 +28,7 @@
True
- False
+ True
False
@@ -111,6 +111,63 @@
DarkGray
+
+ Black
+
+
+ True
+
+
+
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+
+
+
+ 0
+
+
+ False
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ False
+
@@ -126,7 +183,7 @@
True
-
+
False
@@ -152,7 +209,7 @@
2
- 0
+ 1
1
@@ -163,6 +220,39 @@
50
+
+ 111
+
+
+ 47
+
+
+ 58
+
+
+ 50
+
+
+ False
+
+
+ 50
+
+
+ 50
+
+
+ 50
+
-
+
+
+
+
+
+
+
+
+
+
diff --git a/open3mod/Arrays.cs b/open3mod/Arrays.cs
new file mode 100644
index 0000000..76e336b
--- /dev/null
+++ b/open3mod/Arrays.cs
@@ -0,0 +1,27 @@
+//----------------------------------------------------------------------------------------
+// Copyright © 2006 - 2018 Tangible Software Solutions Inc.
+// This class can be used by anyone provided that the copyright notice remains intact.
+//
+// This class provides the ability to initialize and delete array elements.
+//----------------------------------------------------------------------------------------
+internal static class Arrays
+{
+ internal static T[] InitializeWithDefaultInstances(int length) where T : new()
+ {
+ T[] array = new T[length];
+ for (int i = 0; i < length; i++)
+ {
+ array[i] = new T();
+ }
+ return array;
+ }
+
+ internal static void DeleteArray(T[] array) where T: System.IDisposable
+ {
+ foreach (T element in array)
+ {
+ if (element != null)
+ element.Dispose();
+ }
+ }
+}
\ No newline at end of file
diff --git a/open3mod/CapturePreview.cs b/open3mod/CapturePreview.cs
new file mode 100644
index 0000000..25987a7
--- /dev/null
+++ b/open3mod/CapturePreview.cs
@@ -0,0 +1,283 @@
+/* -LICENSE-START-
+** Copyright (c) 2017 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+using System;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+using DeckLinkAPI;
+using System.Threading;
+
+namespace open3mod
+{
+ public partial class CapturePreview : Form
+ {
+ private DeckLinkDeviceDiscovery m_deckLinkDiscovery;
+ private DeckLinkInputDevice m_selectedDevice;
+ private int m_number;
+ private readonly MainWindow m_mainWindow;
+
+ public CapturePreview(MainWindow mainWindow, int numb)
+ {
+ m_number = numb;
+ m_mainWindow = mainWindow;
+ InitializeComponent();
+
+ m_deckLinkDiscovery = new DeckLinkDeviceDiscovery();
+
+ m_deckLinkDiscovery.DeviceArrived += new DeckLinkDiscoveryHandler((d) => this.Invoke((Action)(() => AddDevice(d))));
+ m_deckLinkDiscovery.DeviceRemoved += new DeckLinkDiscoveryHandler((d) => this.Invoke((Action)(() => RemoveDevice(d))));
+ Thread.Sleep(100);
+ this.Text = "Camera #" + numb.ToString();
+
+ }
+
+ void AddDevice(IDeckLink decklinkInputDevice)
+ {
+ DeckLinkInputDevice deckLink = new DeckLinkInputDevice(decklinkInputDevice);
+
+
+ if (deckLink.deckLinkInput != null)
+ {
+ comboBoxInputDevice.BeginUpdate();
+ comboBoxInputDevice.Items.Add(new StringObjectPair(deckLink.deviceName, deckLink));
+ comboBoxInputDevice.EndUpdate();
+ deckLink.SetID(m_mainWindow,m_number);
+
+
+ if (comboBoxInputDevice.Items.Count == m_number)
+ {
+ comboBoxInputDevice.SelectedIndex = m_number-1;
+ EnableInterface(true);
+ buttonStartStop.Enabled = true;
+// StartCapture();
+ }
+ }
+ }
+
+ void RemoveDevice(IDeckLink decklinkInputDevice)
+ {
+ // Stop capture if the selected device was removed
+ if (m_selectedDevice != null && m_selectedDevice.deckLink == decklinkInputDevice)
+ {
+ if (m_selectedDevice.isCapturing)
+ StopCapture();
+
+ comboBoxInputDevice.SelectedIndex = -1;
+ m_selectedDevice = null;
+ }
+
+ // Remove the device from the dropdown
+ comboBoxInputDevice.BeginUpdate();
+ foreach (StringObjectPair item in comboBoxInputDevice.Items)
+ {
+ if (item.value.deckLink == decklinkInputDevice)
+ {
+ comboBoxInputDevice.Items.Remove(item);
+ break;
+ }
+ }
+ comboBoxInputDevice.EndUpdate();
+
+ if (comboBoxInputDevice.Items.Count == 0)
+ {
+ buttonStartStop.Enabled = false;
+ EnableInterface(false);
+ }
+ }
+
+ private void CapturePreview_Load(object sender, EventArgs e)
+ {
+ glWindow.InitGL(this);
+ buttonStartStop.Enabled = false;
+ EnableInterface(false);
+ m_deckLinkDiscovery.Enable();
+ }
+
+ public void GLDrawFrame()
+ {
+ glWindow.GLDrawFrame();
+ }
+
+ private void buttonStartStop_Click(object sender, EventArgs e)
+ {
+ if (m_selectedDevice == null)
+ return;
+
+ if (m_selectedDevice.isCapturing)
+ StopCapture();
+ else
+ StartCapture();
+ }
+
+ public void StartCapture()
+ {
+ if (comboBoxVideoFormat.SelectedIndex < 0)
+ return;
+
+ var displayMode = ((DisplayModeEntry)comboBoxVideoFormat.SelectedItem).displayMode;
+
+ m_selectedDevice.InputSignalChanged += new DeckLinkInputSignalHandler((v) => this.Invoke((Action)(() => { labelInvalidInput.Visible = v; })));
+ m_selectedDevice.InputFormatChanged += new DeckLinkFormatChangedHandler((m) => this.Invoke((Action)(() => { DisplayModeChanged(m); })));
+
+ if (m_selectedDevice != null)
+ m_selectedDevice.StartCapture(displayMode, glWindow, checkBoxAutodetectFormat.Checked);
+
+ // Update UI
+ buttonStartStop.Text = "Stop Capture";
+ EnableInterface(false);
+ }
+
+
+ private void DisplayModeChanged(IDeckLinkDisplayMode newDisplayMode)
+ {
+ foreach (DisplayModeEntry item in comboBoxVideoFormat.Items)
+ {
+ if (item.displayMode.GetDisplayMode() == newDisplayMode.GetDisplayMode())
+ comboBoxVideoFormat.SelectedItem = item;
+ if (m_selectedDevice !=null) labelPixelFormat.Text = m_selectedDevice.pxFormat;
+ }
+ }
+
+ public void StopCapture()
+ {
+ if (m_selectedDevice != null)
+ m_selectedDevice.StopCapture();
+
+ // Update UI
+ buttonStartStop.Text = "Start Capture";
+ EnableInterface(true);
+ labelInvalidInput.Visible = false;
+ }
+
+ public void SetTimecode(string timecode)
+ {
+ labelTimecode.Text = timecode;
+ labelTimecode.Invalidate();
+ }
+
+
+ private void comboBoxInputDevice_SelectedValueChanged(object sender, EventArgs e)
+ {
+ m_selectedDevice = null;
+
+ if (comboBoxInputDevice.SelectedIndex < 0)
+ return;
+
+ m_selectedDevice = ((StringObjectPair)comboBoxInputDevice.SelectedItem).value;
+
+ // Update the video mode popup menu
+ RefreshVideoModeList();
+
+ // Enable the interface
+ EnableInterface(true);
+
+ checkBoxAutodetectFormat.Checked = m_selectedDevice.supportsFormatDetection;
+ }
+
+ private void EnableInterface(bool enabled)
+ {
+ comboBoxInputDevice.Enabled = enabled;
+ comboBoxVideoFormat.Enabled = enabled;
+ labelPixelFormat.Enabled = enabled;
+ labelTimecode.Enabled = enabled;
+
+ checkBoxAutodetectFormat.Enabled = enabled;
+ if (enabled && m_selectedDevice != null && !m_selectedDevice.supportsFormatDetection)
+ {
+ checkBoxAutodetectFormat.Enabled = false;
+ checkBoxAutodetectFormat.Checked = false;
+ }
+ }
+
+ private void RefreshVideoModeList()
+ {
+ comboBoxVideoFormat.BeginUpdate();
+ comboBoxVideoFormat.Items.Clear();
+
+ foreach (IDeckLinkDisplayMode displayMode in m_selectedDevice)
+ comboBoxVideoFormat.Items.Add(new DisplayModeEntry(displayMode));
+
+ labelPixelFormat.Text = m_selectedDevice.pxFormat;
+ comboBoxVideoFormat.SelectedIndex = 0;
+ comboBoxVideoFormat.EndUpdate();
+ }
+
+
+ ///
+ /// Used for putting the IDeckLinkDisplayMode objects into the video format
+ /// combo box.
+ ///
+ struct DisplayModeEntry
+ {
+ public IDeckLinkDisplayMode displayMode;
+
+ public DisplayModeEntry(IDeckLinkDisplayMode displayMode)
+ {
+ this.displayMode = displayMode;
+ }
+
+ public override string ToString()
+ {
+ string str;
+
+ displayMode.GetName(out str);
+
+ return str;
+ }
+ }
+
+ ///
+ /// Used for putting other object types into combo boxes.
+ ///
+ struct StringObjectPair
+ {
+ public string name;
+ public T value;
+
+ public StringObjectPair(string name, T value)
+ {
+ this.name = name;
+ this.value = value;
+ }
+
+ public override string ToString()
+ {
+ return name;
+ }
+ }
+
+ private void CapturePreview_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ if (e.CloseReason == CloseReason.UserClosing)
+ {
+ e.Cancel = true;
+ Hide();
+ }
+ else StopCapture();
+ }
+
+ }
+}
diff --git a/open3mod/CapturePreview.designer.cs b/open3mod/CapturePreview.designer.cs
new file mode 100644
index 0000000..95b33cd
--- /dev/null
+++ b/open3mod/CapturePreview.designer.cs
@@ -0,0 +1,242 @@
+namespace open3mod
+{
+ partial class CapturePreview
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.labelTimecode = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.labelPixelFormat = new System.Windows.Forms.Label();
+ this.buttonStartStop = new System.Windows.Forms.Button();
+ this.checkBoxAutodetectFormat = new System.Windows.Forms.CheckBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.comboBoxVideoFormat = new System.Windows.Forms.ComboBox();
+ this.comboBoxInputDevice = new System.Windows.Forms.ComboBox();
+ this.labelInvalidInput = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.glWindow = new open3mod.GLWindow();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.label4);
+ this.groupBox1.Controls.Add(this.labelTimecode);
+ this.groupBox1.Controls.Add(this.label5);
+ this.groupBox1.Controls.Add(this.labelPixelFormat);
+ this.groupBox1.Controls.Add(this.buttonStartStop);
+ this.groupBox1.Controls.Add(this.checkBoxAutodetectFormat);
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.comboBoxVideoFormat);
+ this.groupBox1.Controls.Add(this.comboBoxInputDevice);
+ this.groupBox1.Controls.Add(this.labelInvalidInput);
+ this.groupBox1.Controls.Add(this.label3);
+ this.groupBox1.Controls.Add(this.label1);
+ this.groupBox1.Location = new System.Drawing.Point(13, 13);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(374, 161);
+ this.groupBox1.TabIndex = 0;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Capture Properties";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(83, 115);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(54, 13);
+ this.label4.TabIndex = 11;
+ this.label4.Text = "Timecode";
+ //
+ // labelTimecode
+ //
+ this.labelTimecode.AutoSize = true;
+ this.labelTimecode.Location = new System.Drawing.Point(150, 115);
+ this.labelTimecode.Name = "labelTimecode";
+ this.labelTimecode.Size = new System.Drawing.Size(40, 13);
+ this.labelTimecode.TabIndex = 10;
+ this.labelTimecode.Text = "--:--:--:--";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(83, 97);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(61, 13);
+ this.label5.TabIndex = 9;
+ this.label5.Text = "Pixel format";
+ //
+ // labelPixelFormat
+ //
+ this.labelPixelFormat.AutoSize = true;
+ this.labelPixelFormat.Location = new System.Drawing.Point(150, 97);
+ this.labelPixelFormat.Name = "labelPixelFormat";
+ this.labelPixelFormat.Size = new System.Drawing.Size(69, 13);
+ this.labelPixelFormat.TabIndex = 8;
+ this.labelPixelFormat.Text = "Not detected";
+ //
+ // buttonStartStop
+ //
+ this.buttonStartStop.Location = new System.Drawing.Point(266, 129);
+ this.buttonStartStop.Name = "buttonStartStop";
+ this.buttonStartStop.Size = new System.Drawing.Size(95, 23);
+ this.buttonStartStop.TabIndex = 7;
+ this.buttonStartStop.Text = "Start Capture";
+ this.buttonStartStop.UseVisualStyleBackColor = true;
+ this.buttonStartStop.Click += new System.EventHandler(this.buttonStartStop_Click);
+ //
+ // checkBoxAutodetectFormat
+ //
+ this.checkBoxAutodetectFormat.AutoSize = true;
+ this.checkBoxAutodetectFormat.Location = new System.Drawing.Point(153, 44);
+ this.checkBoxAutodetectFormat.Name = "checkBoxAutodetectFormat";
+ this.checkBoxAutodetectFormat.Size = new System.Drawing.Size(15, 14);
+ this.checkBoxAutodetectFormat.TabIndex = 6;
+ this.checkBoxAutodetectFormat.UseVisualStyleBackColor = true;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(8, 44);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(136, 13);
+ this.label2.TabIndex = 1;
+ this.label2.Text = "Apply detected input format";
+ //
+ // comboBoxVideoFormat
+ //
+ this.comboBoxVideoFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxVideoFormat.FormattingEnabled = true;
+ this.comboBoxVideoFormat.Location = new System.Drawing.Point(153, 64);
+ this.comboBoxVideoFormat.Name = "comboBoxVideoFormat";
+ this.comboBoxVideoFormat.Size = new System.Drawing.Size(212, 21);
+ this.comboBoxVideoFormat.TabIndex = 5;
+ //
+ // comboBoxInputDevice
+ //
+ this.comboBoxInputDevice.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxInputDevice.FormattingEnabled = true;
+ this.comboBoxInputDevice.Location = new System.Drawing.Point(153, 17);
+ this.comboBoxInputDevice.Name = "comboBoxInputDevice";
+ this.comboBoxInputDevice.Size = new System.Drawing.Size(212, 21);
+ this.comboBoxInputDevice.TabIndex = 4;
+ this.comboBoxInputDevice.SelectedValueChanged += new System.EventHandler(this.comboBoxInputDevice_SelectedValueChanged);
+ //
+ // labelInvalidInput
+ //
+ this.labelInvalidInput.AutoSize = true;
+ this.labelInvalidInput.Location = new System.Drawing.Point(42, 138);
+ this.labelInvalidInput.Name = "labelInvalidInput";
+ this.labelInvalidInput.Size = new System.Drawing.Size(102, 13);
+ this.labelInvalidInput.TabIndex = 3;
+ this.labelInvalidInput.Text = "No valid input signal";
+ this.labelInvalidInput.Visible = false;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(78, 67);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(66, 13);
+ this.label3.TabIndex = 2;
+ this.label3.Text = "Video format";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(78, 20);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(66, 13);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Input device";
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.glWindow);
+ this.groupBox2.Location = new System.Drawing.Point(393, 13);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(253, 161);
+ this.groupBox2.TabIndex = 1;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Preview";
+ //
+ // glWindow
+ //
+ this.glWindow.BackColor = System.Drawing.Color.Black;
+ this.glWindow.Location = new System.Drawing.Point(6, 17);
+ this.glWindow.Name = "glWindow";
+ this.glWindow.Size = new System.Drawing.Size(240, 135);
+ this.glWindow.TabIndex = 0;
+ this.glWindow.VSync = false;
+ //
+ // CapturePreview
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(654, 182);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
+ this.DoubleBuffered = true;
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+ this.MaximizeBox = false;
+ this.Name = "CapturePreview";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+ this.Text = "Camera #";
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.CapturePreview_FormClosing);
+ this.Load += new System.EventHandler(this.CapturePreview_Load);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.Button buttonStartStop;
+ private System.Windows.Forms.CheckBox checkBoxAutodetectFormat;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.ComboBox comboBoxVideoFormat;
+ private System.Windows.Forms.ComboBox comboBoxInputDevice;
+ private System.Windows.Forms.Label labelInvalidInput;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private GLWindow glWindow;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Label labelPixelFormat;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label labelTimecode;
+ }
+}
+
diff --git a/open3mod/CapturePreview.resx b/open3mod/CapturePreview.resx
new file mode 100644
index 0000000..61bc649
--- /dev/null
+++ b/open3mod/CapturePreview.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ True
+
+
\ No newline at end of file
diff --git a/open3mod/Contributors.txt b/open3mod/Contributors.txt
new file mode 100644
index 0000000..5bca0e4
--- /dev/null
+++ b/open3mod/Contributors.txt
@@ -0,0 +1,11 @@
+Contributors to Open3Mod
+=================================================
+In chronological order (Github username in parentheses)
+
+
+Alexander Gessler (acgessler)
+ Project Founder, Core Development
+
+Tobias Rittig (diiigle)
+ Leap Motion Support, Bugfixes, Usability Tweaks
+
diff --git a/open3mod/CoreSettings.Designer.cs b/open3mod/CoreSettings.Designer.cs
index a1726a6..92cd547 100644
--- a/open3mod/CoreSettings.Designer.cs
+++ b/open3mod/CoreSettings.Designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Tento kód byl generován nástrojem.
+// Verze modulu runtime:4.0.30319.42000
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// Změny tohoto souboru mohou způsobit nesprávné chování a budou ztraceny,
+// dojde-li k novému generování kódu.
//
//------------------------------------------------------------------------------
@@ -12,7 +12,7 @@ namespace CoreSettings {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
internal sealed partial class CoreSettings : global::System.Configuration.ApplicationSettingsBase {
private static CoreSettings defaultInstance = ((CoreSettings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new CoreSettings())));
@@ -108,7 +108,7 @@ public bool RenderLit {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool ShowFps {
get {
return ((bool)(this["ShowFps"]));
@@ -451,5 +451,255 @@ public bool NormalVectorGeneratorRealtimePreview {
this["BackgroundColor"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("Black")]
+ public global::System.Drawing.Color BackgroundAlpha {
+ get {
+ return ((global::System.Drawing.Color)(this["BackgroundAlpha"]));
+ }
+ set {
+ this["BackgroundAlpha"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
+ public bool ShowVRModels {
+ get {
+ return ((bool)(this["ShowVRModels"]));
+ }
+ set {
+ this["ShowVRModels"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ public global::System.Collections.Specialized.StringCollection TrackerToCamera {
+ get {
+ return ((global::System.Collections.Specialized.StringCollection)(this["TrackerToCamera"]));
+ }
+ set {
+ this["TrackerToCamera"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string ViewOffset {
+ get {
+ return ((string)(this["ViewOffset"]));
+ }
+ set {
+ this["ViewOffset"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool UseTracking {
+ get {
+ return ((bool)(this["UseTracking"]));
+ }
+ set {
+ this["UseTracking"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool MarkFrames {
+ get {
+ return ((bool)(this["MarkFrames"]));
+ }
+ set {
+ this["MarkFrames"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool CheckDroppedFrames {
+ get {
+ return ((bool)(this["CheckDroppedFrames"]));
+ }
+ set {
+ this["CheckDroppedFrames"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool UseSceneLights {
+ get {
+ return ((bool)(this["UseSceneLights"]));
+ }
+ set {
+ this["UseSceneLights"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool SendNDI {
+ get {
+ return ((bool)(this["SendNDI"]));
+ }
+ set {
+ this["SendNDI"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool KeepTimingRight {
+ get {
+ return ((bool)(this["KeepTimingRight"]));
+ }
+ set {
+ this["KeepTimingRight"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string ViewsStatus {
+ get {
+ return ((string)(this["ViewsStatus"]));
+ }
+ set {
+ this["ViewsStatus"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("0")]
+ public int RecentTabsOpened {
+ get {
+ return ((int)(this["RecentTabsOpened"]));
+ }
+ set {
+ this["RecentTabsOpened"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ public global::System.Collections.Specialized.StringCollection RecentTabs {
+ get {
+ return ((global::System.Collections.Specialized.StringCollection)(this["RecentTabs"]));
+ }
+ set {
+ this["RecentTabs"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool Genlock {
+ get {
+ return ((bool)(this["Genlock"]));
+ }
+ set {
+ this["Genlock"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
+ public global::System.Drawing.Point LocationCam1 {
+ get {
+ return ((global::System.Drawing.Point)(this["LocationCam1"]));
+ }
+ set {
+ this["LocationCam1"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
+ public global::System.Drawing.Point LocationCam2 {
+ get {
+ return ((global::System.Drawing.Point)(this["LocationCam2"]));
+ }
+ set {
+ this["LocationCam2"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
+ public global::System.Drawing.Point LocationOutput {
+ get {
+ return ((global::System.Drawing.Point)(this["LocationOutput"]));
+ }
+ set {
+ this["LocationOutput"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("0")]
+ public float SecondsToPhotons {
+ get {
+ return ((float)(this["SecondsToPhotons"]));
+ }
+ set {
+ this["SecondsToPhotons"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("0")]
+ public float FovCam1 {
+ get {
+ return ((float)(this["FovCam1"]));
+ }
+ set {
+ this["FovCam1"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("0")]
+ public float FovCam2 {
+ get {
+ return ((float)(this["FovCam2"]));
+ }
+ set {
+ this["FovCam2"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool AutoStart {
+ get {
+ return ((bool)(this["AutoStart"]));
+ }
+ set {
+ this["AutoStart"] = value;
+ }
+ }
}
}
diff --git a/open3mod/CoreSettings.settings b/open3mod/CoreSettings.settings
index b02dd79..08a3a58 100644
--- a/open3mod/CoreSettings.settings
+++ b/open3mod/CoreSettings.settings
@@ -24,7 +24,7 @@
True
- False
+ True
False
@@ -110,5 +110,68 @@
DarkGray
+
+ Black
+
+
+ True
+
+
+
+
+
+
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+
+
+
+ 0
+
+
+
+
+
+ False
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ False
+
\ No newline at end of file
diff --git a/open3mod/CpuSkinningEvaluator.cs b/open3mod/CpuSkinningEvaluator.cs
index 6391993..934f0d9 100644
--- a/open3mod/CpuSkinningEvaluator.cs
+++ b/open3mod/CpuSkinningEvaluator.cs
@@ -160,7 +160,7 @@ private void EvaluateBoneInfluences(ref Vector3 pos, uint vertexIndex, Matrix4[]
}
else
{
- Vector3.Transform(ref pos, ref boneMatrices[boneWeightTuple.Item1], out tmp);
+ Vector3.TransformPerspective(ref pos, ref boneMatrices[boneWeightTuple.Item1], out tmp); //perpective added
}
transformedPos += tmp * boneWeightTuple.Item2;
}
diff --git a/open3mod/DeckLinkDevice.cs b/open3mod/DeckLinkDevice.cs
new file mode 100644
index 0000000..0e1d079
--- /dev/null
+++ b/open3mod/DeckLinkDevice.cs
@@ -0,0 +1,417 @@
+/* -LICENSE-START-
+** Copyright (c) 2017 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+using System;
+using DeckLinkAPI;
+using System.Collections.Generic;
+
+namespace open3mod
+{
+ public delegate void DeckLinkInputSignalHandler(bool inputSignal);
+ public delegate void DeckLinkFormatChangedHandler(IDeckLinkDisplayMode newDisplayMode);
+ class DeckLinkInputDevice : IDeckLinkInputCallback, IEnumerable
+ {
+ private IDeckLink m_deckLink;
+ private IDeckLinkInput m_deckLinkInput;
+ private bool m_applyDetectedInputMode = true;
+ private bool m_currentlyCapturing = false;
+ private bool m_validInputSignal = false;
+ string m_pxFormat = "Unknown";
+ private int m_number = 0;
+ private MainWindow m_mainWindow;
+
+ public void SetID(MainWindow mainWindow, int numb)
+ {
+ m_number = numb;
+ m_mainWindow = mainWindow;
+ }
+
+ public DeckLinkInputDevice(IDeckLink deckLink)
+ {
+ m_deckLink = deckLink;
+
+ // Get input interface
+ try
+ {
+ m_deckLinkInput = (IDeckLinkInput)m_deckLink;
+ }
+ catch (InvalidCastException)
+ {
+ // No input interface found, eg in case of DeckLink Mini Monitor
+ return;
+ }
+ }
+
+ public event DeckLinkInputSignalHandler InputSignalChanged;
+ public event DeckLinkFormatChangedHandler InputFormatChanged;
+
+ public IDeckLink deckLink
+ {
+ get { return m_deckLink; }
+ }
+
+ public IDeckLinkInput deckLinkInput
+ {
+ get { return m_deckLinkInput; }
+ }
+
+ public string deviceName
+ {
+ get
+ {
+ string deviceName;
+ m_deckLink.GetDisplayName(out deviceName);
+ return deviceName;
+ }
+ }
+
+ public bool supportsFormatDetection
+ {
+ get
+ {
+ int flag;
+ var deckLinkAttributes = (IDeckLinkAttributes)m_deckLink;
+ deckLinkAttributes.GetFlag(_BMDDeckLinkAttributeID.BMDDeckLinkSupportsInputFormatDetection, out flag);
+ return flag != 0;
+ }
+ }
+
+ public bool isCapturing
+ {
+ get { return m_currentlyCapturing; }
+ }
+
+ public string pxFormat
+ {
+ get
+ {
+ return m_pxFormat;
+ }
+ }
+
+ void IDeckLinkInputCallback.VideoInputFormatChanged(_BMDVideoInputFormatChangedEvents notificationEvents, IDeckLinkDisplayMode newDisplayMode, _BMDDetectedVideoInputFormatFlags detectedSignalFlags)
+ {
+ // Restart capture with the new video mode if told to
+ if (! m_applyDetectedInputMode)
+ return;
+
+ var pixelFormat = _BMDPixelFormat.bmdFormat10BitYUV;
+ if (detectedSignalFlags.HasFlag(_BMDDetectedVideoInputFormatFlags.bmdDetectedVideoInputRGB444))
+ {
+ m_pxFormat = "10 bit RGB";
+ pixelFormat = _BMDPixelFormat.bmdFormat10BitRGB;
+ }
+ if (detectedSignalFlags.HasFlag(_BMDDetectedVideoInputFormatFlags.bmdDetectedVideoInputYCbCr422))
+ {
+ m_pxFormat = "10 bit YUV";
+ pixelFormat = _BMDPixelFormat.bmdFormat10BitYUV;
+ }
+ if (detectedSignalFlags.HasFlag(_BMDDetectedVideoInputFormatFlags.bmdDetectedVideoInputDualStream3D))
+ {
+ m_pxFormat = "Dual Stream 3D";
+ pixelFormat = _BMDPixelFormat.bmdFormat10BitYUV;
+ }
+
+ // Stop the capture
+ m_deckLinkInput.StopStreams();
+
+ // Set the video input mode
+ //For upload to GPU we need 8bitYUV
+ // m_deckLinkInput.EnableVideoInput(newDisplayMode.GetDisplayMode(), pixelFormat, _BMDVideoInputFlags.bmdVideoInputEnableFormatDetection);
+ m_deckLinkInput.EnableVideoInput(newDisplayMode.GetDisplayMode(), _BMDPixelFormat.bmdFormat8BitYUV, _BMDVideoInputFlags.bmdVideoInputEnableFormatDetection);
+ m_deckLinkInput.EnableAudioInput(_BMDAudioSampleRate.bmdAudioSampleRate48kHz, _BMDAudioSampleType.bmdAudioSampleType16bitInteger, 16);
+
+ // Start the capture
+ m_deckLinkInput.StartStreams();
+
+ InputFormatChanged(newDisplayMode);
+ }
+
+ void IDeckLinkInputCallback.VideoInputFrameArrived(IDeckLinkVideoInputFrame videoFrame, IDeckLinkAudioInputPacket audioPacket)
+ {
+ IntPtr audioData = (IntPtr)0;
+ IntPtr videoData = (IntPtr)0;
+ if (videoFrame != null)
+ {
+ bool inputSignalChange = videoFrame.GetFlags().HasFlag(_BMDFrameFlags.bmdFrameHasNoInputSource);
+ if (inputSignalChange != m_validInputSignal)
+ {
+ m_validInputSignal = inputSignalChange;
+ InputSignalChanged(m_validInputSignal);
+ }
+ if (inputSignalChange == false) //i.e. frame is valid
+ {
+ videoFrame.GetBytes(out videoData);
+ m_mainWindow.callFrameLoop(m_number, videoData);
+ }
+ }
+ if (audioPacket != null)
+ {
+ audioPacket.GetBytes(out audioData);
+ m_mainWindow.handleAudio(m_number,audioData);
+ }
+ System.Runtime.InteropServices.Marshal.ReleaseComObject(audioPacket);
+ System.Runtime.InteropServices.Marshal.ReleaseComObject(videoFrame);
+ }
+
+ IEnumerator IEnumerable.GetEnumerator()
+ {
+ IDeckLinkDisplayModeIterator displayModeIterator;
+ m_deckLinkInput.GetDisplayModeIterator(out displayModeIterator);
+ return new DisplayModeEnum(displayModeIterator);
+ }
+
+ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+ {
+ throw new InvalidOperationException();
+ }
+
+ public void StartCapture(IDeckLinkDisplayMode displayMode, IDeckLinkScreenPreviewCallback screenPreviewCallback, bool applyDetectedInputMode)
+ {
+ if (m_currentlyCapturing)
+ return;
+
+ var videoInputFlags = _BMDVideoInputFlags.bmdVideoInputFlagDefault;
+
+ m_applyDetectedInputMode = applyDetectedInputMode;
+ m_validInputSignal = false;
+
+ // Enable input video mode detection if the device supports it
+ if (supportsFormatDetection && m_applyDetectedInputMode)
+ videoInputFlags |= _BMDVideoInputFlags.bmdVideoInputEnableFormatDetection;
+
+ // Set the screen preview
+ m_deckLinkInput.SetScreenPreviewCallback(screenPreviewCallback);
+
+ // Set capture callback
+ m_deckLinkInput.SetCallback(this);
+
+ // Set the video input mode
+ //For upload to GPU we need 8bitYUV
+ m_deckLinkInput.EnableVideoInput(displayMode.GetDisplayMode(), _BMDPixelFormat.bmdFormat8BitYUV, videoInputFlags);
+ m_deckLinkInput.EnableAudioInput(_BMDAudioSampleRate.bmdAudioSampleRate48kHz, _BMDAudioSampleType.bmdAudioSampleType16bitInteger, 16);
+
+ // Start the capture
+ m_deckLinkInput.StartStreams();
+
+ m_currentlyCapturing = true;
+ }
+
+ public void StopCapture()
+ {
+ if (!m_currentlyCapturing)
+ return;
+
+ RemoveAllListeners();
+
+ // Stop the capture
+ m_deckLinkInput.StopStreams();
+
+ // disable callbacks
+ m_deckLinkInput.SetScreenPreviewCallback(null);
+ m_deckLinkInput.SetCallback(null);
+
+ m_currentlyCapturing = false;
+ }
+
+ void RemoveAllListeners()
+ {
+ InputSignalChanged = null;
+ InputFormatChanged = null;
+ }
+ }
+
+ public delegate void DeckLinkVideoOutputHandler(bool prerolling);
+ public delegate void DeckLinkPlaybackStoppedHandler();
+ public delegate void DeckLinkAudioOutputHandler();
+ public class DeckLinkOutputDevice : IDeckLinkVideoOutputCallback, IDeckLinkAudioOutputCallback, IEnumerable
+ {
+ private IDeckLink m_deckLink;
+ private IDeckLinkOutput m_deckLinkOutput;
+
+ public DeckLinkOutputDevice(IDeckLink deckLink)
+ {
+ m_deckLink = deckLink;
+
+ // Get output interface
+ try
+ {
+ m_deckLinkOutput = (IDeckLinkOutput)m_deckLink;
+ }
+ catch (InvalidCastException)
+ {
+ // No output interface found, eg in case of DeckLink Mini Recorder
+ return;
+ }
+
+ // Provide the delegate to the audio and video output interfaces
+ m_deckLinkOutput.SetScheduledFrameCompletionCallback(this);
+ m_deckLinkOutput.SetAudioCallback(this);
+ }
+
+ public event DeckLinkVideoOutputHandler VideoFrameCompleted;
+ public event DeckLinkPlaybackStoppedHandler PlaybackStopped;
+ public event DeckLinkAudioOutputHandler AudioOutputRequested;
+
+ public IDeckLink deckLink
+ {
+ get { return m_deckLink; }
+ }
+
+ public IDeckLinkOutput deckLinkOutput
+ {
+ get { return m_deckLinkOutput; }
+ }
+
+ public string deviceName
+ {
+ get
+ {
+ string deviceName;
+ m_deckLink.GetDisplayName(out deviceName);
+ return deviceName;
+ }
+ }
+
+ public void RemoveAllListeners()
+ {
+ AudioOutputRequested = null;
+ PlaybackStopped = null;
+ VideoFrameCompleted = null;
+ }
+
+ IEnumerator IEnumerable.GetEnumerator()
+ {
+ IDeckLinkDisplayModeIterator displayModeIterator;
+ m_deckLinkOutput.GetDisplayModeIterator(out displayModeIterator);
+ return new DisplayModeEnum(displayModeIterator);
+ }
+
+ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+ {
+ throw new InvalidOperationException();
+ }
+
+ #region callbacks
+ // Explicit implementation of IDeckLinkVideoOutputCallback and IDeckLinkAudioOutputCallback
+ void IDeckLinkVideoOutputCallback.ScheduledFrameCompleted(IDeckLinkVideoFrame completedFrame, _BMDOutputFrameCompletionResult result)
+ {
+ // When a video frame has been completed, generate event to schedule next frame
+ VideoFrameCompleted(false);
+ }
+
+ void IDeckLinkVideoOutputCallback.ScheduledPlaybackHasStopped()
+ {
+ PlaybackStopped();
+ }
+
+ void IDeckLinkAudioOutputCallback.RenderAudioSamples(int preroll)
+ {
+ // Provide further audio samples to the DeckLink API until our preferred buffer waterlevel is reached
+ AudioOutputRequested();
+
+ if (preroll != 0)
+ {
+ m_deckLinkOutput.StartScheduledPlayback(0, 100, 1.0);
+ }
+ }
+ #endregion
+ }
+
+
+ class DisplayModeEnum : IEnumerator
+ {
+ private IDeckLinkDisplayModeIterator m_displayModeIterator;
+ private IDeckLinkDisplayMode m_displayMode;
+
+ public DisplayModeEnum(IDeckLinkDisplayModeIterator displayModeIterator)
+ {
+ m_displayModeIterator = displayModeIterator;
+ }
+
+ IDeckLinkDisplayMode IEnumerator.Current
+ {
+ get { return m_displayMode; }
+ }
+
+ bool System.Collections.IEnumerator.MoveNext()
+ {
+ m_displayModeIterator.Next(out m_displayMode);
+ return m_displayMode != null;
+ }
+
+ void IDisposable.Dispose()
+ {
+ }
+
+ object System.Collections.IEnumerator.Current
+ {
+ get { return m_displayMode; }
+ }
+
+ void System.Collections.IEnumerator.Reset()
+ {
+ throw new InvalidOperationException();
+ }
+ }
+
+ public delegate void DeckLinkDiscoveryHandler(IDeckLink decklinkDevice);
+ class DeckLinkDeviceDiscovery : IDeckLinkDeviceNotificationCallback
+ {
+ private IDeckLinkDiscovery m_deckLinkDiscovery;
+
+ public event DeckLinkDiscoveryHandler DeviceArrived;
+ public event DeckLinkDiscoveryHandler DeviceRemoved;
+
+ public DeckLinkDeviceDiscovery()
+ {
+ m_deckLinkDiscovery = new CDeckLinkDiscovery();
+ }
+ ~DeckLinkDeviceDiscovery()
+ {
+ Disable();
+ }
+
+ public void Enable()
+ {
+ m_deckLinkDiscovery.InstallDeviceNotifications(this);
+ }
+ public void Disable()
+ {
+ m_deckLinkDiscovery.UninstallDeviceNotifications();
+ }
+
+ void IDeckLinkDeviceNotificationCallback.DeckLinkDeviceArrived(IDeckLink deckLinkDevice)
+ {
+ DeviceArrived(deckLinkDevice);
+ }
+
+ void IDeckLinkDeviceNotificationCallback.DeckLinkDeviceRemoved(IDeckLink deckLinkDevice)
+ {
+ DeviceRemoved(deckLinkDevice);
+ }
+ }
+}
diff --git a/open3mod/DefineConstants.cs b/open3mod/DefineConstants.cs
new file mode 100644
index 0000000..05bb885
--- /dev/null
+++ b/open3mod/DefineConstants.cs
@@ -0,0 +1,21 @@
+//========================================================================
+// This conversion was produced by the Free Edition of
+// C++ to C# Converter courtesy of Tangible Software Solutions.
+// Order the Premium Edition at https://www.tangiblesoftwaresolutions.com
+//========================================================================
+
+internal static class DefineConstants
+{
+ public const int MAX_UNICODE_PATH = 32767;
+//C++ TO C# CONVERTER TODO TASK: The following #define constant was defined in different ways:
+ public const string DYNAMIC_LIB_EXT = ".dll";
+ public const string DYNAMIC_LIB_EXT = ".dylib";
+ public const string DYNAMIC_LIB_EXT = ".so";
+//C++ TO C# CONVERTER TODO TASK: The following #define constant was defined in different ways:
+ public const string PLATSUBDIR = "win64";
+ public const string PLATSUBDIR = "win32";
+ public const string PLATSUBDIR = "osx32";
+ public const string PLATSUBDIR = "linux32";
+ public const string PLATSUBDIR = "linux64";
+ public const string PLATSUBDIR = "unknown_platform";
+}
\ No newline at end of file
diff --git a/open3mod/ExportSettings.Designer.cs b/open3mod/ExportSettings.Designer.cs
index 69e0989..457f3ee 100644
--- a/open3mod/ExportSettings.Designer.cs
+++ b/open3mod/ExportSettings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@ namespace open3mod {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")]
internal sealed partial class ExportSettings : global::System.Configuration.ApplicationSettingsBase {
private static ExportSettings defaultInstance = ((ExportSettings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new ExportSettings())));
diff --git a/open3mod/FpsCameraController.cs b/open3mod/FpsCameraController.cs
index d405669..8a2a8a3 100644
--- a/open3mod/FpsCameraController.cs
+++ b/open3mod/FpsCameraController.cs
@@ -20,17 +20,24 @@
using System;
using OpenTK;
+using System.Diagnostics;
+
namespace open3mod
{
public class FpsCameraController : ICameraController
{
private Matrix4 _view;
-
+ private float _fovy = MathHelper.PiOver4;
+ private float _zNear = 0.01f;
+ private float _zFar = 100.0f;
private Matrix4 _orientation;
private Vector3 _translation;
+ private ScenePartMode _scenePartMode = ScenePartMode.All;
- private static readonly Vector3 StartPosition = new Vector3(0.0f,1.0f,2.5f);
+ // private static readonly Vector3 StartPosition = new Vector3(-2.2f, 1.8f, -0.1f); //good start at home
+ // private static readonly Vector3 StartPosition = new Vector3(1.5f, 1.9f, -0.2f); //good start at the studio
+ private static readonly Vector3 StartPosition = new Vector3(0f, 0.7f, 1.8f); //good start at home
private bool _dirty = true;
private bool _updateOrientation = true;
private const float MovementBaseSpeed = 1.0f;
@@ -39,36 +46,56 @@ public class FpsCameraController : ICameraController
private float _pitchAngle = 0.0f;
private float _rollAngle = 0.0f;
- private float _yawAngle = 0.0f;
+// private float _yawAngle = -1.57f;
+ private float _yawAngle = 0f;
- public FpsCameraController()
+ public FpsCameraController(float fovy, ScenePartMode scenePartMode)
{
_view = Matrix4.Identity;
_translation = StartPosition;
-
+ _fovy = fovy;
+ _scenePartMode = scenePartMode;
UpdateViewMatrix();
}
public void SetPivot(Vector3 pivot)
{ }
+ public void SetViewNoOffset(Matrix4 view)
+ {
+ _view = view;
+ }
+
public Matrix4 GetView()
{
- if(_dirty)
+ if (_dirty)
{
UpdateViewMatrix();
}
- return _view;
+ return OpenVRInterface.viewOffset * _view;
}
+ public Matrix4 GetViewNoOffset()
+ {
+ return _view;
+ }
- public void Pan(float x, float y)
+ public float GetFOV()
{
-
+ return _fovy;
+ }
+ public void SetParam(float fovy, ScenePartMode scenePartMode, CameraMode mode)
+ {
+ _scenePartMode = scenePartMode;
+ Debug.Assert(mode == CameraMode.Fps);
+ _fovy = fovy;
}
+ public void Pan(float x, float y)
+ {
+ }
public void MovementKey(float x, float y, float z)
{
@@ -87,6 +114,15 @@ public CameraMode GetCameraMode()
return CameraMode.Fps;
}
+ public ScenePartMode GetScenePartMode()
+ {
+ return _scenePartMode;
+ }
+
+ public void SetScenePartMode(ScenePartMode value)
+ {
+ _scenePartMode = value;
+ }
public void MouseMove(int x, int y)
{
@@ -123,8 +159,8 @@ private void UpdateViewMatrix()
_view = GetOrientation();
_view *= Matrix4.CreateFromAxisAngle(_view.Row0.Xyz, _pitchAngle);
_view.Transpose();
-
_view = Matrix4.CreateTranslation(-_translation) * _view;
+
_dirty = false;
}
diff --git a/open3mod/FpsTracker.cs b/open3mod/FpsTracker.cs
index 44ae096..800b1e3 100644
--- a/open3mod/FpsTracker.cs
+++ b/open3mod/FpsTracker.cs
@@ -20,6 +20,7 @@
using System.Diagnostics;
using System.Threading;
+using System;
namespace open3mod
{
@@ -36,9 +37,8 @@ public class FpsTracker
// limit maximum framerate to avoid taking too much CPU, overheating
// laptop mainboards or accidentially causing nuclear detonations.
- public const int FRAMERATE_LIMIT = 100;
-
-
+ public const int FRAMERATE_LIMIT = 80;
+
public double LastFrameDelta
{
get { return _lastFrameDelta; }
@@ -70,7 +70,6 @@ public void Update()
_lastFrameDelta = _sw.Elapsed.TotalMilliseconds / 1000.0;
_sw.Reset();
}
-
_sw.Start();
// prevent divide by zero
diff --git a/open3mod/GLWindow.cs b/open3mod/GLWindow.cs
new file mode 100644
index 0000000..e87d594
--- /dev/null
+++ b/open3mod/GLWindow.cs
@@ -0,0 +1,188 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Open 3D Model Viewer (open3mod) (v2.0)
+// [RenderControl.cs]
+// (c) 2012-2015, Open3Mod Contributors
+//
+// Licensed under the terms and conditions of the 3-clause BSD license. See
+// the LICENSE file in the root folder of the repository for the details.
+//
+// HIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+///////////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using DeckLinkAPI;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Graphics.OpenGL;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Imaging;
+
+namespace open3mod
+{
+ ///
+ /// Dummy derivative of GLControl to be able to specify constructor
+ /// parameters while still being usable with the WinForms designer.
+ ///
+ /// The RenderControl always requests a stencil buffer and a 24 bit depth
+ /// buffer, which should be natively supported by most hardware in use today.
+ ///
+ /// MultiSampling is requested according to the current value of
+ /// GraphicsSettings.Default.UseMultiSampling.
+ ///
+ ///
+ class GLWindow : GLControl, IDeckLinkScreenPreviewCallback
+ {
+ public GLWindow()
+ : base(new GraphicsMode(new ColorFormat(32), 24, 8, 0))
+ { }
+ private IDeckLinkGLScreenPreviewHelper m_previewHelper;
+ private string m_timeCodeString;
+ private bool glIsInitialized = false;
+ private long capturedFrames = 0;
+ GraphicsContext thisContext;
+ GraphicsMode gm;
+ private Color4 _backColor = new Color4(0.1f, 0.1f, 0.3f, 1.0f);
+
+ ///
+ /// Converts a value for GraphicsSettings.Default.MultiSampling into a device-specific
+ /// sample count.
+ ///
+ /// Device-independent quality level in [0,3]
+ /// Sample count for device
+ private static int GetSampleCount(int multiSampling)
+ {
+ // UI names:
+ /* None
+ Slight
+ Normal
+ Maximum
+ */
+ switch (multiSampling)
+ {
+ case 0:
+ return 0;
+ case 1:
+ return 2;
+ case 2:
+ return 4;
+ case 3:
+ return MaximumSampleCount();
+
+ }
+ Debug.Assert(false);
+ return 0;
+ }
+
+
+ ///
+ /// Determines the maximum number of FSAA samples supported by the hardware.
+ ///
+ ///
+ private static int MaximumSampleCount()
+ {
+ // http://www.opentk.com/node/2355 modified to actually work
+ var highest = 0;
+ var aa = 0;
+ do
+ {
+ var mode = new GraphicsMode(32, 0, 0, aa);
+ if (mode.Samples == aa && mode.Samples > highest)
+ {
+ highest = mode.Samples;
+ }
+ aa += 2;
+ } while (aa <= 32);
+ return highest;
+ }
+
+ private void InitializeComponent()
+ {
+ this.SuspendLayout();
+ //
+ // RenderControl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.Name = "RenderControl";
+ this.Size = new System.Drawing.Size(170, 162);
+ this.ResumeLayout(false);
+ }
+
+
+ public void InitGL(CapturePreview owner)
+ {
+ gm = new GraphicsMode(new ColorFormat(32), 24, 8, 0);
+ thisContext = new GraphicsContext(gm, WindowInfo);
+ this.MakeCurrent();
+ this.VSync = false;
+ GL.Viewport(0, 0, Width, Height);
+ GL.MatrixMode(MatrixMode.Projection);
+ GL.LoadIdentity();
+ GL.Ortho(-1.0, 1.0, -1.0, 1.0, -1.0, 1.0);
+ GL.MatrixMode(MatrixMode.Modelview);
+ GL.LoadIdentity();// Reset The View
+ GL.ClearColor(Color.DimGray);
+ GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
+ m_previewHelper = new CDeckLinkGLScreenPreviewHelper();
+ m_previewHelper.InitializeGL();
+ glIsInitialized = true;
+ }
+
+ protected override void OnPaint(PaintEventArgs e)
+ {
+ base.OnPaint(e);
+ var cgx = GraphicsContext.CurrentContext;
+ if (cgx != thisContext) this.MakeCurrent();
+ GLDrawFrame();
+ SwapBuffers();
+ }
+
+ void SetTimecode(IDeckLinkVideoFrame videoFrame)
+ {
+ IDeckLinkTimecode timecode;
+ m_timeCodeString = "--:--:--:--";
+ videoFrame.GetTimecode(_BMDTimecodeFormat.bmdTimecodeRP188Any, out timecode);
+ videoFrame.GetTimecode(_BMDTimecodeFormat.bmdTimecodeVITC, out timecode);
+ if (timecode != null)
+ {
+ timecode.GetString(out m_timeCodeString);
+ }
+ else
+ {
+ m_timeCodeString = capturedFrames.ToString();
+ }
+ }
+
+ public void GLDrawFrame()
+ {
+ if (!glIsInitialized) return;
+ m_previewHelper.PaintGL();
+ }
+
+ void IDeckLinkScreenPreviewCallback.DrawFrame(IDeckLinkVideoFrame theFrame)
+ {
+ if (!glIsInitialized) return;
+ // First, pass the frame to the DeckLink screen preview helper
+ SetTimecode(theFrame);
+ m_previewHelper.SetFrame(theFrame);
+ capturedFrames++;
+ Invalidate();
+ System.Runtime.InteropServices.Marshal.ReleaseComObject(theFrame);
+ }
+ }
+}
+
+
diff --git a/open3mod/GlWindow.resx b/open3mod/GlWindow.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/open3mod/GlWindow.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/open3mod/GlobalMembers.cs b/open3mod/GlobalMembers.cs
new file mode 100644
index 0000000..9dbdaa5
--- /dev/null
+++ b/open3mod/GlobalMembers.cs
@@ -0,0 +1,123 @@
+//========================================================================
+// This conversion was produced by the Free Edition of
+// C++ to C# Converter courtesy of Tangible Software Solutions.
+// Order the Premium Edition at https://www.tangiblesoftwaresolutions.com
+//========================================================================
+
+public static class GlobalMembers
+{
+ public static void ThreadSleep(uint nMilliseconds)
+ {
+ #if _WIN32
+ global::Sleep(nMilliseconds);
+ #elif POSIX
+ usleep(nMilliseconds * 1000);
+ #endif
+ }
+
+ internal static bool g_bPrintf = true;
+
+ //-----------------------------------------------------------------------------
+ // Purpose: Outputs a set of optional arguments to debugging output, using
+ // the printf format setting specified in fmt*.
+ //-----------------------------------------------------------------------------
+ public static void dprintf(string fmt, params object[] LegacyParamArray)
+ {
+ // va_list args;
+ string buffer = new string(new char[2048]);
+
+ int ParamCount = -1;
+ // va_start(args, fmt);
+ vsprintf_s(buffer, fmt, args);
+ // va_end(args);
+
+ if (g_bPrintf)
+ {
+ Console.Write("{0}", buffer);
+ }
+
+ OutputDebugStringA(buffer);
+ }
+
+
+ //-----------------------------------------------------------------------------
+ // Purpose: Helper to get a string from a tracked device property and turn it
+ // into a std::string
+ //-----------------------------------------------------------------------------
+ public static string GetTrackedDeviceString(vr.IVRSystem pHmd, vr.TrackedDeviceIndex_t unDevice, vr.TrackedDeviceProperty prop, vr.TrackedPropertyError peError = null)
+ {
+ uint32_t unRequiredBufferLen = pHmd.GetStringTrackedDeviceProperty(unDevice, prop, null, 0, peError);
+ if (unRequiredBufferLen == 0)
+ {
+ return "";
+ }
+
+ string pchBuffer = new string(new char[unRequiredBufferLen - 1]);
+ unRequiredBufferLen = pHmd.GetStringTrackedDeviceProperty(unDevice, prop, pchBuffer, unRequiredBufferLen, peError);
+ string sResult = ((char)pchBuffer).ToString();
+ pchBuffer = null;
+ return sResult;
+ }
+
+
+ //-----------------------------------------------------------------------------
+ // Purpose: Outputs the string in message to debugging output.
+ // All other parameters are ignored.
+ // Does not return any meaningful value or reference.
+ //-----------------------------------------------------------------------------
+ //C++ TO C# CONVERTER TODO TASK: The #define macro 'APIENTRY' was defined in multiple preprocessor conditionals and cannot be replaced in-line:
+//C++ TO C# CONVERTER NOTE: APIENTRY is not available in C#:
+//ORIGINAL LINE: void APIENTRY DebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const sbyte* message, const object* userParam)
+ public static void DebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, string message, object userParam)
+ {
+ dprintf("GL Error: %s\n", message);
+ }
+
+
+ //-----------------------------------------------------------------------------
+ // Purpose: Processes a single VR event
+ //-----------------------------------------------------------------------------
+ private void CMainApplication.ProcessVREvent(const vr.VREvent_t & event)
+ {
+ switch (event.eventType)
+ {
+ case vr.VREvent_TrackedDeviceActivated:
+ {
+ SetupRenderModelForTrackedDevice(event.trackedDeviceIndex);
+ dprintf("Device %u attached. Setting up render model.\n", event.trackedDeviceIndex);
+ }
+ break;
+ case vr.VREvent_TrackedDeviceDeactivated:
+ {
+ dprintf("Device %u detached.\n", event.trackedDeviceIndex);
+ }
+ break;
+ case vr.VREvent_TrackedDeviceUpdated:
+ {
+ dprintf("Device %u updated.\n", event.trackedDeviceIndex);
+ }
+ break;
+ }
+ }
+
+
+ //-----------------------------------------------------------------------------
+ // Purpose:
+ //-----------------------------------------------------------------------------
+ static int Main(int argc, string[] args)
+ {
+ CMainApplication pMainApplication = new CMainApplication(argc, args);
+
+ if (!pMainApplication.BInit())
+ {
+ pMainApplication.Shutdown();
+ return 1;
+ }
+
+ pMainApplication.RunMainLoop();
+
+ pMainApplication.Shutdown();
+
+ }
+
+}
\ No newline at end of file
diff --git a/open3mod/GraphicsSettings.Designer.cs b/open3mod/GraphicsSettings.Designer.cs
index 1c00400..252de25 100644
--- a/open3mod/GraphicsSettings.Designer.cs
+++ b/open3mod/GraphicsSettings.Designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Tento kód byl generován nástrojem.
+// Verze modulu runtime:4.0.30319.42000
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// Změny tohoto souboru mohou způsobit nesprávné chování a budou ztraceny,
+// dojde-li k novému generování kódu.
//
//------------------------------------------------------------------------------
@@ -12,7 +12,7 @@ namespace open3mod {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
internal sealed partial class GraphicsSettings : global::System.Configuration.ApplicationSettingsBase {
private static GraphicsSettings defaultInstance = ((GraphicsSettings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new GraphicsSettings())));
@@ -73,7 +73,7 @@ public int MultiSampling {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("0")]
+ [global::System.Configuration.DefaultSettingValueAttribute("1")]
public int RenderingBackend {
get {
return ((int)(this["RenderingBackend"]));
@@ -118,5 +118,101 @@ public int OutputBrightness {
this["OutputBrightness"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("111")]
+ public int KeyingColorH {
+ get {
+ return ((int)(this["KeyingColorH"]));
+ }
+ set {
+ this["KeyingColorH"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("47")]
+ public int KeyingColorS {
+ get {
+ return ((int)(this["KeyingColorS"]));
+ }
+ set {
+ this["KeyingColorS"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("58")]
+ public int KeyingColorV {
+ get {
+ return ((int)(this["KeyingColorV"]));
+ }
+ set {
+ this["KeyingColorV"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("50")]
+ public int KeyingSoftness {
+ get {
+ return ((int)(this["KeyingSoftness"]));
+ }
+ set {
+ this["KeyingSoftness"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool CancelColorRange {
+ get {
+ return ((bool)(this["CancelColorRange"]));
+ }
+ set {
+ this["CancelColorRange"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("50")]
+ public int CancelColorPower {
+ get {
+ return ((int)(this["CancelColorPower"]));
+ }
+ set {
+ this["CancelColorPower"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("50")]
+ public int KeyingVSensitivity {
+ get {
+ return ((int)(this["KeyingVSensitivity"]));
+ }
+ set {
+ this["KeyingVSensitivity"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("50")]
+ public int KeyingTreshold {
+ get {
+ return ((int)(this["KeyingTreshold"]));
+ }
+ set {
+ this["KeyingTreshold"] = value;
+ }
+ }
}
}
diff --git a/open3mod/GraphicsSettings.cs b/open3mod/GraphicsSettings.cs
new file mode 100644
index 0000000..823e350
--- /dev/null
+++ b/open3mod/GraphicsSettings.cs
@@ -0,0 +1,28 @@
+namespace open3mod {
+
+
+ // Tato třída umožňuje zpracovávat specifické události v třídě nastavení:
+ // Událost SettingChanging se vyvolá před změnou hodnoty nastavení.
+ // Událost PropertyChanged se vyvolá po změně hodnoty nastavení.
+ // Událost SettingsLoaded se vyvolá po načtení hodnot nastavení.
+ // Událost SettingsSaving se vyvolá před uložením hodnot nastavení.
+ internal sealed partial class GraphicsSettings {
+
+ public GraphicsSettings() {
+ // // Pro přidávání obslužných rutin událostí určených pro ukládání a změnu nastavení odkomentujte prosím níže uvedené řádky:
+ //
+ // this.SettingChanging += this.SettingChangingEventHandler;
+ //
+ // this.SettingsSaving += this.SettingsSavingEventHandler;
+ //
+ }
+
+ private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) {
+ // Kód pro zpracování události SettingChangingEvent přidejte sem.
+ }
+
+ private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
+ // Kód pro zpracování události SettingsSaving přidejte sem.
+ }
+ }
+}
diff --git a/open3mod/GraphicsSettings.settings b/open3mod/GraphicsSettings.settings
index db74bd2..961a30c 100644
--- a/open3mod/GraphicsSettings.settings
+++ b/open3mod/GraphicsSettings.settings
@@ -15,7 +15,7 @@
2
- 0
+ 1
1
@@ -26,5 +26,29 @@
50
+
+ 111
+
+
+ 47
+
+
+ 58
+
+
+ 50
+
+
+ False
+
+
+ 50
+
+
+ 50
+
+
+ 50
+
\ No newline at end of file
diff --git a/open3mod/HierarchyInspectionView.Designer.cs b/open3mod/HierarchyInspectionView.Designer.cs
index 104e165..d07724e 100644
--- a/open3mod/HierarchyInspectionView.Designer.cs
+++ b/open3mod/HierarchyInspectionView.Designer.cs
@@ -132,6 +132,8 @@ private void InitializeComponent()
this.imageListIconsHierarchy.Images.SetKeyName(2, "joints.png");
this.imageListIconsHierarchy.Images.SetKeyName(3, "mesh.png");
this.imageListIconsHierarchy.Images.SetKeyName(4, "HierarchyIconHidden.png");
+ this.imageListIconsHierarchy.Images.SetKeyName(5, "camera16x16.bmp");
+ this.imageListIconsHierarchy.Images.SetKeyName(6, "lightbulb16x16.BMP");
//
// labelNodeStats
//
@@ -266,7 +268,7 @@ private void InitializeComponent()
this.toolStripSeparator4,
this.detailsToolStripMenuItem1});
this.contextMenuStripMesh.Name = "contextMenuStripMesh";
- this.contextMenuStripMesh.Size = new System.Drawing.Size(174, 170);
+ this.contextMenuStripMesh.Size = new System.Drawing.Size(174, 148);
//
// toolStripMenuItemRenameMesh
//
diff --git a/open3mod/HierarchyInspectionView.cs b/open3mod/HierarchyInspectionView.cs
index 865c734..8589340 100644
--- a/open3mod/HierarchyInspectionView.cs
+++ b/open3mod/HierarchyInspectionView.cs
@@ -170,7 +170,6 @@ public int CountVisibleInstancedMeshes
get { return _visibleInstancedMeshes; }
}
-
private void CountMeshes()
{
var counters = new List(_scene.Raw.MeshCount);
@@ -339,11 +338,14 @@ private bool AddNodes(Node node, TreeNode uiNode, int level)
}
_nodePurposes.Add(node, purpose);
- // TODO(acgessler): Proper icons for lights and cameras.
var index = (int) purpose;
- if (purpose == NodePurpose.Light || purpose == NodePurpose.Camera)
+ if (purpose == NodePurpose.Light)
+ {
+ index = 6;
+ }
+ if (purpose == NodePurpose.Camera)
{
- index = 1;
+ index = 5;
}
newUiNode.ImageIndex = newUiNode.SelectedImageIndex = index;
@@ -406,17 +408,27 @@ private int GetIndexForMesh(Mesh mesh)
private void UpdateSceneVisibilityFilter(TreeNode hoverNode = null)
{
+ bool isLight = false;
var node = hoverNode ?? _tree.SelectedNode;
var item = node == null ? _scene.Raw.RootNode : node.Tag;
-
+ var itemAsNode = item as Node;
+ _scene.ActiveLight = null;
+ if ((node != null)&& (itemAsNode != null))
+ {
+ if (GetNodePurpose(itemAsNode) == NodePurpose.Light)
+ {
+ isLight = true;
+ _scene.ActiveLight = itemAsNode;
+ }
+ }
_filterByMesh.Clear();
var overrideSkeleton = false;
- if (item == _scene.Raw.RootNode && !HasHiddenNodes)
- {
- _scene.SetVisibleNodes(null);
-
+ if ((item == _scene.Raw.RootNode && !HasHiddenNodes) || isLight)
+ // If the selected item is a light, we render everything only in particular light
+ {
+ _scene.SetVisibleNodes(null);
// Update statistics
_visibleNodes = _nodeCount;
_visibleMeshes = _meshCountFullScene;
@@ -425,11 +437,9 @@ private void UpdateSceneVisibilityFilter(TreeNode hoverNode = null)
HidePopups();
return;
}
-
// If the selected item is a mesh, we render only the corresponding
// parent node plus this mesh. Otherwise we include all child nodes.
- var itemAsNode = item as Node;
- if (itemAsNode != null && !IsNodeHidden(itemAsNode))
+ if (itemAsNode != null && !IsNodeHidden(itemAsNode))
{
var counters = new List(_scene.Raw.MeshCount);
for (int i = 0; i < _scene.Raw.MeshCount; ++i)
@@ -437,8 +447,10 @@ private void UpdateSceneVisibilityFilter(TreeNode hoverNode = null)
counters.Add(0);
}
- AddNodeToSet(_filterByMesh, itemAsNode);
- CountMeshes(itemAsNode, counters);
+ {
+ AddNodeToSet(_filterByMesh, itemAsNode);
+ CountMeshes(itemAsNode, counters);
+ }
// Keep display statistics for meshes up to date.
_visibleInstancedMeshes = counters.Sum();
diff --git a/open3mod/HierarchyInspectionView.resx b/open3mod/HierarchyInspectionView.resx
index 380cb38..7835579 100644
--- a/open3mod/HierarchyInspectionView.resx
+++ b/open3mod/HierarchyInspectionView.resx
@@ -112,23 +112,23 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
583, 17
-
+
17, 17
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABW
- CwAAAk1TRnQBSQFMAgEBBQEAAaABCQGgAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA
+ DQAAAk1TRnQBSQFMAgEBBwEAAagBCQGoAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -156,33 +156,42 @@
AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
- AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAEP8wAAH/A/kI/wP5
- Af8wAAH/BPkG/wT5Af8wAAH/BfkE/wX5Af8wAAL/BfkC/wX5Av8wAAP/CvkD/zAABP8I+QT/MAAF/wb5
- Bf8wAAX/BvkF/zAABP8I+QT/MAAD/wr5A/8wAAL/BfkC/wX5Av8wAAH/BfkE/wX5Af8wAAH/BPkG/wT5
- Af8wAAH/A/kI/wP5Af8wABD/WAAB8gHsAhQB7AH/CAAB/wEHARIBBwH/BgADQwIAA0MCAANDGQABBwFD
- AW0C7wHxBwAB/wEHARIB7wEUAe8BEwEHAf8EAANDAgADQwIAA0MYAAHyAUMB7wH/BQAB/wIAAf8BBwET
- Ae8B/wEAARQBAAH/Ae8BEwEHAf8CAANDAgADQwIAA0MFAApDCQAB7AFtAf8B8gISAfIBAAHxAewBAAEH
- ARIB7wH/AwABFAMAAf8B7wETAQcCAAFDBAABQwQAAUMGAAFDCAABQwkAARQB7wEAARICQwESAQAB7wEU
- AQAB6wETAQcB/wMAARQDAAH/AQcBEwHrAgABQwQAAUMDAAH/AUMGAAFDCAABQwkAARQB7wEAARICQwES
- AQAB7wEUAQAB8wEUAZIBEgEHAf8BAAEUAQAB/wEHARIBkgEUAfMCAApDARUGAAFDAQAB/wRDAgABQwkA
- AewBbQH/AfICEgHyAf8BbQHsAgAB7wEHAfQB9wESAQcBFAEHARIB9wH0AQcB7wgAAUMLAAFDAQAB/wRD
- AgABQwkAAfIBQwHvAf8CAAH/Ae8BQwHyAgAB/wHqAfQBAAH0AfcBQwH3AfQBAAH0AeoB/wgAAUMLAAFD
- AQAB/wRDAgABQwkAAe8CQwFtAu8BbQFDAQcEAAHxAewB/wIAARQCAAH/AewB8QYAB0MIAAFDAQAB/wRD
- AgABQwQAAfEBbQEVAW0B7AFDAe8B8gHsAhQB7AHyBQAB/wHsAfECAAEUAgAB8QHsAf8GAAdDCAABQwgA
- AUMDAAHxBUMB7A0AAfQB6gH/AQABFAEAAf8B6gH0BwAHQwgAAUMIAAFDAwABbQVDAW0OAAEHAe8BAAEU
- AQAB7wEHCAAHQwgACkMDAAEVBUMBFQ4AAf8BbQHzARQB8wFtAf8IAAdDFQABbQVDAW0PAAHyAesBFAHr
- AfIJAAdDFQAB8QVDAfEQAAHtAUMB7QoAB0MWAAHxAW0BFQFtAfERAAH/AeoB/wYAAUIBTQE+BwABPgMA
- ASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAAX/AQMB/AEfAYwBYwL/Af4BBwHwAQcBjAFjAv8B/AE+
- AcEBQQGMAWMB4AEHAfwBBAGHAXAB3gH3Ae8B9wH8AYQBhwFwAd4B5wHvAfcB/AGEAYEBQAHAAQcB6AE3
- AfwBAAHAAQEB/gH/AegBNwH8ATABxAERAf4B/wHoATcB/AEBAeMBYwHwAR8B6AE3AYABAwHjAWMB8AEf
- Ae8B9wEBAf8B8QFHAfABHwHvAfcBAQH/AfkBTwHwAR8B4AEHAQEB/wH4AQ8B8AEfAv8BAQH/AfwBHwHw
- AR8C/wEBAf8B/gE/AfABHwL/AYMB/wH+AT8L
+ AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAEP8B9Az/AvQI/wHq
+ AZIH/xAAAf8D+Qj/A/kB/wH0C/8B9AL/AfMG/wHsAgAH/xAAAf8E+Qb/BPkC/wH4AREHFQERAe8B/wH0
+ AesBbQX/AfMDAAHtBv8QAAH/BfkE/wX5Av8BbQEAAQ4FAAEOAQABkgEHAREBAAESAv8B7wFtAf8BBwMA
+ ARMB/wEHAesD/xAAAv8F+QL/BfkD/wFtAQAIDgERAg4BAAHqAv8B8QEAAQcBEQH4AfQB+AEAAfQBAAES
+ A/8QAAP/CvkE/wFtAQAJDgEAAQ4BAAHqAf8B9AL/Ae0BAAHyAv8CAAL/AfQC/xAABP8I+QX/AW0BAAcO
+ AQAB7AH4AQ4BAAHqBP8BAAFtAf8B9AH/AfMBAAHvBP8QAAX/BvkG/wFtAQACDgMAAg4BAAGSAf8BvAEV
+ ARIB8QEPARIB9wEAA/8B9AH/ARABDgHvAQAB7QH/EAAF/wb5Bv8B7QIOAeoC9wHsARABDgFDAfAD/wG8
+ AfIBQwFtAfgBAAH/AfQB/wH0Af8B6gEAAQcBDwGSAf8QAAT/CPkE/wG8AQ8DDgEHAf8BEwEAAQ4BAAHr
+ Af8C9AT/AfABAAHzBP8BAAEVBP8QAAP/CvkD/wFtAQACDgEAARIBBwEABA4B8gH/AvQB/wH0Av8BDwEA
+ AfcB8wHwAgAB8gH/AfQC/xAAAv8F+QL/BfkC/wFtAQABDwEOAQABEgEHAQAEDgHyAf8C9AL/Ae8BAAHx
+ AW0EAAH/AQABEQP/EAAB/wX5BP8F+QH/AbwBDgMAAe8B/wEVAwABbQH/A/QC/wEVAeoD/wHsAfIC/wG8
+ AQAB8wL/EAAB/wT5Bv8E+QL/AQcB6gESAe8C/wHyAesBEwHsBfQF/wH0Af8BAAHtAf8B9AX/EAAB/wP5
+ CP8D+QH/AfQE/wL0BP8F9Af/AQ4B7wf/EAAQ/xD0EP84AAHyAewCFAHsAf8IAAH/AQcBEgEHAf8GAAND
+ AgADQwIAA0MZAAEHAUMBbQLvAfEHAAH/AQcBEgHvARQB7wETAQcB/wQAA0MCAANDAgADQxgAAfIBQwHv
+ Af8FAAH/AgAB/wEHARMB7wH/AQABFAEAAf8B7wETAQcB/wIAA0MCAANDAgADQwUACkMJAAHsAW0B/wHy
+ AhIB8gEAAfEB7AEAAQcBEgHvAf8DAAEUAwAB/wHvARMBBwIAAUMEAAFDBAABQwYAAUMIAAFDCQABFAHv
+ AQABEgJDARIBAAHvARQBAAHrARMBBwH/AwABFAMAAf8BBwETAesCAAFDBAABQwMAAf8BQwYAAUMIAAFD
+ CQABFAHvAQABEgJDARIBAAHvARQBAAHzARQBkgESAQcB/wEAARQBAAH/AQcBEgGSARQB8wIACkMBFQYA
+ AUMBAAH/BEMCAAFDCQAB7AFtAf8B8gISAfIB/wFtAewCAAHvAQcB9AH3ARIBBwEUAQcBEgH3AfQBBwHv
+ CAABQwsAAUMBAAH/BEMCAAFDCQAB8gFDAe8B/wIAAf8B7wFDAfICAAH/AeoB9AEAAfQB9wFDAfcB9AEA
+ AfQB6gH/CAABQwsAAUMBAAH/BEMCAAFDCQAB7wJDAW0C7wFtAUMBBwQAAfEB7AH/AgABFAIAAf8B7AHx
+ BgAHQwgAAUMBAAH/BEMCAAFDBAAB8QFtARUBbQHsAUMB7wHyAewCFAHsAfIFAAH/AewB8QIAARQCAAHx
+ AewB/wYAB0MIAAFDCAABQwMAAfEFQwHsDQAB9AHqAf8BAAEUAQAB/wHqAfQHAAdDCAABQwgAAUMDAAFt
+ BUMBbQ4AAQcB7wEAARQBAAHvAQcIAAdDCAAKQwMAARUFQwEVDgAB/wFtAfMBFAHzAW0B/wgAB0MVAAFt
+ BUMBbQ8AAfIB6wEUAesB8gkAB0MVAAHxBUMB8RAAAe0BQwHtCgAHQxYAAfEBbQEVAW0B8REAAf8B6gH/
+ BgABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/4EABf8BAwH8AR8BjAFjAv8B/gEH
+ AfABBwGMAWMC/wH8AT4BwQFBAYwBYwHgAQcB/AEEAYcBcAHeAfcB7wH3AfwBhAGHAXAB3gHnAe8B9wH8
+ AYQBgQFAAcABBwHoATcB/AEAAcABAQH+Af8B6AE3AfwBMAHEAREB/gH/AegBNwH8AQEB4wFjAfABHwHo
+ ATcBgAEDAeMBYwHwAR8B7wH3AQEB/wHxAUcB8AEfAe8B9wEBAf8B+QFPAfABHwHgAQcBAQH/AfgBDwHw
+ AR8C/wEBAf8B/AEfAfABHwL/AQEB/wH+AT8B8AEfAv8BgwH/Af4BPws=
-
+
201, 17
-
+
iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -213,7 +222,7 @@
PLkIX1AkDGi79YwRbkUSBrTfesaItSK3/Q2fqEq7PVC7RAAAAABJRU5ErkJggg==
-
+
404, 17
\ No newline at end of file
diff --git a/open3mod/ICameraController.cs b/open3mod/ICameraController.cs
index 239adf5..8e3e111 100644
--- a/open3mod/ICameraController.cs
+++ b/open3mod/ICameraController.cs
@@ -25,7 +25,7 @@ namespace open3mod
///
/// Predefined camera modes. The map from ICameraController implementations
/// to camera modes is not one-by-one because the X,Y and Z modes are
- /// states of the more general Orbit mode.
+ /// states of the more general Orbit mode and +HMD,Cont1,Cont2 are special tracking modes.
///
public enum CameraMode
{
@@ -35,12 +35,33 @@ public enum CameraMode
Z = 2,
Orbit = 3,
Fps = 4,
- Pick = 5,
-
- _Max = 6,
+ HMD = 5,
+ Cont1 = 6,
+ Cont2 = 7,
+ _Max = 8,
}
+ ///
+ /// Predefined camera modes. The map from ICameraController implementations
+ /// to camera modes is not one-by-one because the X,Y and Z modes are
+ /// states of the more general Orbit mode and HMD,Cont1,Cont2 are special tracking modes.
+ ///
+ public enum ScenePartMode
+ {
+ //these modes require special handling in renderer
+ Background = 0,
+ GreenScreen = 1, //No camera overlay
+ Foreground = 2,
+ Others = 3,
+ All = 4, //No camera overlay
+ //these modes require special handling in renderer
+ Camera = 5,
+ CameraCancelColor = 6,
+ Keying = 7,
+ Composite = 8// Regular output = Bkgd + Canvas textured with Camera + Foreground. Until solved in one pass, see it as Bg+Canvas+Fg
+ }
+
///
/// Base camera abstraction.
///
@@ -57,12 +78,36 @@ public interface ICameraController
///
void SetPivot(Vector3 pivot);
+ ///
+ /// If possible, loads the current view transformation matrix for the camera, at least to first update
+ ///
+ /// View matrix (rotation+translation, no scaling)
+ void SetViewNoOffset(Matrix4 view);
+
///
/// Obtains the current view transformation matrix for the camera
///
/// View matrix (rotation+translation, no scaling)
Matrix4 GetView();
+ ///
+ /// Obtains the current view transformation matrix for the camera without any update
+ ///
+ /// View matrix (rotation+translation, no scaling)
+ Matrix4 GetViewNoOffset();
+
+ ///
+ /// Obtains current field of view
+ ///
+ /// field of view for Y in radians
+ float GetFOV();
+
+ ///
+ /// Sets controller view parameters
+ ///
+
+ void SetParam(float fovy, ScenePartMode scenePartMode, CameraMode mode);
+
///
/// Processes mouse movement events
///
@@ -101,6 +146,18 @@ public interface ICameraController
///
CameraMode GetCameraMode();
+ ///
+ /// Gets the mode of displaying
+ ///
+ ///
+ ScenePartMode GetScenePartMode();
+
+ ///
+ /// Sets the mode of displaying
+ ///
+ ///
+ void SetScenePartMode(ScenePartMode value);
+
///
/// Process the 3D Input of the LeapMotion device
///
diff --git a/open3mod/ISceneRenderer.cs b/open3mod/ISceneRenderer.cs
index 2187bcf..2f08744 100644
--- a/open3mod/ISceneRenderer.cs
+++ b/open3mod/ISceneRenderer.cs
@@ -34,6 +34,9 @@ public enum RenderFlags
ShowSkeleton = 0x10,
Textured = 0x20,
ShowGhosts = 0x40, // show ghost (i.e. semi-transparent) shapes for filtered meshes
+ UseSceneLights = 0x80,
+ ForceTwoSidedLighting = 0x100,
+ ShowLightDirection = 0x200,
}
diff --git a/open3mod/ImageFromResource.cs b/open3mod/ImageFromResource.cs
index 8a6e89e..d172c25 100644
--- a/open3mod/ImageFromResource.cs
+++ b/open3mod/ImageFromResource.cs
@@ -53,10 +53,17 @@ public static Image Get(string resPath)
StreamRefs.Add(stream);
- Debug.Assert(stream != null);
- img = Image.FromStream(stream);
-
- Cache[resPath] = img;
+ // Debug.Assert(stream != null);
+ if (stream != null)
+ {
+ img = Image.FromStream(stream);
+ Cache[resPath] = img;
+ }
+ if (img == null)
+ {
+ string fixPath = resPath.Replace("open3mod.Images.", MainWindow.exePath+"\\Images\\");
+ img = Image.FromFile(fixPath);
+ }
return img;
}
}
diff --git a/open3mod/Images/HUD_Cont1_Hover.png b/open3mod/Images/HUD_Cont1_Hover.png
new file mode 100644
index 0000000..1a78fa5
Binary files /dev/null and b/open3mod/Images/HUD_Cont1_Hover.png differ
diff --git a/open3mod/Images/HUD_Cont1_Normal.png b/open3mod/Images/HUD_Cont1_Normal.png
new file mode 100644
index 0000000..80f0a98
Binary files /dev/null and b/open3mod/Images/HUD_Cont1_Normal.png differ
diff --git a/open3mod/Images/HUD_Cont1_Selected.png b/open3mod/Images/HUD_Cont1_Selected.png
new file mode 100644
index 0000000..f7a9e12
Binary files /dev/null and b/open3mod/Images/HUD_Cont1_Selected.png differ
diff --git a/open3mod/Images/HUD_Cont2_Hover.png b/open3mod/Images/HUD_Cont2_Hover.png
new file mode 100644
index 0000000..39e6639
Binary files /dev/null and b/open3mod/Images/HUD_Cont2_Hover.png differ
diff --git a/open3mod/Images/HUD_Cont2_Normal.png b/open3mod/Images/HUD_Cont2_Normal.png
new file mode 100644
index 0000000..e251226
Binary files /dev/null and b/open3mod/Images/HUD_Cont2_Normal.png differ
diff --git a/open3mod/Images/HUD_Cont2_Selected.png b/open3mod/Images/HUD_Cont2_Selected.png
new file mode 100644
index 0000000..14bc75b
Binary files /dev/null and b/open3mod/Images/HUD_Cont2_Selected.png differ
diff --git a/open3mod/Images/HUD_HMD_Hover.png b/open3mod/Images/HUD_HMD_Hover.png
new file mode 100644
index 0000000..4e233d3
Binary files /dev/null and b/open3mod/Images/HUD_HMD_Hover.png differ
diff --git a/open3mod/Images/HUD_HMD_Normal.png b/open3mod/Images/HUD_HMD_Normal.png
new file mode 100644
index 0000000..849cc9b
Binary files /dev/null and b/open3mod/Images/HUD_HMD_Normal.png differ
diff --git a/open3mod/Images/HUD_HMD_Selected.png b/open3mod/Images/HUD_HMD_Selected.png
new file mode 100644
index 0000000..bf71cf3
Binary files /dev/null and b/open3mod/Images/HUD_HMD_Selected.png differ
diff --git a/open3mod/InspectionView.Designer.cs b/open3mod/InspectionView.Designer.cs
index bcb0202..62b9e28 100644
--- a/open3mod/InspectionView.Designer.cs
+++ b/open3mod/InspectionView.Designer.cs
@@ -29,12 +29,12 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
this.tabControlInfoViewPicker = new System.Windows.Forms.TabControl();
- this.tabPageTree = new System.Windows.Forms.TabPage();
+ this.tabPageAnimations = new System.Windows.Forms.TabPage();
this.tabPageTextures = new System.Windows.Forms.TabPage();
this.textureFlowPanel = new System.Windows.Forms.FlowLayoutPanel();
this.tabPageMaterials = new System.Windows.Forms.TabPage();
this.materialFlowPanel = new System.Windows.Forms.FlowLayoutPanel();
- this.tabPageAnimations = new System.Windows.Forms.TabPage();
+ this.tabPageTree = new System.Windows.Forms.TabPage();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.tabControlInfoViewPicker.SuspendLayout();
this.tabPageTextures.SuspendLayout();
@@ -43,10 +43,10 @@ private void InitializeComponent()
//
// tabControlInfoViewPicker
//
+ this.tabControlInfoViewPicker.Controls.Add(this.tabPageAnimations);
this.tabControlInfoViewPicker.Controls.Add(this.tabPageTree);
- this.tabControlInfoViewPicker.Controls.Add(this.tabPageTextures);
this.tabControlInfoViewPicker.Controls.Add(this.tabPageMaterials);
- this.tabControlInfoViewPicker.Controls.Add(this.tabPageAnimations);
+ this.tabControlInfoViewPicker.Controls.Add(this.tabPageTextures);
this.tabControlInfoViewPicker.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControlInfoViewPicker.HotTrack = true;
this.tabControlInfoViewPicker.Location = new System.Drawing.Point(0, 0);
@@ -54,18 +54,18 @@ private void InitializeComponent()
this.tabControlInfoViewPicker.Multiline = true;
this.tabControlInfoViewPicker.Name = "tabControlInfoViewPicker";
this.tabControlInfoViewPicker.SelectedIndex = 0;
- this.tabControlInfoViewPicker.Size = new System.Drawing.Size(357, 694);
+ this.tabControlInfoViewPicker.Size = new System.Drawing.Size(500, 694);
this.tabControlInfoViewPicker.TabIndex = 2;
//
- // tabPageTree
+ // tabPageAnimations
//
- this.tabPageTree.BackColor = System.Drawing.Color.Silver;
- this.tabPageTree.Location = new System.Drawing.Point(4, 22);
- this.tabPageTree.Name = "tabPageTree";
- this.tabPageTree.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageTree.Size = new System.Drawing.Size(349, 668);
- this.tabPageTree.TabIndex = 0;
- this.tabPageTree.Text = "Tree";
+ this.tabPageAnimations.Location = new System.Drawing.Point(4, 22);
+ this.tabPageAnimations.Name = "tabPageAnimations";
+ this.tabPageAnimations.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPageAnimations.Size = new System.Drawing.Size(492, 668);
+ this.tabPageAnimations.TabIndex = 2;
+ this.tabPageAnimations.Text = "Animations";
+ this.tabPageAnimations.UseVisualStyleBackColor = true;
//
// tabPageTextures
//
@@ -74,7 +74,7 @@ private void InitializeComponent()
this.tabPageTextures.Location = new System.Drawing.Point(4, 22);
this.tabPageTextures.Name = "tabPageTextures";
this.tabPageTextures.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageTextures.Size = new System.Drawing.Size(349, 668);
+ this.tabPageTextures.Size = new System.Drawing.Size(492, 668);
this.tabPageTextures.TabIndex = 1;
this.tabPageTextures.Text = "Textures";
this.tabPageTextures.UseVisualStyleBackColor = true;
@@ -82,7 +82,6 @@ private void InitializeComponent()
//
// textureFlowPanel
//
- this.textureFlowPanel.AllowDrop = true;
this.textureFlowPanel.AutoScroll = true;
this.textureFlowPanel.AutoSize = true;
this.textureFlowPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
@@ -90,7 +89,7 @@ private void InitializeComponent()
this.textureFlowPanel.Dock = System.Windows.Forms.DockStyle.Top;
this.textureFlowPanel.Location = new System.Drawing.Point(3, 3);
this.textureFlowPanel.Name = "textureFlowPanel";
- this.textureFlowPanel.Size = new System.Drawing.Size(343, 0);
+ this.textureFlowPanel.Size = new System.Drawing.Size(486, 0);
this.textureFlowPanel.TabIndex = 0;
this.textureFlowPanel.TabStop = true;
//
@@ -101,7 +100,7 @@ private void InitializeComponent()
this.tabPageMaterials.Location = new System.Drawing.Point(4, 22);
this.tabPageMaterials.Name = "tabPageMaterials";
this.tabPageMaterials.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageMaterials.Size = new System.Drawing.Size(349, 668);
+ this.tabPageMaterials.Size = new System.Drawing.Size(492, 668);
this.tabPageMaterials.TabIndex = 3;
this.tabPageMaterials.Text = "Materials";
this.tabPageMaterials.UseVisualStyleBackColor = true;
@@ -116,18 +115,18 @@ private void InitializeComponent()
this.materialFlowPanel.Dock = System.Windows.Forms.DockStyle.Top;
this.materialFlowPanel.Location = new System.Drawing.Point(3, 3);
this.materialFlowPanel.Name = "materialFlowPanel";
- this.materialFlowPanel.Size = new System.Drawing.Size(343, 0);
+ this.materialFlowPanel.Size = new System.Drawing.Size(486, 0);
this.materialFlowPanel.TabIndex = 1;
//
- // tabPageAnimations
+ // tabPageTree
//
- this.tabPageAnimations.Location = new System.Drawing.Point(4, 22);
- this.tabPageAnimations.Name = "tabPageAnimations";
- this.tabPageAnimations.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageAnimations.Size = new System.Drawing.Size(349, 668);
- this.tabPageAnimations.TabIndex = 2;
- this.tabPageAnimations.Text = "Animations";
- this.tabPageAnimations.UseVisualStyleBackColor = true;
+ this.tabPageTree.BackColor = System.Drawing.Color.Silver;
+ this.tabPageTree.Location = new System.Drawing.Point(4, 22);
+ this.tabPageTree.Name = "tabPageTree";
+ this.tabPageTree.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPageTree.Size = new System.Drawing.Size(492, 668);
+ this.tabPageTree.TabIndex = 0;
+ this.tabPageTree.Text = "Tree";
//
// openFileDialog1
//
@@ -140,7 +139,7 @@ private void InitializeComponent()
this.Controls.Add(this.tabControlInfoViewPicker);
this.Margin = new System.Windows.Forms.Padding(0);
this.Name = "InspectionView";
- this.Size = new System.Drawing.Size(357, 694);
+ this.Size = new System.Drawing.Size(500, 694);
this.tabControlInfoViewPicker.ResumeLayout(false);
this.tabPageTextures.ResumeLayout(false);
this.tabPageTextures.PerformLayout();
diff --git a/open3mod/InspectionView.cs b/open3mod/InspectionView.cs
index 28aa6bf..61ebbdd 100644
--- a/open3mod/InspectionView.cs
+++ b/open3mod/InspectionView.cs
@@ -48,6 +48,19 @@ public void OpenMaterialsTabAndScrollTo(MaterialThumbnailControl thumb)
tabPageMaterials.Focus();
}
+ public void SelectPlaybackView()
+ {
+ tabControlInfoViewPicker.TabPages.IndexOf(tabPageAnimations);
+ if (tabControlInfoViewPicker.TabPages.IndexOf(tabPageAnimations) >= 0)
+ {
+ tabControlInfoViewPicker.SelectedTab = tabPageAnimations;
+ }
+ else
+ {
+ tabControlInfoViewPicker.SelectedTab = tabPageTree;
+ }
+ }
+
///
/// Binds a scene to the InspectionView.
@@ -83,8 +96,8 @@ public void SetSceneSource(Scene scene)
Animations = new AnimationInspectionView(Scene, tabPageAnimations);
if (Animations.Empty)
{
- // Same for animations.
- tabControlInfoViewPicker.TabPages.Remove(tabPageAnimations);
+ // Same for animations...no, we need it always.
+ // tabControlInfoViewPicker.TabPages.Remove(tabPageAnimations);
}
//
diff --git a/open3mod/LICENSE b/open3mod/LICENSE
new file mode 100644
index 0000000..60e64e1
--- /dev/null
+++ b/open3mod/LICENSE
@@ -0,0 +1,42 @@
+=====================================================================
+
+Open 3D Model Viewer (open3mod)
+
+Copyright (c) 2012-2015, open3mod contributors.
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the
+following conditions are met:
+
+* Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+* Neither the name of the project, nor the names of its
+ contributors may be used to endorse or promote products
+ derived from this software without specific prior
+ written permission of the copyright holders.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=====================================================================
+The following external license files apply to cover third party
+components:
+
+licenses/LICENSE_*
\ No newline at end of file
diff --git a/open3mod/LeapListener.cs b/open3mod/LeapListener.cs
index 7c9ee30..e67cdc4 100644
--- a/open3mod/LeapListener.cs
+++ b/open3mod/LeapListener.cs
@@ -40,7 +40,6 @@ private enum SmoothedValues
Pitch = 3,
Roll = 4,
Yaw = 5,
-
_Max = 6,
};
diff --git a/open3mod/Lights Helper.ods b/open3mod/Lights Helper.ods
new file mode 100644
index 0000000..af171ce
Binary files /dev/null and b/open3mod/Lights Helper.ods differ
diff --git a/open3mod/MainWindow.Designer.cs b/open3mod/MainWindow.Designer.cs
index 132f432..0ad3952 100644
--- a/open3mod/MainWindow.Designer.cs
+++ b/open3mod/MainWindow.Designer.cs
@@ -17,7 +17,7 @@ partial class MainWindow
protected override void Dispose(bool disposing)
{
_ui.Dispose();
- _renderer.Dispose();
+ //_renderer.Dispose(); //duplicited in OnCloseForm
if (disposing)
{
@@ -62,8 +62,8 @@ private void InitializeComponent()
this.generateNormalsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemView = new System.Windows.Forms.ToolStripMenuItem();
this.fullViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.twoViewsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.twoViewsHorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.twoViewsAToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.twoViewsBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.fourViewsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.wireframeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -71,12 +71,15 @@ private void InitializeComponent()
this.lightingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cullingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.framerateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.showVRModelsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.showBoundingBoxesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.showNormalVectorsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.showAnimationSkeletonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.useSceneLightsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
this.backgroundColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.backgroundAlphaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.resetBackgroundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
@@ -86,10 +89,12 @@ private void InitializeComponent()
this.exportAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.setDynamicSourceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.showCaptureWindowsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSelectRenderer = new System.Windows.Forms.ToolStrip();
this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
@@ -97,21 +102,26 @@ private void InitializeComponent()
this.toolStripButtonRedo = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButtonFullView = new System.Windows.Forms.ToolStripButton();
- this.toolStripButtonTwoViews = new System.Windows.Forms.ToolStripButton();
- this.toolStripButtonTwoViewsHor = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButtonTwoViewsA = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButtonTwoViewsB = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonFourViews = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButtonWireframe = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonShowTextures = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonShowShaded = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButtonUseSceneLights = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButtonShowBB = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonShowNormals = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonCulling = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonShowSkeleton = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButtonShowFPS = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripButtonShowVRModels = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonShowSettings = new System.Windows.Forms.ToolStripButton();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -127,8 +137,8 @@ private void InitializeComponent()
this.linkLabelDonate = new System.Windows.Forms.LinkLabel();
this.label1 = new System.Windows.Forms.Label();
this.linkLabelWebsite = new System.Windows.Forms.LinkLabel();
+ this.renderControl1 = new open3mod.RenderControl();
this.trackBarBrightness = new System.Windows.Forms.TrackBar();
- this.glControl1 = new open3mod.RenderControl();
this.menuStrip1.SuspendLayout();
this.toolStripSelectRenderer.SuspendLayout();
this.tabContextMenuStrip.SuspendLayout();
@@ -144,6 +154,7 @@ private void InitializeComponent()
this.editToolStripMenuItem,
this.toolStripMenuItemView,
this.toolsToolStripMenuItem,
+ this.setDynamicSourceToolStripMenuItem,
this.toolStripMenuItem1});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
@@ -307,8 +318,8 @@ private void InitializeComponent()
//
this.toolStripMenuItemView.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fullViewToolStripMenuItem,
- this.twoViewsToolStripMenuItem,
- this.twoViewsHorToolStripMenuItem,
+ this.twoViewsAToolStripMenuItem,
+ this.twoViewsBToolStripMenuItem,
this.fourViewsToolStripMenuItem,
this.toolStripSeparator6,
this.wireframeToolStripMenuItem,
@@ -316,12 +327,15 @@ private void InitializeComponent()
this.lightingToolStripMenuItem,
this.cullingToolStripMenuItem,
this.framerateToolStripMenuItem,
+ this.showVRModelsToolStripMenuItem,
this.toolStripSeparator7,
this.showBoundingBoxesToolStripMenuItem,
this.showNormalVectorsToolStripMenuItem,
this.showAnimationSkeletonToolStripMenuItem,
+ this.useSceneLightsToolStripMenuItem,
this.toolStripSeparator14,
this.backgroundColorToolStripMenuItem,
+ this.backgroundAlphaToolStripMenuItem,
this.resetBackgroundToolStripMenuItem});
this.toolStripMenuItemView.Name = "toolStripMenuItemView";
this.toolStripMenuItemView.Size = new System.Drawing.Size(44, 20);
@@ -332,48 +346,48 @@ private void InitializeComponent()
this.fullViewToolStripMenuItem.CheckOnClick = true;
this.fullViewToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("fullViewToolStripMenuItem.Image")));
this.fullViewToolStripMenuItem.Name = "fullViewToolStripMenuItem";
- this.fullViewToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
- this.fullViewToolStripMenuItem.Text = "Single 3D View";
+ this.fullViewToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
+ this.fullViewToolStripMenuItem.Text = "Single 3D View (no stream)";
this.fullViewToolStripMenuItem.Click += new System.EventHandler(this.ToggleFullView);
//
- // twoViewsToolStripMenuItem
+ // twoViewsAToolStripMenuItem
//
- this.twoViewsToolStripMenuItem.CheckOnClick = true;
- this.twoViewsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("twoViewsToolStripMenuItem.Image")));
- this.twoViewsToolStripMenuItem.Name = "twoViewsToolStripMenuItem";
- this.twoViewsToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
- this.twoViewsToolStripMenuItem.Text = "Two 3D Views (Vertical)";
- this.twoViewsToolStripMenuItem.Click += new System.EventHandler(this.ToggleTwoViews);
+ this.twoViewsAToolStripMenuItem.CheckOnClick = true;
+ this.twoViewsAToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("twoViewsAToolStripMenuItem.Image")));
+ this.twoViewsAToolStripMenuItem.Name = "twoViewsAToolStripMenuItem";
+ this.twoViewsAToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
+ this.twoViewsAToolStripMenuItem.Text = "Two 3D Views (A streams)";
+ this.twoViewsAToolStripMenuItem.Click += new System.EventHandler(this.ToggleTwoViews);
//
- // twoViewsHorToolStripMenuItem
+ // twoViewsBToolStripMenuItem
//
- this.twoViewsHorToolStripMenuItem.CheckOnClick = true;
- this.twoViewsHorToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("twoViewsHorToolStripMenuItem.Image")));
- this.twoViewsHorToolStripMenuItem.Name = "twoViewsHorToolStripMenuItem";
- this.twoViewsHorToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
- this.twoViewsHorToolStripMenuItem.Text = "Two 3D Views (Horizontal)";
- this.twoViewsHorToolStripMenuItem.Click += new System.EventHandler(this.ToggleTwoViewsHorizontal);
+ this.twoViewsBToolStripMenuItem.CheckOnClick = true;
+ this.twoViewsBToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("twoViewsBToolStripMenuItem.Image")));
+ this.twoViewsBToolStripMenuItem.Name = "twoViewsBToolStripMenuItem";
+ this.twoViewsBToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
+ this.twoViewsBToolStripMenuItem.Text = "Two 3D Views (B streams)";
+ this.twoViewsBToolStripMenuItem.Click += new System.EventHandler(this.ToggleTwoViewsHorizontal);
//
// fourViewsToolStripMenuItem
//
this.fourViewsToolStripMenuItem.CheckOnClick = true;
this.fourViewsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("fourViewsToolStripMenuItem.Image")));
this.fourViewsToolStripMenuItem.Name = "fourViewsToolStripMenuItem";
- this.fourViewsToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
- this.fourViewsToolStripMenuItem.Text = "Four 3D Views (Quads)";
+ this.fourViewsToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
+ this.fourViewsToolStripMenuItem.Text = "Four 3D Views (A+B streams)";
this.fourViewsToolStripMenuItem.Click += new System.EventHandler(this.ToggleFourViews);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(210, 6);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(223, 6);
//
// wireframeToolStripMenuItem
//
this.wireframeToolStripMenuItem.CheckOnClick = true;
this.wireframeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("wireframeToolStripMenuItem.Image")));
this.wireframeToolStripMenuItem.Name = "wireframeToolStripMenuItem";
- this.wireframeToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
+ this.wireframeToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
this.wireframeToolStripMenuItem.Text = "Wireframe";
this.wireframeToolStripMenuItem.Click += new System.EventHandler(this.ToggleWireframe);
//
@@ -382,7 +396,7 @@ private void InitializeComponent()
this.texturedToolStripMenuItem.CheckOnClick = true;
this.texturedToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("texturedToolStripMenuItem.Image")));
this.texturedToolStripMenuItem.Name = "texturedToolStripMenuItem";
- this.texturedToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
+ this.texturedToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
this.texturedToolStripMenuItem.Text = "Textures";
this.texturedToolStripMenuItem.Click += new System.EventHandler(this.ToggleTextures);
//
@@ -391,7 +405,7 @@ private void InitializeComponent()
this.lightingToolStripMenuItem.CheckOnClick = true;
this.lightingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("lightingToolStripMenuItem.Image")));
this.lightingToolStripMenuItem.Name = "lightingToolStripMenuItem";
- this.lightingToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
+ this.lightingToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
this.lightingToolStripMenuItem.Text = "Lighting";
this.lightingToolStripMenuItem.Click += new System.EventHandler(this.ToggleShading);
//
@@ -399,7 +413,7 @@ private void InitializeComponent()
//
this.cullingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cullingToolStripMenuItem.Image")));
this.cullingToolStripMenuItem.Name = "cullingToolStripMenuItem";
- this.cullingToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
+ this.cullingToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
this.cullingToolStripMenuItem.Text = "Culling";
this.cullingToolStripMenuItem.Click += new System.EventHandler(this.ToggleCulling);
//
@@ -408,20 +422,28 @@ private void InitializeComponent()
this.framerateToolStripMenuItem.CheckOnClick = true;
this.framerateToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("framerateToolStripMenuItem.Image")));
this.framerateToolStripMenuItem.Name = "framerateToolStripMenuItem";
- this.framerateToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
+ this.framerateToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
this.framerateToolStripMenuItem.Text = "Framerate";
this.framerateToolStripMenuItem.Click += new System.EventHandler(this.ToggleFps);
//
+ // showVRModelsToolStripMenuItem
+ //
+ this.showVRModelsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("showVRModelsToolStripMenuItem.Image")));
+ this.showVRModelsToolStripMenuItem.Name = "showVRModelsToolStripMenuItem";
+ this.showVRModelsToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
+ this.showVRModelsToolStripMenuItem.Text = "VR Models";
+ this.showVRModelsToolStripMenuItem.Click += new System.EventHandler(this.ToggleModels);
+ //
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(210, 6);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(223, 6);
//
// showBoundingBoxesToolStripMenuItem
//
this.showBoundingBoxesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("showBoundingBoxesToolStripMenuItem.Image")));
this.showBoundingBoxesToolStripMenuItem.Name = "showBoundingBoxesToolStripMenuItem";
- this.showBoundingBoxesToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
+ this.showBoundingBoxesToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
this.showBoundingBoxesToolStripMenuItem.Text = "Bounding Boxes";
this.showBoundingBoxesToolStripMenuItem.Click += new System.EventHandler(this.ToggleShowBb);
//
@@ -429,7 +451,7 @@ private void InitializeComponent()
//
this.showNormalVectorsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("showNormalVectorsToolStripMenuItem.Image")));
this.showNormalVectorsToolStripMenuItem.Name = "showNormalVectorsToolStripMenuItem";
- this.showNormalVectorsToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
+ this.showNormalVectorsToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
this.showNormalVectorsToolStripMenuItem.Text = "Normal Vectors";
this.showNormalVectorsToolStripMenuItem.Click += new System.EventHandler(this.ToggleShowNormals);
//
@@ -437,26 +459,41 @@ private void InitializeComponent()
//
this.showAnimationSkeletonToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("showAnimationSkeletonToolStripMenuItem.Image")));
this.showAnimationSkeletonToolStripMenuItem.Name = "showAnimationSkeletonToolStripMenuItem";
- this.showAnimationSkeletonToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
+ this.showAnimationSkeletonToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
this.showAnimationSkeletonToolStripMenuItem.Text = "Animation Skeleton";
this.showAnimationSkeletonToolStripMenuItem.Click += new System.EventHandler(this.ToggleShowSkeleton);
//
+ // useSceneLightsToolStripMenuItem
+ //
+ this.useSceneLightsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("useSceneLightsToolStripMenuItem.Image")));
+ this.useSceneLightsToolStripMenuItem.Name = "useSceneLightsToolStripMenuItem";
+ this.useSceneLightsToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
+ this.useSceneLightsToolStripMenuItem.Text = "Use Scene Lights";
+ this.useSceneLightsToolStripMenuItem.Click += new System.EventHandler(this.ToggleUseSceneLights);
+ //
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
- this.toolStripSeparator14.Size = new System.Drawing.Size(210, 6);
+ this.toolStripSeparator14.Size = new System.Drawing.Size(223, 6);
//
// backgroundColorToolStripMenuItem
//
this.backgroundColorToolStripMenuItem.Name = "backgroundColorToolStripMenuItem";
- this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
+ this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
this.backgroundColorToolStripMenuItem.Text = "Background Color";
this.backgroundColorToolStripMenuItem.Click += new System.EventHandler(this.OnChangeBackgroundColor);
//
+ // backgroundAlphaToolStripMenuItem
+ //
+ this.backgroundAlphaToolStripMenuItem.Name = "backgroundAlphaToolStripMenuItem";
+ this.backgroundAlphaToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
+ this.backgroundAlphaToolStripMenuItem.Text = "Background Alpha";
+ this.backgroundAlphaToolStripMenuItem.Click += new System.EventHandler(this.OnChangeBackgroundAlpha);
+ //
// resetBackgroundToolStripMenuItem
//
this.resetBackgroundToolStripMenuItem.Name = "resetBackgroundToolStripMenuItem";
- this.resetBackgroundToolStripMenuItem.Size = new System.Drawing.Size(213, 22);
+ this.resetBackgroundToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
this.resetBackgroundToolStripMenuItem.Text = "Reset Background";
this.resetBackgroundToolStripMenuItem.Click += new System.EventHandler(this.OnResetBackground);
//
@@ -471,7 +508,7 @@ private void InitializeComponent()
this.toolStripSeparator8,
this.optionsToolStripMenuItem});
this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
- this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+ this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
this.toolsToolStripMenuItem.Text = "Tools";
this.toolsToolStripMenuItem.Click += new System.EventHandler(this.ToolsToolStripMenuItemClick);
//
@@ -520,12 +557,20 @@ private void InitializeComponent()
this.optionsToolStripMenuItem.Text = "Options";
this.optionsToolStripMenuItem.Click += new System.EventHandler(this.OnShowSettings);
//
+ // setDynamicSourceToolStripMenuItem
+ //
+ this.setDynamicSourceToolStripMenuItem.Name = "setDynamicSourceToolStripMenuItem";
+ this.setDynamicSourceToolStripMenuItem.Size = new System.Drawing.Size(136, 20);
+ this.setDynamicSourceToolStripMenuItem.Text = "Find Dynamic Sources";
+ this.setDynamicSourceToolStripMenuItem.Click += new System.EventHandler(this.setDynamicSourceToolStripMenuItem_Click);
+ //
// toolStripMenuItem1
//
this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItem2,
this.toolStripSeparator10,
- this.aboutToolStripMenuItem});
+ this.aboutToolStripMenuItem,
+ this.showCaptureWindowsToolStripMenuItem});
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(24, 20);
this.toolStripMenuItem1.Text = "?";
@@ -533,22 +578,29 @@ private void InitializeComponent()
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
- this.toolStripMenuItem2.Size = new System.Drawing.Size(148, 22);
+ this.toolStripMenuItem2.Size = new System.Drawing.Size(200, 22);
this.toolStripMenuItem2.Text = "Tip of the Day";
this.toolStripMenuItem2.Click += new System.EventHandler(this.OnTipOfTheDay);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(145, 6);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(197, 6);
//
// aboutToolStripMenuItem
//
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
- this.aboutToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+ this.aboutToolStripMenuItem.Size = new System.Drawing.Size(200, 22);
this.aboutToolStripMenuItem.Text = "About";
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.AboutToolStripMenuItemClick);
//
+ // showCaptureWindowsToolStripMenuItem
+ //
+ this.showCaptureWindowsToolStripMenuItem.Name = "showCaptureWindowsToolStripMenuItem";
+ this.showCaptureWindowsToolStripMenuItem.Size = new System.Drawing.Size(200, 22);
+ this.showCaptureWindowsToolStripMenuItem.Text = "Show Capture Windows";
+ this.showCaptureWindowsToolStripMenuItem.Click += new System.EventHandler(this.ShowCaptureWindows_Click);
+ //
// toolStripSelectRenderer
//
this.toolStripSelectRenderer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -558,21 +610,26 @@ private void InitializeComponent()
this.toolStripButtonRedo,
this.toolStripSeparator4,
this.toolStripButtonFullView,
- this.toolStripButtonTwoViews,
- this.toolStripButtonTwoViewsHor,
+ this.toolStripButtonTwoViewsA,
+ this.toolStripButtonTwoViewsB,
this.toolStripButtonFourViews,
+ this.toolStripSeparator15,
+ this.toolStripSeparator16,
this.toolStripSeparator,
this.toolStripButtonWireframe,
this.toolStripButtonShowTextures,
this.toolStripButtonShowShaded,
+ this.toolStripButtonUseSceneLights,
this.toolStripSeparator1,
this.toolStripButtonShowBB,
this.toolStripButtonShowNormals,
this.toolStripButtonCulling,
this.toolStripButtonShowSkeleton,
+ this.toolStripSeparator18,
+ this.toolStripSeparator17,
this.toolStripSeparator5,
this.toolStripButtonShowFPS,
- this.toolStripSeparator9,
+ this.toolStripButtonShowVRModels,
this.toolStripButtonShowSettings});
this.toolStripSelectRenderer.Location = new System.Drawing.Point(0, 24);
this.toolStripSelectRenderer.Name = "toolStripSelectRenderer";
@@ -629,30 +686,30 @@ private void InitializeComponent()
this.toolStripButtonFullView.Name = "toolStripButtonFullView";
this.toolStripButtonFullView.Size = new System.Drawing.Size(23, 22);
this.toolStripButtonFullView.Text = "Full View";
- this.toolStripButtonFullView.ToolTipText = "Show full-size 3D view";
+ this.toolStripButtonFullView.ToolTipText = "Show full-size 3D view (not streamed)";
this.toolStripButtonFullView.Click += new System.EventHandler(this.ToggleFullView);
//
- // toolStripButtonTwoViews
+ // toolStripButtonTwoViewsA
//
- this.toolStripButtonTwoViews.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripButtonTwoViews.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonTwoViews.Image")));
- this.toolStripButtonTwoViews.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonTwoViews.Name = "toolStripButtonTwoViews";
- this.toolStripButtonTwoViews.Size = new System.Drawing.Size(23, 22);
- this.toolStripButtonTwoViews.Text = "Two Views";
- this.toolStripButtonTwoViews.ToolTipText = "Split into two 3D views stacked on top of each other";
- this.toolStripButtonTwoViews.Click += new System.EventHandler(this.ToggleTwoViews);
+ this.toolStripButtonTwoViewsA.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.toolStripButtonTwoViewsA.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonTwoViewsA.Image")));
+ this.toolStripButtonTwoViewsA.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButtonTwoViewsA.Name = "toolStripButtonTwoViewsA";
+ this.toolStripButtonTwoViewsA.Size = new System.Drawing.Size(23, 22);
+ this.toolStripButtonTwoViewsA.Text = "Two Views";
+ this.toolStripButtonTwoViewsA.ToolTipText = "Split into two 3D views showing A streams";
+ this.toolStripButtonTwoViewsA.Click += new System.EventHandler(this.ToggleTwoViews);
//
- // toolStripButtonTwoViewsHor
+ // toolStripButtonTwoViewsB
//
- this.toolStripButtonTwoViewsHor.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripButtonTwoViewsHor.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonTwoViewsHor.Image")));
- this.toolStripButtonTwoViewsHor.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonTwoViewsHor.Name = "toolStripButtonTwoViewsHor";
- this.toolStripButtonTwoViewsHor.Size = new System.Drawing.Size(23, 22);
- this.toolStripButtonTwoViewsHor.Text = "Two Views (Horizontal)";
- this.toolStripButtonTwoViewsHor.ToolTipText = "Split into two 3D views stacked on top of each other";
- this.toolStripButtonTwoViewsHor.Click += new System.EventHandler(this.ToggleTwoViewsHorizontal);
+ this.toolStripButtonTwoViewsB.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.toolStripButtonTwoViewsB.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonTwoViewsB.Image")));
+ this.toolStripButtonTwoViewsB.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButtonTwoViewsB.Name = "toolStripButtonTwoViewsB";
+ this.toolStripButtonTwoViewsB.Size = new System.Drawing.Size(23, 22);
+ this.toolStripButtonTwoViewsB.Text = "Two Views";
+ this.toolStripButtonTwoViewsB.ToolTipText = "Split into two 3D views showing B streams";
+ this.toolStripButtonTwoViewsB.Click += new System.EventHandler(this.ToggleTwoViewsHorizontal);
//
// toolStripButtonFourViews
//
@@ -665,6 +722,16 @@ private void InitializeComponent()
this.toolStripButtonFourViews.ToolTipText = "Split into four 3D views";
this.toolStripButtonFourViews.Click += new System.EventHandler(this.ToggleFourViews);
//
+ // toolStripSeparator15
+ //
+ this.toolStripSeparator15.Name = "toolStripSeparator15";
+ this.toolStripSeparator15.Size = new System.Drawing.Size(6, 25);
+ //
+ // toolStripSeparator16
+ //
+ this.toolStripSeparator16.Name = "toolStripSeparator16";
+ this.toolStripSeparator16.Size = new System.Drawing.Size(6, 25);
+ //
// toolStripSeparator
//
this.toolStripSeparator.Name = "toolStripSeparator";
@@ -706,6 +773,18 @@ private void InitializeComponent()
this.toolStripButtonShowShaded.ToolTipText = "Enable shading (lighting) in 3D view";
this.toolStripButtonShowShaded.Click += new System.EventHandler(this.ToggleShading);
//
+ // toolStripButtonUseSceneLights
+ //
+ this.toolStripButtonUseSceneLights.CheckOnClick = true;
+ this.toolStripButtonUseSceneLights.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.toolStripButtonUseSceneLights.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonUseSceneLights.Image")));
+ this.toolStripButtonUseSceneLights.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButtonUseSceneLights.Name = "toolStripButtonUseSceneLights";
+ this.toolStripButtonUseSceneLights.Size = new System.Drawing.Size(23, 22);
+ this.toolStripButtonUseSceneLights.Text = "Use Scene Lights";
+ this.toolStripButtonUseSceneLights.ToolTipText = "Use lights from scene";
+ this.toolStripButtonUseSceneLights.Click += new System.EventHandler(this.ToggleUseSceneLights);
+ //
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
@@ -758,6 +837,16 @@ private void InitializeComponent()
this.toolStripButtonShowSkeleton.ToolTipText = "Show skeleton joints in 3D view";
this.toolStripButtonShowSkeleton.Click += new System.EventHandler(this.ToggleShowSkeleton);
//
+ // toolStripSeparator18
+ //
+ this.toolStripSeparator18.Name = "toolStripSeparator18";
+ this.toolStripSeparator18.Size = new System.Drawing.Size(6, 25);
+ //
+ // toolStripSeparator17
+ //
+ this.toolStripSeparator17.Name = "toolStripSeparator17";
+ this.toolStripSeparator17.Size = new System.Drawing.Size(6, 25);
+ //
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
@@ -775,10 +864,15 @@ private void InitializeComponent()
this.toolStripButtonShowFPS.ToolTipText = "Show frames per second (FPS)";
this.toolStripButtonShowFPS.Click += new System.EventHandler(this.ToggleFps);
//
- // toolStripSeparator9
+ // toolStripButtonShowVRModels
//
- this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 25);
+ this.toolStripButtonShowVRModels.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.toolStripButtonShowVRModels.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonShowVRModels.Image")));
+ this.toolStripButtonShowVRModels.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButtonShowVRModels.Name = "toolStripButtonShowVRModels";
+ this.toolStripButtonShowVRModels.Size = new System.Drawing.Size(23, 22);
+ this.toolStripButtonShowVRModels.Text = "Show VR Models";
+ this.toolStripButtonShowVRModels.Click += new System.EventHandler(this.ToggleModels);
//
// toolStripButtonShowSettings
//
@@ -863,8 +957,7 @@ private void InitializeComponent()
//
this.toolStripStatusLabel1.BackColor = System.Drawing.Color.Transparent;
this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
- this.toolStripStatusLabel1.Size = new System.Drawing.Size(300, 17);
- this.toolStripStatusLabel1.Text = "| Keep right mouse button pressed to move light source";
+ this.toolStripStatusLabel1.Size = new System.Drawing.Size(0, 17);
//
// directorySearcher1
//
@@ -910,6 +1003,31 @@ private void InitializeComponent()
this.linkLabelWebsite.Text = "Website / Updates";
this.linkLabelWebsite.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelWebsite_LinkClicked);
//
+ // renderControl1
+ //
+ this.renderControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.renderControl1.BackColor = System.Drawing.Color.Black;
+ this.renderControl1.Location = new System.Drawing.Point(359, 327);
+ this.renderControl1.Name = "renderControl1";
+ this.renderControl1.Size = new System.Drawing.Size(560, 369);
+ this.renderControl1.TabIndex = 0;
+ this.renderControl1.VSync = true;
+ this.renderControl1.Load += new System.EventHandler(this.OnGlLoad);
+ this.renderControl1.DragDrop += new System.Windows.Forms.DragEventHandler(this.OnDrag);
+ this.renderControl1.DragEnter += new System.Windows.Forms.DragEventHandler(this.OnDragEnter);
+ this.renderControl1.Paint += new System.Windows.Forms.PaintEventHandler(this.GlPaint);
+ this.renderControl1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown);
+ this.renderControl1.KeyUp += new System.Windows.Forms.KeyEventHandler(this.OnKeyUp);
+ this.renderControl1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.OnMouseDown);
+ this.renderControl1.MouseEnter += new System.EventHandler(this.OnMouseEnter);
+ this.renderControl1.MouseLeave += new System.EventHandler(this.OnMouseLeave);
+ this.renderControl1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.OnMouseMove);
+ this.renderControl1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.OnMouseUp);
+ this.renderControl1.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.OnPreviewKeyDown);
+ this.renderControl1.Resize += new System.EventHandler(this.OnGlResize);
+ //
// trackBarBrightness
//
this.trackBarBrightness.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -922,36 +1040,10 @@ private void InitializeComponent()
this.trackBarBrightness.Size = new System.Drawing.Size(188, 45);
this.trackBarBrightness.TabIndex = 6;
this.trackBarBrightness.Value = global::open3mod.GraphicsSettings.Default.OutputBrightness;
- //
- // glControl1
- //
- this.glControl1.AllowDrop = true;
- this.glControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.glControl1.BackColor = System.Drawing.Color.Black;
- this.glControl1.Location = new System.Drawing.Point(177, 70);
- this.glControl1.Name = "glControl1";
- this.glControl1.Size = new System.Drawing.Size(742, 626);
- this.glControl1.TabIndex = 0;
- this.glControl1.VSync = true;
- this.glControl1.Load += new System.EventHandler(this.OnGlLoad);
- this.glControl1.DragDrop += new System.Windows.Forms.DragEventHandler(this.OnDrag);
- this.glControl1.DragEnter += new System.Windows.Forms.DragEventHandler(this.OnDragEnter);
- this.glControl1.Paint += new System.Windows.Forms.PaintEventHandler(this.GlPaint);
- this.glControl1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown);
- this.glControl1.KeyUp += new System.Windows.Forms.KeyEventHandler(this.OnKeyUp);
- this.glControl1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.OnMouseDown);
- this.glControl1.MouseEnter += new System.EventHandler(this.OnMouseEnter);
- this.glControl1.MouseLeave += new System.EventHandler(this.OnMouseLeave);
- this.glControl1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.OnMouseMove);
- this.glControl1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.OnMouseUp);
- this.glControl1.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.OnPreviewKeyDown);
- this.glControl1.Resize += new System.EventHandler(this.OnGlResize);
+ this.trackBarBrightness.Scroll += new System.EventHandler(this.trackBarBrightness_Scroll);
//
// MainWindow
//
- this.AllowDrop = true;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
@@ -961,7 +1053,7 @@ private void InitializeComponent()
this.Controls.Add(this.trackBarBrightness);
this.Controls.Add(this.linkLabelDonate);
this.Controls.Add(this.buttonTabClose);
- this.Controls.Add(this.glControl1);
+ this.Controls.Add(this.renderControl1);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.toolStripSelectRenderer);
this.Controls.Add(this.statusStrip);
@@ -1014,10 +1106,10 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripButton toolStripButtonShowFPS;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.ToolStripButton toolStripButtonFullView;
- private System.Windows.Forms.ToolStripButton toolStripButtonTwoViewsHor;
+ private System.Windows.Forms.ToolStripButton toolStripButtonTwoViewsB;
private System.Windows.Forms.ToolStripButton toolStripButtonFourViews;
private System.Windows.Forms.ToolStripMenuItem logViewerToolStripMenuItem;
- private RenderControl glControl1;
+ private RenderControl renderControl1;
private TabControl tabControl1;
private ContextMenuStrip tabContextMenuStrip;
private ToolStripMenuItem closeToolStripMenuItem;
@@ -1033,7 +1125,7 @@ private void InitializeComponent()
private ToolStripMenuItem exportAllToolStripMenuItem;
private ToolStripStatusLabel toolStripStatistics;
private StatusStrip statusStrip;
- private ToolStripMenuItem twoViewsHorToolStripMenuItem;
+ private ToolStripMenuItem twoViewsBToolStripMenuItem;
private ToolStripMenuItem fourViewsToolStripMenuItem;
private ToolStripSeparator toolStripSeparator6;
private ToolStripMenuItem wireframeToolStripMenuItem;
@@ -1048,7 +1140,6 @@ private void InitializeComponent()
private ToolStripMenuItem optionsToolStripMenuItem;
private System.DirectoryServices.DirectorySearcher directorySearcher1;
private ColorDialog colorDialog1;
- private ToolStripSeparator toolStripSeparator9;
private ToolStripMenuItem toolStripMenuItem2;
private ToolStripSeparator toolStripSeparator10;
private LinkLabel linkLabelDonate;
@@ -1077,10 +1168,21 @@ private void InitializeComponent()
private ToolStripSeparator toolStripSeparator14;
private ToolStripMenuItem backgroundColorToolStripMenuItem;
private ToolStripMenuItem resetBackgroundToolStripMenuItem;
- private ToolStripButton toolStripButtonTwoViews;
- private ToolStripMenuItem twoViewsToolStripMenuItem;
+ private ToolStripButton toolStripButtonTwoViewsA;
+ private ToolStripMenuItem twoViewsAToolStripMenuItem;
private ToolStripButton toolStripButtonCulling;
private ToolStripMenuItem cullingToolStripMenuItem;
+ private ToolStripMenuItem backgroundAlphaToolStripMenuItem;
+ private ToolStripButton toolStripButtonShowVRModels;
+ private ToolStripMenuItem showVRModelsToolStripMenuItem;
+ private ToolStripSeparator toolStripSeparator15;
+ private ToolStripSeparator toolStripSeparator16;
+ private ToolStripSeparator toolStripSeparator18;
+ private ToolStripSeparator toolStripSeparator17;
+ private ToolStripMenuItem useSceneLightsToolStripMenuItem;
+ private ToolStripButton toolStripButtonUseSceneLights;
+ private ToolStripMenuItem showCaptureWindowsToolStripMenuItem;
+ private ToolStripMenuItem setDynamicSourceToolStripMenuItem;
}
}
diff --git a/open3mod/MainWindow.cs b/open3mod/MainWindow.cs
index a1cb3cf..ef8900c 100644
--- a/open3mod/MainWindow.cs
+++ b/open3mod/MainWindow.cs
@@ -17,37 +17,59 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
///////////////////////////////////////////////////////////////////////////////////
-
#define USE_APP_IDLE
+
using System;
using System.Collections.Specialized;
using System.Diagnostics;
using System.Drawing;
+using System.Drawing.Imaging;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Windows.Forms;
using System.Threading;
-
+using System.Reflection;
+using System.Runtime.InteropServices;
using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Graphics.OpenGL;
+using OpenTK;
+using Valve.VR;
#if LEAP
using Leap;
#endif
+
namespace open3mod
{
public partial class MainWindow : Form
{
+ bool firstRun = true;
+ public const bool useIO = false;
+
+ public static string exePath = "e:\\vr-software\\open3mod-master\\open3mod\\";
+ public static string[] recentDataSeparator = new string[] { "::" };
+ public static string[] recentItemSeparator = new string[] { ";;" };
+ public static NewTek.NDI.Finder NDIFinder;
+ NewTek.NDI.Source[] _NDISources;
+ NewTek.NDI.Source _selectedNDISource = null;
+ public static int mainTiming = 40;
+ public static int timeOffset = 0;
+ public CapturePreview capturePreview1;
+ public CapturePreview capturePreview2;
+ public OutputGenerator outputGenerator;
+
private readonly UiState _ui;
private Renderer _renderer;
private readonly FpsTracker _fps;
private LogViewer _logViewer;
+ private OpenVRInterface _openVRInterface;
private delegate void DelegateSelectTab(TabPage tab);
private readonly DelegateSelectTab _delegateSelectTab;
-
private delegate void DelegatePopulateInspector(Tab tab);
private readonly DelegatePopulateInspector _delegatePopulateInspector;
@@ -68,11 +90,11 @@ public partial class MainWindow : Form
public delegate void TabSelectionChangeHandler(Tab tab);
public event TabSelectionChangeHandler SelectedTabChanged;
+
-
- public GLControl GlControl
+ public RenderControl renderControl
{
- get { return glControl1; }
+ get { return renderControl1; }
}
public UiState UiState
@@ -90,28 +112,48 @@ public Renderer Renderer
get { return _renderer; }
}
+ public NewTek.NDI.Source[] NDISources
+ {
+ get { return _NDISources; }
+ }
+ public NewTek.NDI.Source NDISource
+ {
+ get { return _selectedNDISource; }
+ }
public const int MaxRecentItems = 12;
+
public MainWindow()
- {
+ {
+
+ exePath = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase);
+ exePath = exePath.Substring(6);
+ string remove = "\\bin\\Debug";
+ if (exePath.Substring(exePath.Length - remove.Length) == remove)
+ {
+ exePath = exePath.Remove(exePath.Length - remove.Length);
+ }
// create delegate used for asynchronous calls
_delegateSelectTab = SelectTab;
_delegatePopulateInspector = PopulateInspector;
-
- InitializeComponent();
+
+ InitializeComponent();
_captionStub = Text;
+ _openVRInterface = new OpenVRInterface();
+ OpenVRInterface.fPredictedSecondsToPhotonsFromNow = CoreSettings.CoreSettings.Default.SecondsToPhotons;
+ _fps = new FpsTracker();
- AddEmptyTab();
-
// initialize UI state shelf with a default tab
+ AddEmptyTab();
_ui = new UiState(new Tab(_emptyTab, null));
- _fps = new FpsTracker();
// sync global UI with UIState
+ showVRModelsToolStripMenuItem.Checked = toolStripButtonShowVRModels.Checked = _ui.ShowVRModels;
framerateToolStripMenuItem.Checked = toolStripButtonShowFPS.Checked = _ui.ShowFps;
lightingToolStripMenuItem.Checked = toolStripButtonShowShaded.Checked = _ui.RenderLit;
+ useSceneLightsToolStripMenuItem.Checked = toolStripButtonUseSceneLights.Checked = _ui.UseSceneLights;
cullingToolStripMenuItem.Checked = toolStripButtonCulling.Checked = GraphicsSettings.Default.BackFaceCulling;
texturedToolStripMenuItem.Checked = toolStripButtonShowTextures.Checked = _ui.RenderTextured;
wireframeToolStripMenuItem.Checked = toolStripButtonWireframe.Checked = _ui.RenderWireframe;
@@ -119,30 +161,63 @@ public MainWindow()
showBoundingBoxesToolStripMenuItem.Checked = toolStripButtonShowBB.Checked = _ui.ShowBBs;
showAnimationSkeletonToolStripMenuItem.Checked = toolStripButtonShowSkeleton.Checked = _ui.ShowSkeleton;
+ GraphicsContext[] graphicsContexts = new GraphicsContext[4];
+ graphicsContexts[0] = (GraphicsContext)GraphicsContext.CurrentContext;
+ if (useIO)
+ {
+ capturePreview2 = new CapturePreview(this,2);
+ capturePreview1 = new CapturePreview(this,1);
+ capturePreview1.Location = CoreSettings.CoreSettings.Default.LocationCam1;
+ capturePreview2.Location = CoreSettings.CoreSettings.Default.LocationCam2;
+ outputGenerator = new OutputGenerator();
+ outputGenerator.Location = CoreSettings.CoreSettings.Default.LocationOutput;
+ }
+ graphicsContexts[0] = (GraphicsContext)GraphicsContext.CurrentContext;
+ GraphicsMode gm = new GraphicsMode(new ColorFormat(32), 24, 8, 0);
+
// manually register the MouseWheel handler
- glControl1.MouseWheel += OnMouseMove;
+ renderControl1.MouseWheel += OnMouseMove;
// intercept all key events sent to children
KeyPreview = true;
-
- InitRecentList();
+ if (useIO)
+ {
+ NDIFinder = new NewTek.NDI.Finder(true);
+ }
+ else
+ {
+ setDynamicSourceToolStripMenuItem.Text = "Inputs/Outputs are OFF";
+ }
#if LEAP
//LeapMotion Support
_leapListener = new LeapListener(this as MainWindow);
_leapController = new Controller(_leapListener);
#endif
-
- // register listener for tab changs
- tabControl1.SelectedIndexChanged += (object o, EventArgs e) => {
+ // register listener for tab changes
+ tabControl1.SelectedIndexChanged += (object o, EventArgs e) => {
if (SelectedTabChanged != null)
{
SelectedTabChanged(UiState.TabForId(tabControl1.SelectedTab));
}
};
- _initialized = true;
StartUndoRedoUiStatePollLoop();
+
+ InitRecentList();
+ const string installed = "testscenes/scenes/TestCube.fbx";
+ string repos;
+ repos = "../../../testdata/scenes/PolasVRS-V1.fbx";
+ repos = "../../../testdata/scenes/testXYZ.fbx";
+ repos = "../../../testdata/scenes/TableTest1mForDae.dae";
+ repos = "E:\\vr-software\\Scenes\\PolasVRS-V1.fbx";
+ repos = "../../../testdata/scenes/testXYZ.fbx";
+ //AddTab(File.Exists(repos) ? repos : installed);
+ ProcessPriorityClass Priority = ProcessPriorityClass.High;
+ Process MainProcess = Process.GetCurrentProcess();
+ MainProcess.PriorityClass = Priority;
+ _initialized = true;
+ CloseTab(_emptyTab);
}
public override sealed string Text
@@ -151,10 +226,40 @@ public override sealed string Text
set { base.Text = value; }
}
+ public static NewTek.NDI.Source[] FindNDISources()
+ {
+ int index = 0;
+ NewTek.NDI.Source[] NewNDISources = null;
+ for (int i = 0; i < MainWindow.NDIFinder.Sources.Count; i++)
+ {
+ bool isOwn = false;
+ for (int j = 0; j < Renderer.streamName.Length; j++)
+ {
+ if (Renderer.streamName[j] == MainWindow.NDIFinder.Sources.ElementAt(i).SourceName) isOwn = true;
+ }
+ if (!isOwn)
+ {
+ if (NewNDISources == null)
+ {
+ NewNDISources = new NewTek.NDI.Source[1];
+ }
+ else
+ {
+ int oldLen = NewNDISources.Length;
+ Array.Resize(ref NewNDISources, oldLen + 1);
+ }
+ NewNDISources[index] = MainWindow.NDIFinder.Sources.ElementAt(i);
+ index++;
+ }
+ }
+ return NewNDISources;
+ }
+
///
/// Add an "empty" tab if it doesn't exist yet
///
+
private void AddEmptyTab()
{
// create default tab
@@ -174,18 +279,37 @@ private void AddEmptyTab()
protected override void OnCreateControl()
{
base.OnCreateControl();
-
DelayExecution(TimeSpan.FromSeconds(2),
MaybeShowTipOfTheDay);
DelayExecution(TimeSpan.FromSeconds(20),
MaybeShowDonationDialog);
+
+ if (CoreSettings.CoreSettings.Default.AutoStart && useIO)
+ {
+ CoreSettings.CoreSettings.Default.Genlock = false;
+ CoreSettings.CoreSettings.Default.KeepTimingRight = false;
+ int delay = 5;
+ DelayExecution(TimeSpan.FromSeconds(delay),
+ capturePreview1.StartCapture);
+ // DelayExecution(TimeSpan.FromSeconds(delay+1),
+ // capturePreview2.StartCapture);
+ DelayExecution(TimeSpan.FromSeconds(delay+2),
+ GenlockOn);
+ // DelayExecution(TimeSpan.FromSeconds(delay+3),
+ // outputGenerator.StartRunning);
+ }
}
+ private static void GenlockOn()
+ {
+ CoreSettings.CoreSettings.Default.Genlock = true;
+ }
+
private static void MaybeShowTipOfTheDay()
{
- if (CoreSettings.CoreSettings.Default.ShowTipsOnStartup)
+ if (CoreSettings.CoreSettings.Default.ShowTipsOnStartup && !useIO)
{
var tip = new TipOfTheDayDialog();
tip.ShowDialog();
@@ -212,7 +336,7 @@ public static void DelayExecution(TimeSpan delay, Action action)
/// Initial value for the donation countdown - every time the application is launched,
/// a counter is decremented. Upon reaching 0, the user is asked to donate.
///
- private const int DonationCounterStart = 10;
+ private const int DonationCounterStart = 1000;
private static void MaybeShowDonationDialog()
@@ -241,14 +365,13 @@ private void PopulateUITab(TabPage ui)
tui.Size = ui.ClientSize;
tui.AutoSize = false;
tui.Dock = DockStyle.Fill;
- ;
ui.Controls.Add(tui);
}
private void ActivateUiTab(TabPage ui)
{
- ((TabUiSkeleton)ui.Controls[0]).InjectGlControl(glControl1);
+ ((TabUiSkeleton)ui.Controls[0]).InjectGlControl(renderControl1);
if (_renderer != null)
{
_renderer.TextOverlay.Clear();
@@ -282,7 +405,8 @@ private void ActivateUiTab(TabPage ui)
/// Specifies whether the data is loaded asynchr.
/// Specifies whether the newly added tab will
/// be selected when the loading process is complete.
- public void AddTab(string file, bool async = true, bool setActive = true)
+
+ public void AddTab(string file, bool async = true, bool setActive = true, bool delayStart = false)
{
AddRecentItem(file);
@@ -321,9 +445,11 @@ public void AddTab(string file, bool async = true, bool setActive = true)
TabChanged(t, true);
}
- if (async)
+ if (async & false)
+ //if (async)..well, but also we need to keep the same thread due to OpenGL
{
- var th = new Thread(() => OpenFile(t, setActive));
+ var th = new Thread(() => OpenFile(t, setActive, delayStart)); //if we are starting the app we need to wait for MainWindow
+ th.SetApartmentState(ApartmentState.STA);
th.Start();
}
else
@@ -333,7 +459,7 @@ public void AddTab(string file, bool async = true, bool setActive = true)
if (_emptyTab != null)
{
- CloseTab(_emptyTab);
+ CloseTab(_emptyTab);
}
}
@@ -343,6 +469,7 @@ public void AddTab(string file, bool async = true, bool setActive = true)
///
private void InitRecentList()
{
+ //ClearRecentList();
recentToolStripMenuItem.DropDownItems.Clear();
var v = CoreSettings.CoreSettings.Default.RecentFiles;
if (v == null)
@@ -352,10 +479,26 @@ private void InitRecentList()
}
foreach (var s in v)
{
- var tool = recentToolStripMenuItem.DropDownItems.Add(Path.GetFileName(s));
var path = s;
+ var tool = recentToolStripMenuItem.DropDownItems.Add(Path.GetFileName(path));
tool.Click += (sender, args) => AddTab(path);
+ //path is in collection, we show name only
+ }
+ }
+
+ ///
+ /// Clears Recent Menu
+ ///
+ private void ClearRecentList()
+ {
+ recentToolStripMenuItem.DropDownItems.Clear();
+ var v = CoreSettings.CoreSettings.Default.RecentFiles;
+ if (v == null)
+ {
+ v = CoreSettings.CoreSettings.Default.RecentFiles = new StringCollection();
+ CoreSettings.CoreSettings.Default.Save();
}
+ CoreSettings.CoreSettings.Default.RecentFiles.Clear();
}
@@ -365,15 +508,17 @@ private void InitRecentList()
///
private void AddRecentItem(string file)
{
+ if (string.IsNullOrEmpty(file)) return;
var recent = CoreSettings.CoreSettings.Default.RecentFiles;
-
+ string removedStr = "";
bool removed = false;
int i = 0;
foreach (var s in recent)
{
- if (s == file)
+ if ((s == file))
{
recentToolStripMenuItem.DropDownItems.RemoveAt(i);
+ removedStr = s;
recent.Remove(s);
removed = true;
break;
@@ -386,7 +531,14 @@ private void AddRecentItem(string file)
recent.RemoveAt(recent.Count - 1);
}
- recent.Insert(0, file);
+ if (removed)
+ {
+ recent.Insert(0, removedStr);
+ }
+ else
+ {
+ recent.Insert(0, file);
+ }
CoreSettings.CoreSettings.Default.Save();
recentToolStripMenuItem.DropDownItems.Insert(0, new ToolStripMenuItem(
@@ -395,6 +547,22 @@ private void AddRecentItem(string file)
(sender, args) => AddTab(file)));
}
+ ///
+ /// Add a new item to the Recent-tabs list menu and save it persistently
+ ///
+ ///
+ private void AddRecentTabsItem(string file, string tabData)
+ {
+ var recent = CoreSettings.CoreSettings.Default.RecentTabs;
+ if (recent == null)
+ {
+ recent = CoreSettings.CoreSettings.Default.RecentTabs = new StringCollection();
+ CoreSettings.CoreSettings.Default.Save();
+ }
+ if (string.IsNullOrEmpty(file)) return;
+ recent.Insert(0, file + tabData);
+ CoreSettings.CoreSettings.Default.Save();
+ }
///
/// Generate a suitable caption to display on a scene tab given a
@@ -437,6 +605,8 @@ private string GenerateTabCaption(string file)
private void CloseTab(TabPage tab)
{
Debug.Assert(tab != null);
+ if ((tab == tabControl1.SelectedTab)&& (tab != _emptyTab)) CoreSettings.CoreSettings.Default.ViewsStatus = _ui.ActiveTab.getViewsStatusString();//save active status
+ //AddRecentItem(_ui.ActiveTab.File);
// If this is the last tab, we need to add an empty tab before we remove it
if (tabControl1.TabCount == 1)
@@ -491,33 +661,32 @@ private void CloseTab(TabPage tab)
public void SelectTab(TabPage tab)
{
Debug.Assert(tab != null);
+ CoreSettings.CoreSettings.Default.ViewsStatus = _ui.ActiveTab.getViewsStatusString();//save previous tab last status
+ Matrix4 oldSingleView = Matrix4.Identity;
+ var camIn = UiState.ActiveTab.ActiveCameraControllerForView(Tab.ViewIndex.Index4);
+ if (camIn != null) oldSingleView = UiState.ActiveTab.ActiveCameraControllerForView(Tab.ViewIndex.Index4).GetViewNoOffset();
+
+
tabControl1.SelectedTab = tab;
var outer = UiState.TabForId(tab);
Debug.Assert(outer != null);
-
- if (outer.ActiveScene != null)
- {
- toolStripStatistics.Text = outer.ActiveScene.StatsString;
- }
- else
- {
- toolStripStatistics.Text = "";
- }
// update internal housekeeping
UiState.SelectTab(tab);
+ _ui.ActiveTab.loadViewsStatusString();
+
// update UI check boxes
var vm = _ui.ActiveTab.ActiveViewMode;
fullViewToolStripMenuItem.CheckState = toolStripButtonFullView.CheckState =
vm == Tab.ViewMode.Single
? CheckState.Checked
: CheckState.Unchecked;
- twoViewsToolStripMenuItem.CheckState = toolStripButtonTwoViews.CheckState =
- vm == Tab.ViewMode.Two
+ twoViewsAToolStripMenuItem.CheckState = toolStripButtonTwoViewsA.CheckState =
+ vm == Tab.ViewMode.TwoVertical
? CheckState.Checked
: CheckState.Unchecked;
- twoViewsHorToolStripMenuItem.CheckState = toolStripButtonTwoViewsHor.CheckState =
+ twoViewsBToolStripMenuItem.CheckState = toolStripButtonTwoViewsB.CheckState =
vm == Tab.ViewMode.TwoHorizontal
? CheckState.Checked
: CheckState.Unchecked;
@@ -528,6 +697,21 @@ public void SelectTab(TabPage tab)
// some other UI housekeeping, this also injects the GL panel into the tab
ActivateUiTab(tab);
+ var camOut = UiState.ActiveTab.ActiveCameraControllerForView(Tab.ViewIndex.Index4);
+ if ((camIn != null)&& (camOut != null)) camOut.SetViewNoOffset(oldSingleView);
+ var insp = UiForTab(_ui.ActiveTab).GetInspector();
+ if (insp != null) insp.SelectPlaybackView();
+ string statusText = CoreSettings.CoreSettings.Default.UseSceneLights ? "" : " | Keep right mouse button pressed to move light source";
+ if (outer.ActiveScene != null)
+ {
+ statusText += " | Scene scale: " + outer.ActiveScene.Scale.ToString() + "x ";
+ toolStripStatistics.Text = outer.ActiveScene.StatsString + statusText;
+ }
+ else
+ {
+ toolStripStatistics.Text = statusText;
+ }
+
}
@@ -551,18 +735,18 @@ private string GenerateTabKey()
/// Opens a particular 3D model and assigns it to a particular tab.
/// May be called on a non-GUI-thread.
///
- private void OpenFile(Tab tab, bool setActive)
+ private void OpenFile(Tab tab, bool setActive, bool delayStart = false)
{
try
{
- tab.ActiveScene = new Scene(tab.File);
+ if (delayStart) Thread.Sleep(1000);
+ tab.ActiveScene = new Scene(tab.File,_renderer);
CoreSettings.CoreSettings.Default.CountFilesOpened++;
}
catch(Exception ex)
{
tab.SetFailed(ex.Message);
}
-
var updateTitle = new MethodInvoker(() =>
{
var t = (TabPage)tab.Id;
@@ -650,28 +834,26 @@ private void OnGlLoad(object sender, EventArgs e)
{
_renderer.Dispose();
}
-
- _renderer = new Renderer(this);
+ _renderer = new Renderer(this);
#if USE_APP_IDLE
// register Idle event so we get regular callbacks for drawing
Application.Idle += ApplicationIdle;
#else
_timer = new System.Windows.Forms.Timer();
- _timer.Interval = 20;
+ _timer.Interval = mainTiming*4;
_timer.Tick += ApplicationIdle;
_timer.Start();
+
#endif
}
-
private void OnGlResize(object sender, EventArgs e)
{
if (_renderer == null) // safeguard in case glControl's Load() wasn't fired yet
{
return;
}
-
_renderer.Resize();
}
@@ -682,29 +864,57 @@ private void GlPaint(object sender, PaintEventArgs e)
{
return;
}
-
FrameRender();
}
private void ApplicationIdle(object sender, EventArgs e)
- {
- if(IsDisposed)
+ {
+ if (IsDisposed)
{
return;
}
+ // if (_renderer.timeTrack) Console.WriteLine("Start AppIdle {0}", _renderer._runsw.Elapsed.TotalMilliseconds);
#if USE_APP_IDLE
- while (glControl1.IsIdle)
+ while (renderControl1.IsIdle)
#endif
{
- FrameUpdate();
- FrameRender();
+ if (!CoreSettings.CoreSettings.Default.Genlock)
+ {
+ FrameUpdate();
+ FrameRender();
+ }
+
+ if (firstRun)
+ {
+ CloseTab(_emptyTab);
+ firstRun = false;
+ if (CoreSettings.CoreSettings.Default.RecentTabs != null)
+ {
+ for (int i = CoreSettings.CoreSettings.Default.RecentTabs.Count - 1; i >= 0; i--)
+ {
+ var s = CoreSettings.CoreSettings.Default.RecentTabs[i];
+ string[] recentData = s.Split(recentDataSeparator, StringSplitOptions.None);
+ Thread.Sleep(500);
+ AddTab(recentData[0], true, false, true);
+ }
+ }
+ }
+ _renderer.timeTrack("End App Idle");
}
}
+ private void FrameLoop(bool videoFrameArrived, int m_number, IntPtr videoData)
+ {
+ if (!videoFrameArrived) return;
+ if (!CoreSettings.CoreSettings.Default.Genlock) return;
+ FrameUpdate();
+ FrameRender();
+ }
+
private void FrameUpdate()
- {
+ {
_fps.Update();
var delta = _fps.LastFrameDelta;
@@ -716,15 +926,19 @@ private void FrameUpdate()
tab.ActiveScene.Update(delta, tab != UiState.ActiveTab);
}
}
-
ProcessKeys();
+ OpenVRInterface.ProcessAllButtons();
}
private void FrameRender()
{
_renderer.Draw(_ui.ActiveTab);
- glControl1.SwapBuffers();
+ _renderer.timeTrack("23-EndDraw");
+ renderControl1.CopyToOnScreenFramebuffer();
+ _renderer.timeTrack("24-Copied");
+ renderControl1.SwapBuffers();
+ _renderer.timeTrack("25-BuffSwitched");
}
@@ -734,6 +948,18 @@ private void ToggleFps(object sender, EventArgs e)
framerateToolStripMenuItem.Checked = toolStripButtonShowFPS.Checked = _ui.ShowFps;
}
+ private void ToggleModels(object sender, EventArgs e)
+ {
+ _ui.ShowVRModels = !_ui.ShowVRModels;
+ showVRModelsToolStripMenuItem.Checked = toolStripButtonShowVRModels.Checked = _ui.ShowVRModels;
+
+ }
+
+ private void ToggleUseSceneLights(object sender, EventArgs e)
+ {
+ _ui.UseSceneLights = !_ui.UseSceneLights;
+ useSceneLightsToolStripMenuItem.Checked = toolStripButtonUseSceneLights.Checked = _ui.UseSceneLights;
+ }
private void ToggleShading(object sender, EventArgs e)
{
@@ -789,13 +1015,13 @@ private void ToggleCulling(object sender, EventArgs e)
private void UncheckViewMode()
{
toolStripButtonFullView.CheckState = CheckState.Unchecked;
- toolStripButtonTwoViews.CheckState = CheckState.Unchecked;
- toolStripButtonTwoViewsHor.CheckState = CheckState.Unchecked;
+ toolStripButtonTwoViewsA.CheckState = CheckState.Unchecked;
+ toolStripButtonTwoViewsB.CheckState = CheckState.Unchecked;
toolStripButtonFourViews.CheckState = CheckState.Unchecked;
fullViewToolStripMenuItem.CheckState = CheckState.Unchecked;
- twoViewsToolStripMenuItem.CheckState = CheckState.Unchecked;
- twoViewsHorToolStripMenuItem.CheckState = CheckState.Unchecked;
+ twoViewsAToolStripMenuItem.CheckState = CheckState.Unchecked;
+ twoViewsBToolStripMenuItem.CheckState = CheckState.Unchecked;
fourViewsToolStripMenuItem.CheckState = CheckState.Unchecked;
}
@@ -823,22 +1049,22 @@ private void ToggleTwoViewsHorizontal(object sender, EventArgs e)
UiState.ActiveTab.ActiveViewMode = Tab.ViewMode.TwoHorizontal;
UncheckViewMode();
- toolStripButtonTwoViewsHor.CheckState = CheckState.Checked;
- twoViewsHorToolStripMenuItem.CheckState = CheckState.Checked;
+ toolStripButtonTwoViewsB.CheckState = CheckState.Checked;
+ twoViewsBToolStripMenuItem.CheckState = CheckState.Checked;
}
private void ToggleTwoViews(object sender, EventArgs e)
{
- if (UiState.ActiveTab.ActiveViewMode == Tab.ViewMode.Two)
+ if (UiState.ActiveTab.ActiveViewMode == Tab.ViewMode.TwoVertical)
{
return;
}
- UiState.ActiveTab.ActiveViewMode = Tab.ViewMode.Two;
+ UiState.ActiveTab.ActiveViewMode = Tab.ViewMode.TwoVertical;
UncheckViewMode();
- toolStripButtonTwoViews.CheckState = CheckState.Checked;
- twoViewsToolStripMenuItem.CheckState = CheckState.Checked;
+ toolStripButtonTwoViewsA.CheckState = CheckState.Checked;
+ twoViewsAToolStripMenuItem.CheckState = CheckState.Checked;
}
@@ -916,21 +1142,33 @@ private void OnCloseTab(object sender, EventArgs e)
}
}
+ string[] names;
private void OnFileMenuOpen(object sender, EventArgs e)
{
- if(openFileDialog.ShowDialog() == DialogResult.OK)
+ var th = new Thread(() => FileMenuOpenAsync());
+ th.SetApartmentState(ApartmentState.STA);
+ th.Start();
+ th.Join();
+ var first = true;
+ if (names != null)
{
- var names = openFileDialog.FileNames;
- var first = true;
- foreach(var name in names)
+ foreach (var name in names)
{
- AddTab(name,true, first);
+ AddTab(name, false, first);
first = false;
}
}
}
+ private void FileMenuOpenAsync()
+ {
+ if (openFileDialog.ShowDialog() == DialogResult.OK)
+ {
+ names = openFileDialog.FileNames;
+ }
+ }
+
private void OnFileMenuCloseAll(object sender, EventArgs e)
{
@@ -955,7 +1193,14 @@ private void OnFileMenuQuit(object sender, EventArgs e)
private void OnCloseForm(object sender, FormClosedEventArgs e)
- {
+ {
+ if (useIO)
+ {
+ capturePreview1.Dispose();
+ capturePreview2.Dispose();
+ outputGenerator.Dispose();
+ }
+
UiState.Dispose();
_renderer.Dispose();
}
@@ -1093,6 +1338,23 @@ private void OnLoad(object sender, EventArgs e)
private void OnClosing(object sender, FormClosingEventArgs e)
{
+ if (useIO)
+ {
+ capturePreview1.StopCapture();
+ capturePreview2.StopCapture();
+ outputGenerator.StopRunning();
+ CoreSettings.CoreSettings.Default.LocationCam1 = capturePreview1.Location;
+ CoreSettings.CoreSettings.Default.LocationCam2 = capturePreview2.Location;
+ CoreSettings.CoreSettings.Default.LocationOutput = outputGenerator.Location;
+ }
+
+ CoreSettings.CoreSettings.Default.ViewsStatus = _ui.ActiveTab.getViewsStatusString();//read status
+ //CoreSettings.CoreSettings.Default.RecentTabsOpened = tabControl1.TabPages.Count;
+ if (CoreSettings.CoreSettings.Default.RecentTabs != null) CoreSettings.CoreSettings.Default.RecentTabs.Clear();
+ for (int i = 0; i< _ui.Tabs.Count;i++)
+ {
+ AddRecentTabsItem(_ui.Tabs[i].File,"");
+ }
if (WindowState == FormWindowState.Maximized)
{
CoreSettings.CoreSettings.Default.Location = RestoreBounds.Location;
@@ -1105,6 +1367,7 @@ private void OnClosing(object sender, FormClosingEventArgs e)
CoreSettings.CoreSettings.Default.Size = Size;
CoreSettings.CoreSettings.Default.Maximized = false;
}
+ CoreSettings.CoreSettings.Default.SecondsToPhotons = OpenVRInterface.fPredictedSecondsToPhotonsFromNow;
CoreSettings.CoreSettings.Default.Save();
#if LEAP
@@ -1171,7 +1434,7 @@ private void OnSetFileAssociations(object sender, EventArgs e)
private void linkLabelWebsite_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- Process.Start("http://www.open3mod.com/");
+ Process.Start("http://www.polas.cz/");
}
// Hardcoded sample files with paths adjusted for running from
@@ -1300,13 +1563,16 @@ private void OnReloadCurrentTab(object sender, EventArgs e)
{
return;
}
-
activeTab.ActiveScene = null;
- new Thread(
+/* new Thread(
() => {
- activeTab.ActiveScene = new Scene(activeTab.File);
+ activeTab.ActiveScene = new Scene(activeTab.File, _renderer);
BeginInvoke(new Action(() => PopulateInspector(activeTab)));
}).Start();
+ */
+ //if we keep the same OpenGLContext We cannot start new thread,
+ activeTab.ActiveScene = new Scene(activeTab.File, _renderer);
+ BeginInvoke(new Action(() => PopulateInspector(activeTab)));
}
private void OnGenerateNormals(object sender, EventArgs e)
@@ -1342,7 +1608,93 @@ private void OnResetBackground(object sender, EventArgs e)
// Keep in sync with CoreSettings.settings.
CoreSettings.CoreSettings.Default.BackgroundColor = Color.DarkGray;
}
+
+ private void OnChangeBackgroundAlpha(object sender, EventArgs e)
+ {
+ ColorDialog colorPicker = new ColorDialog();
+ colorPicker.FullOpen = true;
+ colorPicker.Color = CoreSettings.CoreSettings.Default.BackgroundAlpha;
+ colorPicker.ShowDialog();
+ CoreSettings.CoreSettings.Default.BackgroundAlpha = colorPicker.Color;
+ }
+
+ [DllImport("kernel32.dll", EntryPoint = "CopyMemory", SetLastError = false)]
+ public static extern void CopyMemory(IntPtr dest, IntPtr src, uint count);
+
+ private void ShowCaptureWindows_Click(object sender, EventArgs e)
+ {
+ if (useIO)
+ {
+ capturePreview1.Show();
+ capturePreview2.Show();
+ outputGenerator.Show();
+ }
+ }
+ [System.ComponentModel.Browsable(false)]
+
+ public void callFrameLoop(int m_number, IntPtr videoData)
+ {
+ MethodInvoker method = () => FrameLoop(true, m_number, videoData);
+
+ if (_renderer == null) return;
+ _renderer.uploadCameraBuffer(m_number, videoData);
+ if (m_number == _renderer.syncCamera)
+ {
+ if (InvokeRequired)
+ {
+ Thread.Sleep(5);
+ BeginInvoke(method);//should not be waiting for FrameLoop
+ }
+ else
+ {
+ method();
+ }
+ }
+ }
+
+ public void handleAudio(int m_number, IntPtr audioData)
+ {
+ if (m_number == _renderer.syncCamera) outputGenerator.addAudioFrame(audioData);
+ }
+
+ private void setDynamicSourceToolStripMenuItem_Click(object senderExt, EventArgs e)
+ {
+ if (MainWindow.useIO)
+ {
+ setDynamicSourceToolStripMenuItem.Text = "Loooking for Dynamic Sources";
+ _NDISources = MainWindow.FindNDISources();
+ if (_NDISources == null) return;
+ setDynamicSourceToolStripMenuItem.DropDownItems.Clear();
+ for (int i = 0; i < _NDISources.Count(); i++)
+ {
+ var Name = _NDISources[i].Name;
+ var tool = setDynamicSourceToolStripMenuItem.DropDownItems.Add(Name);
+ tool.Click += (sender, args) => selectDynamicSource(Name);
+ }
+ if (_NDISources.Count() > 0) setDynamicSourceToolStripMenuItem.Text = "Choose Dynamic Source";
+ else setDynamicSourceToolStripMenuItem.Text = "Find Dynamic Sources";
+ }
+ }
+
+ private void selectDynamicSource(string Name)
+ {
+ _selectedNDISource = null;
+ for (int i = 0; i < _NDISources.Count(); i++)
+ {
+ if (Name == _NDISources[i].Name)
+ {
+ _selectedNDISource = _NDISources[i];
+ _renderer.ConnectNDI(_NDISources[i]);
+ }
+ }
+ }
+
+ private void trackBarBrightness_Scroll(object sender, EventArgs e)
+ {
+ GraphicsSettings.Default.Save();
+ }
}
+
}
/* vi: set shiftwidth=4 tabstop=4: */
\ No newline at end of file
diff --git a/open3mod/MainWindow.resx b/open3mod/MainWindow.resx
index b6fce72..1dc08cb 100644
--- a/open3mod/MainWindow.resx
+++ b/open3mod/MainWindow.resx
@@ -172,7 +172,7 @@
w2jquEBh2TGy8KgBowaA8HAygHxs/B8AY6c8YtSvGkAAAAAASUVORK5CYII=
-
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKL2lDQ1BJQ0MgUHJvZmlsZQAASMedlndU
@@ -223,7 +223,7 @@
JwMowP8Y/v//TxHGKkgKptwLWARJwcMmHWCTJAbDDSAfG/8DABP4LwF9l09kAAAAAElFTkSuQmCC
-
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKL2lDQ1BJQ0MgUHJvZmlsZQAASMedlndU
@@ -270,9 +270,8 @@
DjoMXrjleuvyba/b1++svDMwFDJ0dzhyeOQu++7kvaR7L+9n3J9/sOkh+mHhI6lH5Y+VHtf9qPdj64jl
yJlR19G+J0FPHoyxxp7/lP7Th/H8p+Sn5ROqE42TZpOnp9ynbj5b/Wz8eerz+emCn6V/rn6h++K7Xxx/
6ZtZNTP+kv9y4dfiV/Kvjrxe9rp71n/28ZvkN/NzhW/l3x59x3jX+z7s/cR85gfsh4qPeh+7Pnl/eriQ
- vLDwG/eE8/s3BCkeAAAACXBIWXMAAC4iAAAuIgGq4t2SAAAAB3RJTUUH3woEETo4+iEkDAAAAFFJREFU
- OE9jMDY2/o8LMwABkGZEF0fGlBtgZGr2X2HZMQwMlkQyAJsakN7hYAAuSWIMAKshZAAIDKwBQJoyLxA0
- YOCjceANAEniwsgGYMfG/wHIBukiK8sQGwAAAABJRU5ErkJggg==
+ vLDwG/eE8/s3BCkeAAAACXBIWXMAAC4iAAAuIgGq4t2SAAAAPElEQVQ4T2MwNjb+TwH+Rx0DFJYdIwsP
+ JwMowP8Y/v//TxHGKkgKptwLWARJwcMmHWCTJAbDDSAfG/8DABP4LwF9l09kAAAAAElFTkSuQmCC
@@ -490,12 +489,12 @@
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPY6AmCADi6UCsAOaRCASA+DsQ/wfi5SAB+fn7
- QWIkgedADDKgXX7p0QCFZcfeKyw90i+/6qQEWJYQEMtrFZfsXjYDqPE/Gv4ONmj5cfxeAzqZA4tmNHx0
- PquU4iSg8vtAHAHWiAyAiq5jakLFLKKSIG+C8HmwJmQAVLAcXQMa3sehbTwLqBS7C+SXHSvAogkdY9oM
- A/JLjhhg0YDAiw/fB6mBKscOgArfo2n8DqaXHt1PVNoAKl6PpBmClx+fDoolqBL8QDipdKFIcc93iboZ
- F4CavwOdnAGVIhqAAgkUTe8J+hcHANkIStYNYB5tAQMDAI0i0y0nSBQpAAAAAElFTkSuQmCC
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAPdJREFUOE9joCYIAOLpQKwA5pEIBID4OxD/B+LlIAH5+ftBYiSB50AMMqBdfunR
+ AIVlx94rLD3SL7/qpARYlhAQy2sVl+xeNgOo8T8a/g42aPlx/F4DOpkDi2Y0fHQ+q5TiJKDy+0AcAdaI
+ DICKrmNqQsUsopIgb4LwebAmZABUsBxdAxrex6FtPAuoFLsL5JcdK8CiCR1j2gwD8kuOGGDRgMCLD98H
+ qYEqxw6ACt+jafwOppce3U9U2gAqXo+kGYKXH58OiiWoEvxAOKl0oUhxz3eJuhkXgJq/A52cAZUiGoAC
+ CRRN7wn6FwcA2QhK1g1gHm0BAwMAjSLTLSdIFCkAAAAASUVORK5CYII=
@@ -506,6 +505,26 @@
vg40IB5IHwPSerwaGoxQKbhimHN3ABW4orjAz08ByH4E0gSUywOyTwHxMyC7CNkAbC6AGboTqNgBKgUG
QHlxoPgjIC2PzwB0MSkJDw9OEFvUwYEFKH+dJAOArrABih0C4l1ADAqLMqjUCAcMDAC4aFj60vz5vwAA
AABJRU5ErkJggg==
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABcAAAAWCAYAAAArdgcFAAAABGdBTUEAALGPC/xhBQAAA2VJREFUSEut
+ VVtIFFEY3pnd2dvM7o57d1O7oQlJSjcvlWl5rzTXDLXSUjO7WFqmpqWlpJUZFUEUBVF0vwq9+FAkEaY9
+ hBChDz0UlW9FRBTp7PSd2SkSclutD/6XM//5zn++//vPKCYISkFRtIKild6glNLaP4OiQEyrKY3WSnOm
+ IKWBD6K1OqeCpvXkqzdpIgAxpdaYVbbAxdqIubVsXHIHuyClXRcV28I4g9MoRm0kWd7k8YAQM2qzJjSi
+ 3LR8TZ9p5foBQ0pOtyHZ3cW7i58bl+V3qaeGuykVYyDZ3k3+QNKXUqmDpxeYsgqfgfQJG5t005RVdMu0
+ Yu1FNjrxrDE195ExLfeeyuaK80qH8Be0npsO0st89oZeyHHLWt7w2tV6wUPCUlr7gluUdtWQ5L6jCZuV
+ LxdDy1t9gBTBMJwuMma/bWvTJz57/X0uYcVVe2XrR2fj6e/OptPDWB80JGbe4OKXXYdsq/0lJ0kM45q8
+ nM/d+NRRf0I0r63o189LOAedH9p3t7+17zr8zpS57jEXn3EX0nSqp4Rl+0NONIPBuDBUegWVio6aDhFk
+ w9C6Rz974XlIcYZdkHqOjV5yE9r3sDFLTyI/VN47puZSQ9B5HpbbYynePWSvPuIBsYcc4Kg9JlrL6oeg
+ fx+fU9IXULD1JfpwCp4Plyv20UwycRSth3dXwnK9qFqQYuchUrkIOTyOuuMkvlo2VA/qZs1vwyCFyXL4
+ dIl0JZo1ROLat+GKEVtFs2jb3iISaexVbdINsPYFUjxgAkPSkU+eAJ9SeIHT0UKLNjyq3rym4j2cIFi3
+ NHls2w6QAwTbjoMeS0nNEA6+rjTbEsmO38InvO5wBOVh4l5AV0GK8r0iDhCsmxu/BeRveaOdOWcfpdE5
+ pGr/IsMo0Do2VD8/4ZK5qGrYUlonIjzWTQ0CBuWTMSOvWx08rZRSquwgJVL4MSgysInTzohs5nPLPluK
+ qwU0S4AEHnj7Ayx3TRlgjZFT/+KI0SDPqEZld2XiIeoxF1YJiBFSPSbyFWQ4Cv9G/ModFzECSjvxdJ6F
+ piCuHA4o2PbFmLKqHzKUUEolK2vrN+koQBJeGx7ZgFEewGgP4tXrVJntWfikk7QdT+P+BAyCS+WYlITh
+ SUdjQ+TliVc8Bn5a7L+T/qcfrkLxA3+X6fBJF4LhAAAAAElFTkSuQmCC
@@ -670,6 +689,33 @@
J7f/Kt2L/yssPvRfpXPhfwNHV5ghB4B4ioGLx3+V3mVgedW2ef8N7RxBcqEgA+6AFII1LzsGx8oTV//X
zK2FY+VJa1DkVdvngQy4DDIAnIAUFh9GUUAQA10C1PeDKi6gOAxIiYWLQIwaC1BJWDq4DcSgMAHRRKSD
/wwAwdU4k+X8exAAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABcAAAAWCAYAAAArdgcFAAAABGdBTUEAALGPC/xhBQAABQNJREFUSEt1
+ lf1TVFUYx4HlvXhnCEZ22cvde9llL7Arr7uw7PIiSUCLAuYY42RWpEEEKkvQkiamWc0oKEojJOIACS7x
+ VqJE+JJMvoB/gdYPZiJoTmgOsJyec7x3Y4W+M+en8znf89znnO+5DoIcHR0dvL29vcJoOp9RrR7ikpLv
+ Uwrl7lCxONLV1dWZx4iAdfTx8fEOo2WFrDruJ2Wi9i4lj/x4VWgo6+LiIuKx/wSwrzI+6fPId3f8Ifvy
+ 9JzsiMUau7fpidr4xjhFyzKdnZ0dedTB19c3gEvUfKV43/Sn7OuOeabRYo3bc2RWlVtwMYyiUpayRLJI
+ 5SZFae0s1fYzknZcRbr+CVRz7TYqOP2jVZWzbsTPzy8Uc04gloveqijf/ZQ6dZGwhoFJZL5+Gxm/7bfG
+ ZOUOQKHBxFQQm6Troo/2ERiPtMFJVD/xG9owfAtxFZ/NBAQE5GAOvN0idBl94ccGbOyaoVto/+TvaP0P
+ E4grrZ2CLzMQU0HhWsMVKV8JHnTnOIq1XEcRXeOIMTfMQ+XFmANzd9rw6g1p+yUbKwMGsyxmTQfnoXIj
+ MRXEJCafphvPLgoLhIE/XV5mnvL391+LOTB3ZZMNPfTR7+04wraNIUVJ1T2oPJWYClLGqIxwmI+pk6N2
+ C+DArFxG9iAsCMIc7nmUevVGOEzb+djYL9oWOEPmGbh1AcRUECx+OTo+YWeCsXCmsHwXKqowobVbtyGF
+ Vj8mkUoTRSKR7QZAi3yiE5JqEvM3/FX0kYmwa7aUIIVGNyyWSFSwP08uEWwgMhgMl5ubm1FraysymUwI
+ jIr4aTtBm0SZmZkTLS0thK2oqEDQ62x+emVpNJqB9vZ2a09PDzKbzU/BPJefWia9Xj/a1dW1iNmqqqpZ
+ aEcaP7WygoODs1Uq1YhWq33MMEy9p6fnKn5qmUJCQoxqtfoXKGhGJpOZ3d3dX+Gn7IUjDW3xpdiITWxc
+ 0giXYpiio1QHod9qNzc3Fx4jwix8kT8VId8cEa+5okzW36O5mHqxJCzqxaeCCHz94T05pNheM00fOrMg
+ Oz5ojT/Q8kxdWDxJM2wOvBm2A4V+B0VpdE2KUvMM3dCzwBwfsMbv/+aZOn/jrxRNZyyLP6Pk3lKUf/qE
+ OjVGrpV+YALV3biDijovWFV5RWNQqRRzcBNEbHTMNnll/T9C/DMgzXtu3kHrTg1ZY7KN5+Bg7VvJanTd
+ 4cf6bXcWvxe7YUHhOYj/jvqHEH9ysGDuFpGaMRjePGRjsfleeCqMQxD/MvM0dCGdmAoK1+ovS/mq8cDx
+ V5299jzSnxzG8X8Tc2AO8c+6vjT+mFUDy3ReRUzVwbnl8U/QttGHu1eMv+KD2vvQ5yzMgTmO/3d0o8WO
+ IywkVvHezrtQeQoxFaSMjnktcsuH0+EnhomhMGQHTs5zaVlnoZpAzIG5E6dSr4en4hHVct6OZfadmON0
+ 6e1eXl5+xFQQBOClqNi40qS89Q+Kd1SjzbtqUN4725E8UXseIr0aPHmS3Cyv6LiESs3rBQ8xh0fO2yVI
+ Hq/ph7+RcilrE2zglJqaeqmhoQE1NTWhyspKHP9CftpOsIFTenr6TczhUVZWhmA9eTn/V5C2vo6ODmtv
+ by+qq6ubBXPyk1hJEP8L3d3dixaLBVVXV/8N5vY/iRcVGBioZ1l2EGL9SCKRmDw8PFaONCgoKChTLpeP
+ wnPxQCwWl0OSybk8l4PDv73tUDhtzBOBAAAAAElFTkSuQmCC
@@ -707,19 +753,18 @@
qAGjBoDwcDKAfGz8HwBjpzxi1K8aQAAAAABJRU5ErkJggg==
-
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA1SURBVDhPYzA2Nv5PAf5HHQMUlh0jCw8nAyjA/xgGHmBx
FimYCmEAYmALYWLwcDKAfGz8DwCbu89ShJIoHgAAAABJRU5ErkJggg==
-
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABPSURBVDhPYzA2Nv6PCzNAACM2ORim3AAjU7P/CsuOYWCw
- JJIB2NSA9A4HA3BJEmMAWA0RBuBXQw8DKPYCfgMGPhoH3gCQJC6MbAB2bPwfANSk4MTPe+PEAAAAAElF
- TkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA1SURBVDhPYzA2Nv5PAf5HHQMUlh0jCw8nAyjA/xgGHmBx
+ FimYCmEAYmALYWLwcDKAfGz8DwCbu89ShJIoHgAAAABJRU5ErkJggg==
@@ -757,6 +802,33 @@
OtaPeByaQwWDoYf85pgWNTuyeWkMFQ2G2GuOacVxfER/mLR+0zMG4Xq3p8AYf0YoiqITusqEjJcuGWEw
jJuFkwDeFXqMVKu4a9G8XC2CV1mW8d5KoUaPl6tFr3yPwHpn1Ojx8v5aD+BPgyzrHx2rPHVCHPT/AAAA
AElFTkSuQmCC
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABcAAAAWCAYAAAArdgcFAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAATgSURBVEhLfZXpU1NXGIcDtCr7vgSBLPfekI0sJSGLCQmb
+ ipDSUtCOZRwttCCWskoUJ8RWqh1HZ1oUlA6QsgzYFkPZWlFKcalMRYG/QNsP1oqgdYrWAcLpubknKSFM
+ n5nz6X3unbO8v3NoawkNDfVnYNhbuEg6wpVte8ziCY7HxcXxYek1ynDiERISEhCH43m4RPaTQC5/yOLy
+ j0ZHR3NgzYtS1hAYGBgkkCtO8vdX/0E3dy/h5622+BNnXohz9kyyWEQ6VDwok0bz9/cPFSQpz3BKav5k
+ nLUsE+esNpn5/KI4+53rsWy2BipO1w7O5+9llxxbZHX8DJg9t4F2cBrU3bkPdnT/aBPvensMzjQGqZ4c
+ gaiQV2h+yeq8bnf1QzPANHUfpFkGbeL0rCEfH58o5FLgSs0lrGnALpMjZXgGNEz/BnaPzgJh6acLYWFh
+ WUjdTGjSBtgXhpxuxsgsODXzO8j9YRrwi4/NwV3QI5eCqU6+xUQzIQfWOwkSrVMg/tIkYFQ2LgcFBRUg
+ dQuWvOMus+uG08WhQ7oc0j10mnRzkEtBJG3rxk51rDo+cAxy6dxi01xwcPBOpG7ibEvuw5q+d/HsbscE
+ IIpqH8GfJyOXgieR5PCLqp+zvh53+QA/22Pjp2YO+/r6RiDVUySVvssuMTrPx+mam1YE+rRvyQNHLkV4
+ eLifSJZUIzUYFvLKD4P8SiPYWXgQ8NTJE1uZTAVUnB0AVxGYkKSsU2Tv/iu/wmh3Mw4UA55SMxrNYEiQ
+ 5oaXXq+/2dLSAtrb24HRaASwS/JRbT1e6enp021tbXa3srISwBlnotrGKBSKoa6uLltfXx8wmUwv4f5l
+ o5IbOp1uvLW1dZV0a2trF2GXpKDSxkRFRWWKxeIxtVr9HMfxBm9v762o5AadTs+RSqW/qFSqBeia4LlE
+ opIbHmRKWXj8XjxRMcZP0s9hQslpBoMhhbXXKcWJR0BAQAiT4O6Ll6tuCdTqR2yhqCEmJiYB1tZfFTQa
+ KQuV6i94RXXzWEP7Cn5x2CY3t72S5hbMsAiCDJDzQCMjIyOEKm0zVnpkATvZt0JcHILuV6+khj2/stns
+ NKi4xp/gJ+znlFe/YHVO2NtKNzQN6u8+AJm912wiQ/4EXBUTqV4ckeggt7zhH0f802CaP7n3AGR0jtjE
+ mYYrsAlct5JQar9jXxh09ix5XxyHH+RdmQVEhfkpjL/jYDfHJ6cOs1tGnC758xPwqsgZmQbCMtM8nEgq
+ cikYKu1NJpo1Ocj4Sy7foSJd8SUZ6feQugXTb59aG3/SlUKX6L0N6LXmJbf44zJ1B/aZZeP4Hzr6GC51
+ O1I3ESrdN9g5q4tnd2FieR9WPIQhI6/d/+AJJbv4Bz6eZ7eO2n/oGIzPLctCXcZlPz+/MKR6CkTS3PgP
+ qp+x2q66uHRz6xJfm9IFtyUYuRSwA3yFiYkfKQ25Twqqj4B9h+uAoagUcOSqq/A1egNpdsgXS5Qor5K9
+ mfuU9MiR9X4x4MpVg7GxsQKkueGp0WhuNDY2gubmZlBVVUXGPw/V1uMJE3qP9MhRVlYGYDs7bs6NgWkb
+ 6OnpsfX394P6+vpFeDiOR8INrVZ7zWKxrFqtVlBTU/M33A7XR2I9sOV0HA5nGMb6GVyi8f8iHRERkc7l
+ cseFQuET6JavORcIjfYvnexL1bkYvbUAAAAASUVORK5CYII=
@@ -786,8 +858,8 @@
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPY6AmCADi6UCsAOaRCASA+DsQ/wfi5SAB+fn7
QWIkgedADDKgXX7p0QCFZcfeKyw90i+/6qQEWJYQEMtrFZfsXjYDqPE/Gv4ONmj5cfxeAzqZA4tmNHx0
PquU4iSg8vtAHAHWiAyAiq5jakLFLKKSIG+C8HmwJmQAVLAcXQMa3sehbTwLqBS7C+SXHSvAogkdY9oM
- A/JLjhhg0YDAiw/fB6mBKscOgArfo2n8DqaXHt1PVNoAKl6PpBmClx+fDoolqBL8QDipdKFIcc93iboZ
- F4CavwOdnAGVIhqAAgkUTe8J+hcHANkIStYNYB5tAQMDAI0i0y0nSBQpAAAAAElFTkSuQmCC
+ A/JLjhhg0YDAiw/fB6mBKscOgArfo2n8DqaXHt1PVNoAKl6PpBmClx+fDoolqBL8QDipdCF/fs93iboZ
+ F4CavwOdnAGVIhqAAgkUTe8J+hcHANkIStYNYB5tAQMDAIS/0yRNIYBJAAAAAElFTkSuQmCC
@@ -809,6 +881,27 @@
oIsLP5hByAAQALKvS/n6xgPFj0n7+uoBhRghMkAAUgxzLtjJvr6uyAaI+/srAPmPgExGST+/PKBrTgG9
/AzorSKQPE4XwAwFsncC5R2gUmAg5usrDjJUwstLnigvgICsn5+UTEgIJ5hjb88ClL9OkgGSAQE2QPFD
QPFdQPoYMDbKoFIjHDAwAADxiVgRxHrZ4gAAAABJRU5ErkJggg==
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABcAAAAWCAYAAAArdgcFAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANWSURBVEhLYyATMAIxExAzI2GQGMUAZAgbAw+PCAOnkAwY
+ c3FJAMW4oHJkA5BmIRYRCXsOHeNyLkuXXm4r125OA4tmZgkZD6AcH1QNyQBsMLuKTga/V+Qp/oC4G7xu
+ wQd5nAN3CgQlnefxitzJpqQRBFTDC1VLNACFLwurjGIUv3/caS6XwKNcFi6ref1i1/D7Ri/iNnOYxecW
+ eoDPI3QDi6iUFVAtyHASLGDnU+ZxDV4qEJhwksvCdY1IRvVDqfr2fyAsnFh+hcfWbTmvc9A6VlXdSKBq
+ kGNAmCjAw6lv3iCaUvaR3z9hC4+Dz3Kxgrb3EnX1vyTSpv8Wzai5yevgt4rHxnslq7JOGFA9UYaDFLAy
+ S8n5CIQmnxCvmvhfKDrnIqeJ/RyBgIR9YqUdT8QKWp7y+UUf5rbzWs/nFryRTV41EKoPr+GgMGNiYONV
+ 43HwXgZ06X/xst7/YvGdv/n9Y49zGtnM5bZ1n8lt6TaHy9xxNb93zHEuM6dJQPWqUL04wxwmKcChY1LJ
+ n1T6XKyk/p9Ycf0/kAXi5X3/+VOqngv4J54SCE46xR+VfY3LynkKA4+wBlAPyMU4DQYBUI7jYpOUCeD3
+ TTgpFt72F4yLOv6LFXf+FysFWlJR/48/v/+7QGLJTU5ds3YGNjY1oB6CBkNczcWlz2XjsRaYKv6I5jb9
+ F81r/g8KGrFCiA94cpu+8npH7WWWkPcEqodlf7wGgwDIdmEOdYMq/rDsZ6JBaX9Fsur/ieY0/hcNbf4r
+ mg90cXLZcx4bj5XMwsKOQLUwQ4kymJVVXCaCzyvyiohv4l8wzqj5LxKY9lcouu4Hb2TWIw4to1oGbm5x
+ oFqiDEUAYGxzmjksFoqP/y2cUvEfiP+J+CX9FQamcT73iIPAXJoCVCUGxKCgwJvc0AEPu7p+E5dX/Gdh
+ z+i/wh5AnFz2Tygm9x2XtfsKFiEhC6g6ghGHDEAK2ZnFpPy4XYOOC7lG/BWKK/wDcr2AX+xddm3DHmAw
+ 6ECUkhYUMMUSHAYWswQdAoEGx//micz5yusachEYDMlAOW4kdWQBAQ51/Wp+79gbAkGJN7ktnTcyC4v5
+ A8U5gZikYMAOODmlgEHjwiwh7cnAwSEHFaXIxdgAzECqG0qlCpeBAQBDdeSoK4YgVwAAAABJRU5ErkJg
+ gg==
diff --git a/open3mod/MainWindow_Input.cs b/open3mod/MainWindow_Input.cs
index b1963cd..8e41c05 100644
--- a/open3mod/MainWindow_Input.cs
+++ b/open3mod/MainWindow_Input.cs
@@ -37,6 +37,9 @@ public partial class MainWindow
private bool _backPressed;
private bool _upPressed;
private bool _downPressed;
+ private bool _fovyUpPressed;
+ private bool _fovyDownPressed;
+ private bool _shiftPressed;
private int _previousMousePosX = -1;
private int _previousMousePosY = -1;
@@ -56,6 +59,7 @@ private void ProcessKeys()
float x = 0.0f, y = 0.0f, z = 0.0f;
var changed = false;
+ var changedz = false;
if (_forwardPressed)
{
@@ -90,14 +94,41 @@ private void ProcessKeys()
y -= dt;
}
- if (!changed)
+ if (changed) cam.MovementKey(x, y, z);
+
+ float step = 1.005f;
+ if (_shiftPressed) step = 1.05f;
+
+
+ if ((cam.GetScenePartMode() == ScenePartMode.Camera) || (cam.GetScenePartMode() == ScenePartMode.Composite))
+ {
+ cam = _renderer.renderingController;
+ }
+
+ float fov = cam.GetFOV();
+
+ if (_fovyUpPressed)
+ {
+ changedz = true;
+ fov = fov * step;
+ }
+ if (_fovyDownPressed)
+ {
+ changedz = true;
+ fov = fov / step;
+ }
+
+ if (!changedz)
{
return;
}
- cam.MovementKey(x, y, z);
- }
+ if (fov > MathHelper.PiOver2) fov = MathHelper.PiOver2;
+ ScenePartMode spm = cam.GetScenePartMode();
+ CameraMode cm = cam.GetCameraMode();
+ cam.SetParam(fov, spm, cm);
+ }
private void UpdateActiveViewIfNeeded(MouseEventArgs e)
{
@@ -117,8 +148,8 @@ private void UpdateActiveViewIfNeeded(MouseEventArgs e)
/// viewport. If not, the ViewIndex of the tab that was hit.
private Tab.ViewIndex MousePosToViewportIndex(int x, int y)
{
- var xf = x / (float)glControl1.ClientSize.Width;
- var yf = 1.0f - y / (float)glControl1.ClientSize.Height;
+ var xf = x / (float)renderControl1.ClientSize.Width;
+ var yf = 1.0f - y / (float)renderControl1.ClientSize.Height;
return _ui.ActiveTab.GetViewportIndexHit(xf, yf);
}
@@ -148,8 +179,8 @@ private void SetViewportSplitV(float f)
/// viewport separator. If not, the separator that was hit.
private Tab.ViewSeparator MousePosToViewportSeparator(int x, int y)
{
- var xf = x / (float)glControl1.ClientSize.Width;
- var yf = 1.0f - y / (float)glControl1.ClientSize.Height;
+ var xf = x / (float)renderControl1.ClientSize.Width;
+ var yf = 1.0f - y / (float)renderControl1.ClientSize.Height;
return _ui.ActiveTab.GetViewportSeparatorHit(xf, yf);
}
@@ -176,7 +207,7 @@ partial void OnMouseDown(object sender, MouseEventArgs e)
_previousMousePosX = e.X;
_previousMousePosY = e.Y;
- if(e.Button == MouseButtons.Middle)
+ if (e.Button == MouseButtons.Middle)
{
_mouseWheelDown = true;
return;
@@ -202,6 +233,8 @@ partial void OnMouseDown(object sender, MouseEventArgs e)
SetViewportDragCursor(sep);
}
+ CoreSettings.CoreSettings.Default.ViewsStatus = _ui.ActiveTab.getViewsStatusString();
+
// hack: the renderer handles the input for the HUD, so forward the event
var index = MousePosToViewportIndex(e.X, e.Y);
if (index == Tab.ViewIndex._Max)
@@ -271,16 +304,16 @@ partial void OnMouseMove(object sender, MouseEventArgs e)
{
if (sep == Tab.ViewSeparator.Horizontal)
{
- SetViewportSplitV(1.0f - e.Y / (float)glControl1.ClientSize.Height);
+ SetViewportSplitV(1.0f - e.Y / (float)renderControl1.ClientSize.Height);
}
else if (sep == Tab.ViewSeparator.Vertical)
{
- SetViewportSplitH(e.X / (float)glControl1.ClientSize.Width);
+ SetViewportSplitH(e.X / (float)renderControl1.ClientSize.Width);
}
else if (sep == Tab.ViewSeparator.Both)
{
- SetViewportSplitV(1.0f - e.Y / (float)glControl1.ClientSize.Height);
- SetViewportSplitH(e.X / (float)glControl1.ClientSize.Width);
+ SetViewportSplitV(1.0f - e.Y / (float)renderControl1.ClientSize.Height);
+ SetViewportSplitH(e.X / (float)renderControl1.ClientSize.Width);
}
else
{
@@ -305,7 +338,7 @@ partial void OnMouseMove(object sender, MouseEventArgs e)
}
var view = UiState.ActiveTab.ActiveViews[(int)index];
Debug.Assert(view != null);
- _renderer.OnMouseMove(e, view.Bounds, index);
+ if (_renderer != null) _renderer.OnMouseMove(e, view.Bounds, index);
if (!_mouseDown && !_mouseRightDown)
{
@@ -382,40 +415,135 @@ partial void OnPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
partial void OnKeyDown(object sender, KeyEventArgs e)
{
+ int index = tabControl1.SelectedIndex;
switch (e.KeyData)
{
+ case Keys.PageUp:
+ case Keys.Left:
+ index--;
+ if (index == -1) index = tabControl1.TabPages.Count-1;
+ SelectTab(tabControl1.TabPages[index]);
+ break;
+
+ case Keys.Next:
+ case Keys.Right:
+ index++;
+ if (index == tabControl1.TabPages.Count) index = 0;
+ SelectTab(tabControl1.TabPages[index]);
+ break;
+
+ case Keys.F5:
+ case Keys.Escape:
+ UiForTab(_ui.ActiveTab).GetInspector().Animations.OnPlay(sender, e);
+ break;
+
+ case Keys.OemPeriod:
+ UiForTab(_ui.ActiveTab).GetInspector().Animations.SetTime(0);
+ break;
+
case Keys.W:
- case Keys.Up:
_forwardPressed = true;
break;
case Keys.A:
- case Keys.Left:
_leftPressed = true;
break;
case Keys.S:
- case Keys.Down:
_backPressed = true;
break;
case Keys.D:
- case Keys.Right:
_rightPressed = true;
break;
- case Keys.PageUp:
+ case Keys.Up:
_upPressed = true;
break;
- case Keys.PageDown:
+ case Keys.Down:
_downPressed = true;
break;
+ case Keys.NumPad9:
+ _fovyUpPressed = true;
+ break;
+
+ case Keys.NumPad3:
+ _fovyDownPressed = true;
+ break;
+
+ case Keys.NumPad4:
+ case Keys.NumPad5:
+ case Keys.NumPad6:
+ _shiftPressed = true;
+ break;
+
case Keys.R:
- // reset camera immediately
+ // reset camera immediatelly
UiState.ActiveTab.ResetActiveCameraController();
break;
+
+ case Keys.O:
+ //reset offset
+ OpenVRInterface.viewOffset = Matrix4.Identity;
+ break;
+
+ case Keys.Subtract:
+ timeOffset = timeOffset + 5; ;
+ if (timeOffset >= mainTiming) timeOffset = 0;
+ break;
+
+ case Keys.Add:
+ timeOffset = timeOffset - 5;
+ if (timeOffset < 0) timeOffset = mainTiming - 5;
+ break;
+
+ case Keys.E:
+ // switch backend
+ if (_settings == null || _settings.IsDisposed) _settings = new SettingsDialog { Main = this };
+ _settings.ChangeRenderingBackend();
+ break;
+ case Keys.V:
+ // reset NDI streams
+ if (useIO) _renderer.FlushNDI();
+ break;
+ case Keys.T:
+ // skips one frame
+ _renderer.skipFrames = 1;
+ break;
+ case Keys.B:
+ if (_renderer.renderIO) UiState.ActiveTab.ActiveCameraController.SetScenePartMode(ScenePartMode.Background);
+ break;
+ case Keys.F:
+ if (_renderer.renderIO) UiState.ActiveTab.ActiveCameraController.SetScenePartMode(ScenePartMode.Foreground);
+ break;
+ case Keys.X:
+ if (_renderer.renderIO) UiState.ActiveTab.ActiveCameraController.SetScenePartMode(ScenePartMode.Others);
+ break;
+ case Keys.C:
+ if (_renderer.renderIO) UiState.ActiveTab.ActiveCameraController.SetScenePartMode(ScenePartMode.Camera);
+ break;
+ case Keys.L:
+ UiState.ActiveTab.ActiveCameraController.SetScenePartMode(ScenePartMode.All);
+ break;
+ case Keys.J:
+ if (_renderer.renderIO) UiState.ActiveTab.ActiveCameraController.SetScenePartMode(ScenePartMode.CameraCancelColor);
+ break;
+ case Keys.M:
+ if (_renderer.renderIO) UiState.ActiveTab.ActiveCameraController.SetScenePartMode(ScenePartMode.Composite);
+ break;
+ case Keys.K:
+ if (_renderer.renderIO) UiState.ActiveTab.ActiveCameraController.SetScenePartMode(ScenePartMode.Keying);
+ break;
+ case Keys.G:
+ if (_renderer.renderIO) UiState.ActiveTab.ActiveCameraController.SetScenePartMode(ScenePartMode.GreenScreen);
+ break;
+
+ case Keys.Enter:
+ _renderer.activeCamera = 3-_renderer.activeCamera;
+ break;
+
}
}
@@ -451,6 +579,22 @@ partial void OnKeyUp(object sender, KeyEventArgs keyEventArgs)
case Keys.PageDown:
_downPressed = false;
break;
+
+ case Keys.NumPad9:
+ _fovyUpPressed = false;
+ break;
+
+ case Keys.NumPad3:
+ _fovyDownPressed = false;
+ break;
+
+ case Keys.NumPad4:
+ case Keys.NumPad5:
+ case Keys.NumPad6:
+ _shiftPressed = false;
+ break;
+
+
}
}
}
diff --git a/open3mod/MaterialInspectionView.cs b/open3mod/MaterialInspectionView.cs
index 80c8dd0..15c5718 100644
--- a/open3mod/MaterialInspectionView.cs
+++ b/open3mod/MaterialInspectionView.cs
@@ -28,15 +28,15 @@ namespace open3mod
public class MaterialInspectionView : ThumbnailViewBase
{
private readonly Scene _scene;
- private readonly MainWindow _window;
+ private readonly MainWindow _mainWindow;
private delegate void SetLabelTextDelegate(string name, Texture tex);
- public MaterialInspectionView(Scene scene, MainWindow window, FlowLayoutPanel flow)
+ public MaterialInspectionView(Scene scene, MainWindow mainWindow, FlowLayoutPanel flow)
: base(flow)
{
_scene = scene;
- _window = window;
+ _mainWindow = mainWindow;
foreach (var mat in scene.Raw.Materials)
{
@@ -58,9 +58,9 @@ public Scene Scene
}
- public MainWindow Window
+ public MainWindow MainWindow
{
- get { return _window; }
+ get { return _mainWindow; }
}
diff --git a/open3mod/MaterialMapper.cs b/open3mod/MaterialMapper.cs
index 201d97a..7c86144 100644
--- a/open3mod/MaterialMapper.cs
+++ b/open3mod/MaterialMapper.cs
@@ -21,6 +21,7 @@
using System;
using System.Diagnostics;
using Assimp;
+using OpenTK;
namespace open3mod
{
@@ -127,12 +128,14 @@ private static bool IsTransparent(float f)
/// TODO tangents, bitangents?
///
/// Material to be applied, must be non-null
- public abstract void ApplyMaterial(Mesh mesh, Material mat, bool textured, bool shaded);
- public abstract void ApplyGhostMaterial(Mesh mesh, Material material, bool shaded);
+ public abstract void ApplyMaterial(Mesh mesh, Material mat, bool textured, bool shaded, bool twoSided);
+ public abstract void ApplyGhostMaterial(Mesh mesh, Material material, bool shaded, bool twoSided);
- public abstract void BeginScene(Renderer renderer);
+ public abstract void BeginScene(Renderer renderer, bool useSceneLights);
public abstract void EndScene(Renderer renderer);
-
+
+ public abstract void SetMatrices(Matrix4 world, Matrix4 view, Matrix4 perspective);
+ public abstract void SetWorld(Matrix4 world);
///
/// Uploads all the textures required for a given material to VRAM (i.e.
@@ -142,6 +145,35 @@ private static bool IsTransparent(float f)
///
/// Whether there were any new texture uploads
public bool UploadTextures(Material material)
+ {
+ Debug.Assert(material != null);
+ // note: keep this up to date with the code in MaterialMapperBOTH_GL.Apply(Fixed)FunctionMaterial
+ var any = false;
+ for (int i = 0; i < Renderer.usedModernGLTextureTypeCount; i++)
+ {
+ TextureType currTextureType = (TextureType)((int)TextureType.Diffuse + i);
+ if (material.GetMaterialTextureCount(currTextureType) > 0)
+ {
+ TextureSlot tex;
+ material.GetMaterialTexture(currTextureType, 0, out tex);
+
+ var gtex = _scene.TextureSet.GetOriginalOrReplacement(tex.FilePath);
+
+ if (gtex.State == Texture.TextureState.WinFormsImageCreated)
+ {
+ gtex.Upload();
+ any = true;
+ }
+ else if (gtex.ReconfigureUploadedTextureRequested)
+ {
+ gtex.ReconfigureUploadedTexture();
+ }
+ }
+ }
+ return any;
+ }
+
+ public bool UploadDynamicTextures(Material material)
{
Debug.Assert(material != null);
var any = false;
@@ -154,9 +186,9 @@ public bool UploadTextures(Material material)
var gtex = _scene.TextureSet.GetOriginalOrReplacement(tex.FilePath);
- if (gtex.State == Texture.TextureState.WinFormsImageCreated)
+ if ((gtex.State == Texture.TextureState.WinFormsImageCreated) && gtex.Dynamic)
{
- gtex.Upload();
+ gtex.Upload();
any = true;
}
else if (gtex.ReconfigureUploadedTextureRequested)
@@ -166,7 +198,48 @@ public bool UploadTextures(Material material)
}
return any;
}
+
+ public int LightCount()
+ {
+ return _scene.Raw.LightCount;
+ }
+
+ public Light[] GenerateLights()
+ {
+ Light[] Lights = new Light[_scene.Raw.LightCount];
+ for (var j = 0; j < _scene.Raw.LightCount; ++j)
+ {
+ Lights[j] = _scene.Raw.Lights[j];
+ }
+ return Lights;
+ }
+
+ public Node[] GenerateLightNodes()
+ {
+ Node[] _LightNodes = new Node[_scene.Raw.LightCount];
+ FindLightNodes(_scene.Raw.RootNode, ref _LightNodes);
+ return _LightNodes;
+ }
+
+ public void FindLightNodes(Node node, ref Node[] _LightNodes)
+ {
+ for (var i = 0; i < _scene.Raw.LightCount; ++i)
+ {
+ if (_scene.Raw.Lights[i].Name == node.Name)
+ {
+ _LightNodes[i] = node;
+ break;
+ }
+ if (node.Children != null)
+ {
+ foreach (var c in node.Children)
+ {
+ FindLightNodes(c, ref _LightNodes);
+ }
+ }
+ }
+ }
}
}
-/* vi: set shiftwidth=4 tabstop=4: */
\ No newline at end of file
+/* vi: set shiftwidth=4 tabstop=4: */
diff --git a/open3mod/MaterialMapperClassicGl.cs b/open3mod/MaterialMapperClassicGl.cs
index 4de973f..7c2bbaa 100644
--- a/open3mod/MaterialMapperClassicGl.cs
+++ b/open3mod/MaterialMapperClassicGl.cs
@@ -32,6 +32,12 @@ internal MaterialMapperClassicGl(Scene scene)
: base(scene)
{ }
+ public override void SetMatrices(Matrix4 world, Matrix4 view, Matrix4 perspective)
+ {
+ }
+ public override void SetWorld(Matrix4 world)
+ {
+ }
public override void Dispose()
@@ -41,37 +47,158 @@ public override void Dispose()
- public override void ApplyMaterial(Mesh mesh, Material mat, bool textured, bool shaded)
+ public override void ApplyMaterial(Mesh mesh, Material mat, bool textured, bool shaded, bool twoSided)
{
ApplyFixedFunctionMaterial(mesh, mat, textured, shaded);
}
- public override void ApplyGhostMaterial(Mesh mesh, Material material, bool shaded)
+ public override void ApplyGhostMaterial(Mesh mesh, Material material, bool shaded, bool twoSided)
{
ApplyFixedFunctionGhostMaterial(mesh, material, shaded);
}
- public override void BeginScene(Renderer renderer)
+ private float[] Colo3DToFloat(Color3D col)
+ {
+ float[] floatType = { col.B, col.G, col.R, 1};
+ return floatType;
+ }
+ private float[] Vector3ToFloat(Vector3 col)
+ {
+ float[] floatType = { col.X, col.Y, col.Z, 1 };
+ return floatType;
+ }
+ private float[] Vector3DToFloat(Vector3D col)
{
- // set fixed-function lighting parameters
- GL.ShadeModel(ShadingModel.Smooth);
- GL.LightModel(LightModelParameter.LightModelAmbient, new[] { 0.3f, 0.3f, 0.3f, 1 });
- GL.Enable(EnableCap.Lighting);
- GL.Enable(EnableCap.Light0);
-
- // light direction
- var dir = new Vector3(1, 1, 0);
- var mat = renderer.LightRotation;
- Vector3.TransformNormal(ref dir, ref mat, out dir);
- GL.Light(LightName.Light0, LightParameter.Position, new float[] { dir.X, dir.Y, dir.Z, 0 });
-
- // light color
- var col = new Vector3(1, 1, 1);
- col *= (0.25f + 1.5f * GraphicsSettings.Default.OutputBrightness / 100.0f) * 1.5f;
-
- GL.Light(LightName.Light0, LightParameter.Diffuse, new float[] { col.X, col.Y, col.Z, 1 });
- GL.Light(LightName.Light0, LightParameter.Specular, new float[] { col.X, col.Y, col.Z, 1 });
+ float[] floatType = { col.X, col.Y, col.Z, 1 };
+ return floatType;
+ }
+
+ public override void BeginScene(Renderer renderer, bool useSceneLights = true)
+ {
+ /* GL.GetInteger(GL_MAX_LIGHTS)
+ glGetIntegerv along with GL_MAX_LIGHTS.*/
+ int GLMaxLights = 8;
+ for (var i = 0; i < GLMaxLights; ++i)
+ {
+ GL.Disable(EnableCap.Light0 + i);
+ }
+ if (useSceneLights)
+ {
+ GL.ShadeModel(ShadingModel.Smooth);
+ GL.LightModel(LightModelParameter.LightModelAmbient, new[] { 0.03f, 0.03f, 0.03f, 1 }); //nastav zkladn osvtlen
+ GL.LightModel(LightModelParameter.LightModelLocalViewer, 1.0f);
+ GL.LightModel(LightModelParameter.LightModelTwoSide, 1.0f);
+ GL.Enable(EnableCap.Lighting);
+ var lightNodes = GenerateLightNodes();
+ Light[] lights = GenerateLights();
+ for (var i = 0; i < LightCount(); ++i)
+ {
+ if (i < 8)// GL.Light.)
+ {
+ Node node = lightNodes[i];
+ if ((node != null) && ((node == _scene.ActiveLight) || (null == _scene.ActiveLight)))
+ {
+ // var matrix4X4 = node.Transform;
+ var mat1 = Matrix4x4.Identity;
+ var cur = node;
+ while (cur != null)
+ {
+ var trafo = cur.Transform;
+ trafo.Transpose();
+ mat1 = trafo * mat1;
+ cur = cur.Parent;
+ }
+ mat1.Transpose();
+
+ var mat = renderer.LightRotation;
+ var light_type = lights[i].LightType;
+ Vector3 lposTemp = new Vector3(mat1.A4, mat1.B4, mat1.C4);
+ Vector3 ldirTemp = new Vector3(mat1.B1, -mat1.B2, mat1.B3); //partially a guess, needed verification
+ float[] light_position = { -0f, 0f, -2f, 1.0f }; //X doprava, Y nahoru, - Z vped
+ light_position = Vector3ToFloat(lposTemp);
+ if (light_type == LightSourceType.Directional)
+ {
+ // Vector3.TransformNormal(ref ldirTemp, ref mat, out ldirTemp); //only if we want to change dir lights
+ light_position = Vector3ToFloat(-ldirTemp);
+ light_position[3] = 0.0f;
+ //If the w component of the position is 0, the light is treated as a directional source with no actual position
+ }
+
+ float[] light_ambient = { 0.0f, 0.0f, 0.0f, 1.0f }; // na tohle v zasade reaguji nektere predmety, rozsah 0-1
+ light_ambient = Colo3DToFloat(lights[i].ColorAmbient);
+ float[] light_diffuse = { 0.2f, 0.2f, 0.2f, 1.0f };//jak moc svt
+ light_diffuse = Colo3DToFloat(lights[i].ColorDiffuse); // 100); //v Assimp je v %
+ float[] light_specular = { 1f, 1f, 1f, 1.0f };//not saved in dae, we assume 1
+ light_specular = Colo3DToFloat(lights[i].ColorSpecular / 100*2);// / 100);
+ //diffuse+specular are just like two lights
+
+ var coltmp = new Vector3D(light_diffuse[0], light_diffuse[1], light_diffuse[2]);
+ coltmp *= (0.0f + 2f * GraphicsSettings.Default.OutputBrightness / 100.0f) * 2f;
+ if (light_type != LightSourceType.Point) coltmp *= 0.01f;
+ light_diffuse = Vector3DToFloat(coltmp);
+
+ float light_aic = lights[i].AngleInnerCone;
+ float light_aoc = lights[i].AngleOuterCone;
+ float light_ac = lights[i].AttenuationConstant * _scene.Scale;
+ float light_al = lights[i].AttenuationLinear * _scene.Scale;
+ float light_aq = lights[i].AttenuationQuadratic * _scene.Scale *_scene.Scale;
+
+ //float[] spot_direction = { 0, 0, -1 };//(0,-1,0)directly down
+ float[] spot_direction = Vector3DToFloat(lights[i].Direction); //makes sense only when cutoff is set
+ float light_cutoff = 180;
+ if (light_type == LightSourceType.Spot)
+ {
+ //Vector3.TransformNormal(ref ldirTemp, ref mat, out ldirTemp); //only if we want to change spot lights direction
+ spot_direction = Vector3ToFloat(ldirTemp);
+ light_cutoff = light_aic * 180 / MathHelper.Pi;
+ }
+ float lessAttenuation = _scene.Scale;
+ light_ac = light_ac / lessAttenuation; //lesser attenuation for testing
+ light_al = light_al / lessAttenuation;
+ light_aq = light_aq / lessAttenuation;
+ float spot_exp = 0.5f; //genarate from light_aoc?,1f = uniform,
+
+ GL.Light(LightName.Light0 + i, LightParameter.Position, light_position);
+ GL.Light(LightName.Light0 + i, LightParameter.Ambient, light_ambient);
+ GL.Light(LightName.Light0 + i, LightParameter.Diffuse, light_diffuse);
+ GL.Light(LightName.Light0 + i, LightParameter.Specular, light_specular);
+
+ GL.Light(LightName.Light0 + i, LightParameter.ConstantAttenuation, light_ac); //intenzita odlesku a osvcen
+ GL.Light(LightName.Light0 + i, LightParameter.QuadraticAttenuation, light_aq);
+ GL.Light(LightName.Light0 + i, LightParameter.LinearAttenuation, light_al);
+
+ GL.Light(LightName.Light0 + i, LightParameter.SpotCutoff, light_cutoff); //180-unidirectional, 0-90 - directional
+ GL.Light(LightName.Light0 + i, LightParameter.SpotDirection, spot_direction); //direction if not infinity
+ GL.Light(LightName.Light0 + i, LightParameter.SpotExponent, spot_exp);
+
+ GL.Enable(EnableCap.Light0 + i);
+ }
+ }
+ }
+ }
+ else
+ {
+ // set fixed-function lighting parameters
+ GL.ShadeModel(ShadingModel.Smooth);
+ GL.LightModel(LightModelParameter.LightModelAmbient, new[] { 0.53f, 0.03f, 0.03f, 1 }); //zkladn osvtlen
+ GL.LightModel(LightModelParameter.LightModelLocalViewer, 1.0f);
+ GL.LightModel(LightModelParameter.LightModelTwoSide, 1.0f);
+ GL.Enable(EnableCap.Lighting);
+
+ // light direction
+ var dir = new Vector3(1, 0, 1);
+ var mat = renderer.LightRotation;
+ Vector3.TransformNormal(ref dir, ref mat, out dir);
+ GL.Light(LightName.Light0, LightParameter.Position, new float[] { dir.X, dir.Y, dir.Z, 0 });
+
+ // light color
+ var col = new Vector3(1, 1, 1);
+ col *= (0.25f + 1.5f * GraphicsSettings.Default.OutputBrightness / 100.0f) * 1.5f;
+ GL.Light(LightName.Light0, LightParameter.Diffuse, new float[] { col.X, col.Y, col.Z, 1 });
+ GL.Light(LightName.Light0, LightParameter.Specular, new float[] { col.X, col.Y, col.Z, 1 });
+ GL.Enable(EnableCap.Light0);
+ }
}
public override void EndScene(Renderer renderer)
@@ -108,33 +235,30 @@ private void ApplyFixedFunctionMaterial(Mesh mesh, Material mat, bool textured,
var hasTexture = false;
// note: keep this up-to-date with the code in UploadTextures()
- if (textured && mat.GetMaterialTextureCount(TextureType.Diffuse) > 0)
+ for (int i = 0; i < Renderer.classicGLUsedTextureTypeCount; i++)
{
- hasTexture = true;
-
- TextureSlot tex;
- mat.GetMaterialTexture(TextureType.Diffuse, 0, out tex);
- var gtex = _scene.TextureSet.GetOriginalOrReplacement(tex.FilePath);
-
- hasAlpha = hasAlpha || gtex.HasAlpha == Texture.AlphaState.HasAlpha;
-
- if(gtex.State == Texture.TextureState.GlTextureCreated)
+ TextureType currTextureType = (TextureType)((int)TextureType.Diffuse + i);
+ if (textured && mat.GetMaterialTextureCount(currTextureType) > 0)
{
- GL.ActiveTexture(TextureUnit.Texture0);
- gtex.BindGlTexture();
-
- GL.Enable(EnableCap.Texture2D);
+ hasTexture = true;
+ TextureSlot tex;
+ mat.GetMaterialTexture(currTextureType, 0, out tex);
+ var gtex = _scene.TextureSet.GetOriginalOrReplacement(tex.FilePath);
+ hasAlpha = hasAlpha || gtex.HasAlpha == Texture.AlphaState.HasAlpha;
+
+ if (gtex.State == Texture.TextureState.GlTextureCreated)
+ {
+ GL.ActiveTexture(TextureUnit.Texture0);
+ gtex.BindGlTexture();
+
+ GL.Enable(EnableCap.Texture2D);
+ }
}
else
{
GL.Disable(EnableCap.Texture2D);
}
}
- else
- {
- GL.Disable(EnableCap.Texture2D);
- }
-
GL.Enable(EnableCap.Normalize);
var alpha = 1.0f;
@@ -207,7 +331,7 @@ private void ApplyFixedFunctionMaterial(Mesh mesh, Material mat, bool textured,
strength = mat.ShininessStrength;
}
- var exp = shininess*strength;
+ var exp = shininess;
if (exp >= 128.0f) // 128 is the maximum exponent as per the Gl spec
{
exp = 128.0f;
@@ -223,7 +347,7 @@ private void ApplyFixedFunctionMaterial(Mesh mesh, Material mat, bool textured,
if (hasAlpha)
{
GL.Enable(EnableCap.Blend);
- GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
+ GL.BlendFuncSeparate(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha, BlendingFactorSrc.SrcAlpha, BlendingFactorDest.One);
GL.DepthMask(false);
}
else
@@ -237,7 +361,7 @@ private void ApplyFixedFunctionMaterial(Mesh mesh, Material mat, bool textured,
private void ApplyFixedFunctionGhostMaterial(Mesh mesh, Material mat, bool shaded)
{
GL.Enable(EnableCap.Blend);
- GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
+ GL.BlendFuncSeparate(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha, BlendingFactorSrc.SrcAlpha, BlendingFactorDest.One);
GL.DepthMask(false);
var color = new Color4(.6f, .6f, .9f, 0.15f);
diff --git a/open3mod/MaterialMapperModernGl.cs b/open3mod/MaterialMapperModernGl.cs
index 1754377..0eae417 100644
--- a/open3mod/MaterialMapperModernGl.cs
+++ b/open3mod/MaterialMapperModernGl.cs
@@ -20,20 +20,51 @@
using System;
using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
using Assimp;
+using OpenTK;
using System.Diagnostics;
+using OpenTK.Graphics;
+using OpenTK.Graphics.OpenGL;
namespace open3mod
{
+ public struct GLLight
+ {
+ public int lightType;
+ public Vector3 position;
+ public Vector3 direction;
+ public float cutOff;
+ public float outerCutOff;
+
+ public float constant;
+ public float linear;
+ public float quadratic;
+
+ public Vector3 ambient;
+ public Vector3 diffuse;
+ public Vector3 specular;
+ // public const size = 21 *4 byte = (1 + 3 + 3 + 1 + 1 + 1 + 1 + 1 + 3 + 3 + 3 + 1)*4;
+ };
+
public sealed class MaterialMapperModernGl : MaterialMapper
{
internal MaterialMapperModernGl(Scene scene)
: base(scene)
- { }
+ {
+ }
private readonly ShaderGen _shaderGen = new ShaderGen();
-
+ private Matrix4 _World;
+ private Matrix4 _View;
+ private Matrix4 _Perspective;
+ private int _LightCount;
+ private GLLight[] _GLLights;
+ private float _SceneBrightness = 1.0f;
+ private bool _UseSceneLights = false;
#if DEBUG
~MaterialMapperModernGl()
@@ -46,37 +77,280 @@ public override void Dispose()
{
_shaderGen.Dispose();
GC.SuppressFinalize(this);
+ RenderControl.GLError("MaterialNewDispose");
+
+ }
+
+ public override void SetMatrices(Matrix4 world, Matrix4 view, Matrix4 perspective)
+ {
+ _World = world;
+ _View = view;
+ _Perspective = perspective;
+
+ }
+
+ public override void SetWorld(Matrix4 world)
+ {
+ _World = world;
}
- public override void ApplyMaterial(Mesh mesh, Material mat, bool textured, bool shaded)
+ public override void ApplyMaterial(Mesh mesh, Material mat, bool textured, bool shaded, bool twoSided)
{
+ RenderControl.GLError("StartMaterialMapper");
ShaderGen.GenFlags flags = 0;
- if (textured)
+ var hasAlpha = false;
+ var hasTexture = false;
+
+ // note: keep this up-to-date with the code in MaterialMapper.UploadTextures()
+ for (int i = 0; i < Renderer.modernGLUsedTextureTypeCount; i++)
{
- flags |= ShaderGen.GenFlags.ColorMap;
+ TextureType currTextureType = (TextureType)((int)TextureType.Diffuse + i);
+ GL.ActiveTexture((TextureUnit)((int)TextureUnit.Texture0 + i));
+ GL.BindTexture(TextureTarget.Texture2D, Renderer.modernGLTextureType[i]); //we use own texture always, even when textures off to supply preset values
+ if (textured && mat.GetMaterialTextureCount(currTextureType) > 0)
+ {
+ hasTexture = true;
+ //flags |= ShaderGen.GenFlags.Texture; flag not used, we always have some texture
+ TextureSlot tex;
+ mat.GetMaterialTexture(currTextureType, 0, out tex);
+ var gtex = _scene.TextureSet.GetOriginalOrReplacement(tex.FilePath);
+ hasAlpha = hasAlpha || gtex.HasAlpha == Texture.AlphaState.HasAlpha;
+ if (gtex.State == Texture.TextureState.GlTextureCreated)
+ {
+ gtex.BindGlTexture();
+ }
+ }
}
+ GL.ActiveTexture(TextureUnit.Texture0);
+ RenderControl.GLError("EndTextureSettings");
if (shaded)
{
flags |= ShaderGen.GenFlags.Lighting;
}
- Shader shader = _shaderGen.GenerateOrGetFromCache(flags);
+ var hasColors = mesh != null && mesh.HasVertexColors(0);
+ if (hasColors)
+ {
+ flags |= ShaderGen.GenFlags.VertexColor;
+ }
+ if (_UseSceneLights)
+ {
+ flags |= ShaderGen.GenFlags.PhongSpecularShading;
+ }
+ if ((mat.IsTwoSided)||(twoSided))
+ {
+ flags |= ShaderGen.GenFlags.TwoSide;
+ }
+ Shader shader = _shaderGen.GenerateOrGetFromCache(flags, _LightCount > 0 ? _LightCount : 1 );
shader.BindIfNecessary();
- }
+ Matrix4 curView = Matrix4.CreateScale(_scene.Scale) * _View;
+ shader.SetMat4("WorldViewProjection", _World * curView * _Perspective);
+ Matrix4 cameraPos = _View.ClearRotation();
+ Matrix4 cameraRotation = _View.ClearTranslation();
+ Matrix4 cam = Matrix4.Identity;
+ cam = cameraPos * cameraRotation;
+ Vector3 cameraPosition = -cam.ExtractTranslation()/ _scene.Scale;//does not work for orbitcontroller
+ // cameraPosition = new Vector3(200,100,-100); //1m = 100units and positive
+ cameraPosition.Z = -cameraPosition.Z;
+ shader.SetVec3("CameraPosition", -cameraPosition);
+ shader.SetMat4("World", _World);
+ shader.SetMat4("WorldView", _World * curView); //_world* curView keeps light source at "fixed" position during rotating of the model
+ shader.SetFloat("SceneBrightness", _SceneBrightness);
+ shader.SetFloat("Material.diffuse", 0);
+ shader.SetFloat("Material.ambient", 1);
+ shader.SetFloat("Material.specular", 2);
+ shader.SetFloat("Material.emissive", 3);
+ shader.SetFloat("Material.height", 4);
+ shader.SetFloat("Material.normal", 5);
+ shader.SetLights(_GLLights, _LightCount);
+ RenderControl.GLError("UniformSettings");
+
+ // note: keep semantics of hasAlpha consistent with IsAlphaMaterial()
+ var alpha = 1.0f;
+ if (mat.HasOpacity)
+ {
+ alpha = mat.Opacity;
+ if (alpha < AlphaSuppressionThreshold) // suppress zero opacity, this is likely wrong input data
+ {
+ alpha = 1.0f;
+ }
+ }
+ var color = new Color4(.8f, .8f, .8f, 1.0f);
+ if (mat.HasColorDiffuse)
+ {
+ color = AssimpToOpenTk.FromColor(mat.ColorDiffuse);
+ if (color.A < AlphaSuppressionThreshold) // s.a.
+ {
+ color.A = 1.0f;
+ }
+ }
+ color.A *= alpha;
+ hasAlpha = hasAlpha || color.A < 1.0f;
+
+ if (shaded)
+ {
+ // if the material has a texture but the diffuse color texture is all black,
+ // then heuristically assume that this is an import/export flaw and substitute
+ // white.
+ if (hasTexture && color.R < 1e-3f && color.G < 1e-3f && color.B < 1e-3f)
+ {
+ color = Color4.White;
+ }
+ shader.SetCol4("MaterialDiffuse_Alpha", color);
+
+ color = new Color4(0, 0, 0, 1.0f);
+ if (mat.HasColorSpecular)
+ {
+ color = AssimpToOpenTk.FromColor(mat.ColorSpecular);
+ }
+ shader.SetCol4("MaterialSpecular", color);
+
+ color = new Color4(.2f, .2f, .2f, 1.0f);
+ if (mat.HasColorAmbient)
+ {
+ color = AssimpToOpenTk.FromColor(mat.ColorAmbient);
+ }
+ shader.SetCol4("MaterialAmbient", color);
+
+ color = new Color4(0, 0, 0, 1.0f);
+ if (mat.HasColorEmissive)
+ {
+ color = AssimpToOpenTk.FromColor(mat.ColorEmissive);
+ }
+ shader.SetCol4("MaterialEmissive", color);
+
+ float shininess = 1;
+ float strength = 1;
+ if (mat.HasShininess)
+ {
+ shininess = mat.Shininess;
+
+ }
+ // todo: I don't even remember how shininess strength was supposed to be handled in assimp .. Scales the specular color of the material.Not implemented here.
+ if (mat.HasShininessStrength)
+ {
+ strength = mat.ShininessStrength;
+ }
+ var exp = shininess;
+ if (exp >= 128.0f) // 128 is the maximum exponent as per the Gl spec
+ {
+ exp = 128.0f;
+ }
+ shader.SetFloat("MaterialShininess", exp);
+ //Shininess may be at mat.ColorSpecular.a too..?? but in FBX is
+ }
+ else if (!hasColors)
+ {
+ shader.SetCol4("MaterialDiffuse_Alpha", color);
+ }
+ if (hasAlpha)
+ {
+ GL.Enable(EnableCap.Blend);
+ GL.BlendFuncSeparate(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha, BlendingFactorSrc.SrcAlpha, BlendingFactorDest.One);
+ GL.DepthMask(false);
+ }
+ else
+ {
+ GL.DepthMask(true);
+ GL.Disable(EnableCap.Blend);
+ }
+ RenderControl.GLError("EndMaterialMapper");
+ }
//public override void UnapplyMaterial(Mesh, Material, Tex)
+ public override void ApplyGhostMaterial(Mesh mesh, Material material, bool shaded, bool twoSided)
+ {
+ var color = new Color4D(.6f, .6f, .9f, 0.15f);
+ var oldColor = material.ColorDiffuse;
+ material.ColorDiffuse = color;
+ ApplyMaterial(mesh, material, false, shaded, twoSided);
+ material.ColorDiffuse = oldColor;
+ }
- public override void ApplyGhostMaterial(Mesh mesh, Material material, bool shaded)
+ private Vector3 Colo3DToVector3(Color3D col)
{
-
+ return new Vector3(col.R, col.G, col.B);
}
- public override void BeginScene(Renderer renderer)
- {
+ private Vector3 Vector3DToVector3(Assimp.Vector3D vec)
+ {
+ return new Vector3(vec.X,vec.Y,vec.Z);
}
+ public override void BeginScene(Renderer renderer, bool useSceneLights = true)
+ {
+ _UseSceneLights = useSceneLights;
+ if (useSceneLights)
+ {
+ var lightNodes = GenerateLightNodes();
+ var Lights = GenerateLights();
+ _LightCount = LightCount();
+ _GLLights = new GLLight[_LightCount];
+ for (var i = 0; i <