Commit Graph

  • 42d048ca04 ... master gauthiier 2023-09-08 08:20:39 +02:00
  • 713ae9994e Integrated code from Jamie dviid_shader dviid 2013-01-27 22:22:20 +01:00
  • 3018088816 .DS_Store? dviid 2013-01-27 21:53:11 +01:00
  • 49a5502e6c New Renderer dviid 2013-01-27 21:52:35 +01:00
  • e4ab292347 committing after hiatus from code... dviid02_jamie_5 Jamie Allen 2013-01-24 11:02:27 +01:00
  • 46d23e7e7b shaders reboot dviid 2013-01-24 06:25:01 +01:00
  • 14cd149cc0 shaders reboot dviid 2013-01-24 06:24:17 +01:00
  • 7e422dca80 removed the ofxArcBall.h and related calls as it was producing runtime locking errors Jamie Allen 2012-05-27 22:42:20 +02:00
  • 80847c5439 shaders all analysis dviid02_dviid_1 dviid 2012-05-25 15:27:49 +02:00
  • 2699edc3ac future everything build dviid 2012-05-25 13:52:22 +02:00
  • 7e7136fad0 post future everything commit dviid02_jamie_4 Jamie Allen 2012-05-19 18:43:54 +02:00
  • 58fdce259f added a new version of camnoiseanalysis by Tom S Jamie Allen 2012-05-13 21:06:31 +01:00
  • 9a6c1c6a55 safety commit prior to leaving for manchester Jamie Allen 2012-05-11 23:37:50 +02:00
  • 35aa74f743 further commit with correct orientation / placement of the images for FCP Jamie Allen 2012-05-11 20:25:57 +02:00
  • 0dc006af44 fixes in preparation for Future Everything renders tonight Jamie Allen 2012-05-11 17:15:24 +02:00
  • f8291acdc5 early-birdy dviid 2012-05-10 07:22:56 +02:00
  • 357573f81a added the meshcode to all analyses (just for consistency... see extended description Jamie Allen 2012-05-09 21:11:16 +02:00
  • 8872b60133 strobe is somewhere (done for now)... pushing so david can pick this up tonight Jamie Allen 2012-05-09 19:34:37 +02:00
  • da5da62160 diffnoise, strobe and relaxrate updates Jamie Allen 2012-05-08 21:59:35 +02:00
  • ec8d6f1296 colorsingle and colormulti are in interesting places - Jamie Allen 2012-05-08 01:11:31 +02:00
  • 34f3cf6ffd safety commit - still working on colorsingle Jamie Allen 2012-05-07 21:59:50 +02:00
  • 1e5bb28b43 a few tweaks to the main draw loop Jamie Allen 2012-05-07 01:08:59 +02:00
  • e0e170b522 working on color single and color multi, some openCV implementations in both Jamie Allen 2012-05-06 22:47:06 +02:00
  • 8b9c3eaebc added triangular mesh and scaling for z axis. dviid02_tom_2 Tom Schofield 2012-05-04 16:48:17 +01:00
  • a9c8a56850 now displays images after saving them out and also fixed maths booboo with analysis Tom Schofield 2012-04-13 11:16:51 +01:00
  • 706eb9354d just sorting out my gitignore file Tom Schofield 2012-04-12 10:24:18 +01:00
  • 21791b9769 added zmapper from inverse square law saves from main app draw() Tom Schofield 2012-04-12 10:21:37 +01:00
  • 97e24c31f2 added file name sorting code to abrastract analysis dviid02_jamie_3 dviid02_jamie_2 Jamie Allen 2012-04-09 13:42:40 +02:00
  • e29accb9ce fixed file ordering dviid 2012-04-09 13:35:16 +02:00
  • f66ce7e2e8 basically the same as dviid02_dviid_1 - just got it working... Jamie Allen 2012-04-08 20:56:28 +02:00
  • 327830a581 beginning to integrate dviid's code dviid02_jamie_1 Jamie Allen 2012-04-08 20:18:44 +02:00
  • 7d7ec3606e mode <drawing, analysing> + drawing mode file chooser dviid 2012-04-06 18:46:38 +02:00
  • 877123a2db changes to colorsingleanalysis Jamie Allen 2012-04-06 17:13:39 +02:00
  • feedecfe04 implementing colorsingleanalysis Jamie Allen 2012-04-06 16:29:54 +02:00
  • ab6c3d5be5 unloading images dviid01 dviid 2012-04-06 13:21:44 +02:00
  • daec77d2be some memory leak fixes in RelaxRate remotes/origin/dviid02_tom_1 dviid02 Jamie Allen 2012-03-02 11:37:24 +00:00
  • 6d0f6422bf mar 2nd trying to fix memory leaks Jamie Allen 2012-03-02 10:27:45 +00:00
  • 1728a128e4 trying to fix memory probs - blobs / images clearings Jamie Allen 2012-03-02 01:31:21 +00:00
  • e43b78cc5a Revert 884e55abd48d4efa0c6bfe06469e7b1abea51c14^..HEAD Jamie Allen 2012-03-02 01:01:53 +00:00
  • 884e55abd4 MAXBLOBS RelaxRate dviid00 dviid 2012-03-01 08:52:32 +01:00
  • 46d02b4166 running app for edinburgh dviid 2012-03-01 07:31:47 +01:00
  • a0483636ac Revert "Revert ebe29d2c8a6544abf5acd8d94be130ec02748f34^..HEAD" Jamie Allen 2012-03-01 00:30:40 +01:00
  • b39f191936 Revert ebe29d2c8a6544abf5acd8d94be130ec02748f34^..HEAD Jamie Allen 2012-03-01 00:20:46 +01:00
  • 7d4f7ec18c fixed the zoom problem dviid 2012-02-29 11:11:28 +01:00
  • d31fd93932 merge tom's grayscale saving code dviid 2012-02-28 20:13:08 +01:00
  • ebe29d2c8a sorry - this is the actual possible windows fix... get this one TOM! Jamie Allen 2012-02-27 20:28:33 +01:00
  • 86769bfc5f possible Windows saving greyscale fix (convert to COLOR before saving) Jamie Allen 2012-02-27 20:23:08 +01:00
  • 1f23d167c2 converting cv images properly (thanks Tom) and possible fix for Windows saving of greyscale images Jamie Allen 2012-02-27 20:08:48 +01:00
  • 0d62dbd135 readme fixes dviid 2012-02-27 19:43:19 +01:00
  • c653d96c77 new readme with proper deps dviid 2012-02-27 19:42:37 +01:00
  • 5693046ad9 fix exit procedure dviid 2012-02-27 19:39:35 +01:00
  • 81f37f8274 just added some comments to our windows save-out issue... this has david's new RelaxRate code Jamie Allen 2012-02-27 19:34:07 +01:00
  • ff7d3b6476 relaxrate new contour synthesis dviid 2012-02-27 18:14:36 +01:00
  • 7b8dcd0940 commit prior to trying to revert to david's branches Jamie Allen 2012-02-27 19:26:11 +01:00
  • 476ab8cfd9 Revert "Revert "Revert 7da4b4b47a01c19f5059bea111c2edb7c2ddefd8^..HEAD"" Jamie Allen 2012-02-27 19:17:18 +01:00
  • f10aeefaef Revert "Revert 7da4b4b47a01c19f5059bea111c2edb7c2ddefd8^..HEAD" Jamie Allen 2012-02-27 18:50:12 +01:00
  • cd49615cfc Revert 7da4b4b47a01c19f5059bea111c2edb7c2ddefd8^..HEAD Jamie Allen 2012-02-27 18:47:18 +01:00
  • 3b9bdde619 relaxrate new contour synthesis dviid 2012-02-27 18:14:36 +01:00
  • 25a423f4ea working on RelaxRate dviid 2012-02-27 16:06:02 +01:00
  • 7da4b4b47a #ifdef back in Jamie Allen 2012-02-27 03:11:26 +01:00
  • 7cd4da7341 cleaned up the windows code there were some mistakes Jamie Allen 2012-02-27 03:06:40 +01:00
  • 5d48d6ef6a small fix - analysis and synthesis were writing to the same folder - better now Jamie Allen 2012-02-27 02:46:18 +01:00
  • 7a7614d02d put in image.clear() and ofCvImage.clear() statements before allocation and after use of these Jamie Allen 2012-02-27 02:41:25 +01:00
  • 38ec4da627 ALLOCATING the saved images Jamie Allen 2012-02-26 19:12:34 +01:00
  • 8fe367b47b RUN_NUM and analysis_time for each analysis now set in the config file Jamie Allen 2012-02-26 18:01:30 +01:00
  • c8de799215 added config file to the repo - this needs to go in /data/ folder Jamie Allen 2012-02-26 17:33:59 +01:00
  • 60e51a84f2 this code has consolidated save function in abstract analysis - un-commented the analyses so they all run - Jamie Allen 2012-02-26 16:58:18 +01:00
  • fefa41516c messing around trying to produce the windows error on osx jamie_22feb2012 Jamie Allen 2012-02-26 16:40:22 +01:00
  • 44c900e060 moved save functionality to AbstractAnalysis dviid 2012-02-26 15:28:27 +01:00
  • 51c0098d27 windows compatibility for saving images Jamie Allen 2012-02-23 01:22:14 +00:00
  • 5564329916 NUM_RUN now set using XML config Jamie Allen 2012-02-22 20:48:24 +01:00
  • 245d67cf8f the NUM_RUN is now set using the xml config.refindx in each class Jamie Allen 2012-02-22 19:41:16 +01:00
  • a51a98a099 _synth_save_cnt = 0 wasn't in the acquire() loop - fixed jamie Jamie Allen 2012-02-22 18:35:35 +01:00
  • fe35f843ef cvGrayDiff1 was not being generated properly in RelaxRate - fixed Jamie Allen 2012-02-22 16:20:40 +01:00
  • 2f0415952e _synth_save_cnt = 0; needed to be reset! Jamie Allen 2012-02-22 16:17:24 +01:00
  • 1117e632c6 small file saving "_" fix Jamie Allen 2012-02-22 15:39:49 +01:00
  • 2f2b38019e added proper looping structure - fixed up some un-initialised variables Jamie Allen 2012-02-22 15:36:22 +01:00
  • 24ddd694c7 the synthesis (saving out to files) and displaying are working for all EXCEPT RelaxRateAnalysis Jamie Allen 2012-02-22 02:09:19 +01:00
  • 763d88b115 key presses working for all - still working on opencv imagery Jamie Allen 2012-02-21 21:45:18 +01:00
  • b0464c5632 added opencv images - showing but work in progress... Jamie Allen 2012-02-21 21:20:37 +01:00
  • 3c13d95bc4 key input controls dviid 2012-02-21 21:18:25 +01:00
  • 2903c7a969 david commit 19:31 Jamie Allen 2012-02-21 19:31:58 +01:00
  • 5c5581f16e mid-backed commit - master is dead dviid 2012-02-21 18:06:58 +01:00
  • 117eaca232 commit for david tues 21st 17:51 Jamie Allen 2012-02-21 17:51:14 +01:00
  • 9fd244dcc1 added openCV.h to each class Jamie Allen 2012-02-21 17:26:16 +01:00
  • adbe746afc removed xml shit from the main.cpp Jamie Allen 2012-02-21 16:56:38 +01:00
  • 5df657051d removed the xml shit in main.cpp Jamie Allen 2012-02-21 16:48:39 +01:00
  • 7dc3e305a8 next day still working commit Jamie Allen 2012-02-21 12:04:49 +01:00
  • 7bb2f2c1e1 removed a few extraneous comments Jamie Allen 2012-02-21 02:05:47 +01:00
  • 0cd3bca7c0 cleanups, a few comments, and cout commented out Jamie Allen 2012-02-21 02:01:01 +01:00
  • 78c2edc0ac couple of todos added Jamie Allen 2012-02-21 01:50:47 +01:00
  • 680e22ccf9 tuesday 2 AM commit - Jamie Allen 2012-02-21 01:39:27 +01:00
  • 3eef15a14b added image playout for all classes Jamie Allen 2012-02-21 01:34:24 +01:00
  • e17a3a0d91 now able to show images in the analysis classes!! Jamie Allen 2012-02-21 01:01:49 +01:00
  • 51c71bdc15 added vid grab to IResponse Jamie Allen 2012-02-20 20:28:12 +01:00
  • 2bd7704f38 put the RefractiveIndex::_vidGrabber.grabFrame(); // in each class Jamie Allen 2012-02-20 20:24:25 +01:00
  • e1e4e15529 safety commit Jamie Allen 2012-02-20 20:10:32 +01:00
  • b514c12a53 fixed timings so everything is on the second-basis, fixed David's flags so that each section in the classes terminates on RUN_DONE Jamie Allen 2012-02-20 19:48:43 +01:00
  • b5cebe9304 mid-commit AbstractAnalysis::saveimage dviid 2012-02-20 14:08:58 +01:00
  • 3649211943 merged with tom Tom Schofield 2012-02-20 13:00:05 +00:00