diff --git a/src/imagedancer.pas b/src/imagedancer.pas index 26c060c..4bf8ca5 100644 --- a/src/imagedancer.pas +++ b/src/imagedancer.pas @@ -59,7 +59,7 @@ timagedancerfo = class(tdockform) isbuzy : boolean = false; evPauseImage: PRTLEvent;// for pausing statusanim : integer = -1; - + implementation uses @@ -69,6 +69,10 @@ implementation bgragraphics, msegl,mseglu,msesysutils, imagedancer_mfm; + +var + Bitmap: tbgrabitmap; + // Super Formula @@ -161,17 +165,21 @@ procedure timagedancerfo.onpaint_imagedancerfo(const Sender: twidget; x: double = 0; y: double = 0; y2: double = 0; - Bitmap: tbgrabitmap; init: double = 0; I, z : integer; begin if isbuzy = false then begin - isbuzy := true; - - Bitmap := tbgrabitmap.Create(Sender.bounds_cx, Sender.bounds_cy); + isbuzy := true; +if (Bitmap.width <> Sender.bounds_cx) or (Bitmap.width <> Sender.bounds_cx) +then +begin + bitmap.free; + Bitmap := tbgrabitmap.Create(Sender.bounds_cx, Sender.bounds_cy); + end; + if dancernum = 0 then // Fractral Tree begin @@ -186,13 +194,7 @@ procedure timagedancerfo.onpaint_imagedancerfo(const Sender: twidget; else if dancernum = 1 then // Super Formula begin - { - Bitmap.GradientFill(0, 0, Bitmap.Width, Bitmap.Height, BGRA(round(155 * multiplier), - round(200 * multiplier) , round(255 * multiplier)) , BGRA(round(155 * multiplier), - round(200 * multiplier) , round(255 * multiplier)), - gtLinear, PointF(0, 0), PointF(0, Bitmap.Height), dmSet); -} - + Bitmap.GradientFill(0, 0, Bitmap.Width, Bitmap.Height, $FFEDDE , $FF9D4D, gtlinear, PointF(0, 0), PointF(0, Bitmap.Height), dmSet); @@ -228,6 +230,7 @@ procedure timagedancerfo.onpaint_imagedancerfo(const Sender: twidget; else if dancernum = 2 then // Hyper formula begin + Bitmap.GradientFill(0, 0, Bitmap.Width, Bitmap.Height, cl_black, cl_black, gtLinear, PointF(0, 0), PointF(0, Bitmap.Height), dmSet); @@ -265,7 +268,6 @@ procedure timagedancerfo.onpaint_imagedancerfo(const Sender: twidget; end; Bitmap.draw(acanvas, 0, 0, False); - Bitmap.Free; isbuzy := false; end; @@ -326,6 +328,7 @@ procedure timagedancerfo.ondestroy(const sender: TObject); thethread.terminate(); application.waitforthread(thethread); thethread.destroy(); + Bitmap.Free; RTLeventdestroy(evPauseImage); end; @@ -334,13 +337,15 @@ procedure timagedancerfo.ocreat(const sender: TObject); evPauseImage := RTLEventCreate; thethread:= tmsethread.create(@execute); RTLeventResetEvent(evPauseImage); + Bitmap := tbgrabitmap.Create(1000,600); + end; procedure timagedancerfo.onshow(const sender: TObject); begin openglwidget.fpsmax:= 30; renderstart:= timestamp; - mainfo.tmainmenu1.menu[3].submenu[16].Caption := ' Hide Image Dancer '; +mainfo.tmainmenu1.menu[3].submenu[16].Caption := ' Hide Image Dancer '; end; procedure timagedancerfo.clientrectchangedexe(const sender: tcustomwindowwidget); diff --git a/src/songplayer.pas b/src/songplayer.pas index dfed934..5b6e078 100644 --- a/src/songplayer.pas +++ b/src/songplayer.pas @@ -852,7 +852,7 @@ procedure tsongplayerfo.LoopProcPlayer1(); // multiplier := ((ll1 + lr1) / 2) + ((ll2 + lr2) / 2); RTLeventSetEvent(evPauseimage); // to resume end; - end; + end; if Caption = 'Player 1' then if (spectrum1fo.spect1.Value = True) and (spectrum1fo.Visible = True) and diff --git a/src/strumpract b/src/strumpract new file mode 100755 index 0000000..83b89ef Binary files /dev/null and b/src/strumpract differ diff --git a/src/strumpract.prj b/src/strumpract.prj index 8d79a37..9767bfd 100644 --- a/src/strumpract.prj +++ b/src/strumpract.prj @@ -96,9 +96,9 @@ findinfiledialog=91 [findinfileadialogfo.wholeword] value=0 [findinfileadialogfo.indirectories] - value=0 - [findinfileadialogfo.inprojectdir] value=1 + [findinfileadialogfo.inprojectdir] + value=0 [findinfileadialogfo.casesensitive] value=0 [findinfileadialogfo.mask] @@ -150,8 +150,10 @@ findinfiledialog=91 filefilterindex=0 filefilter="*.pas" "*.pp" "*.inc" [findinfileadialogfo.findtext] - value=hide play + value=GLext, history=20 + GLext, + GL, GLext, GLU hide play hide dock select @@ -170,8 +172,6 @@ findinfiledialog=91 tosys list_files.defocuscell rowcol - .color - er.Exe [findinfileadialogfo] stackedunder= x=635 @@ -308,7 +308,7 @@ options=114 value= [projectoptionsfo.makegroupbox] firsttab=0 - index=3 + index=2 [projectoptionsfo.exceptionsgrid] propcolwidthref=758 width0=47 @@ -317,7 +317,7 @@ options=114 sortdescend1=0 [projectoptionsfo.ttabwidget1] firsttab=0 - index=0 + index=1 [projectoptionsfo.filefiltergrid] propcolwidthref=734 width0=112 @@ -359,7 +359,7 @@ settings=8 [settings_form] x=447 y=145 - cx=465 + cx=446 cy=578 wsize=0 active=1 @@ -815,33 +815,12 @@ settingsstorage=0 settingsprojecttree=0 settingsautoload=0 settingsautosave=0 -modulenames=8 - COMMANDERFO - DOCKPANEL1FO - FILELISTFO - IMAGEDANCERFO +modulenames=1 MAINFO - FILEDIALOGFO - RANDOMNOTEFO - SONGPLAYERFO -moduletypes=8 - TCOMMANDERFO - TDOCKPANEL1FO - TFILELISTFO - TIMAGEDANCERFO +moduletypes=1 TMAINFO - TFILEDIALOGFO - TRANDOMNOTEFO - TSONGPLAYERFO -modulefiles=8 - /home/fred/strumpract/src/commander.mfm - /home/fred/strumpract/src/dockpanel1.mfm - /home/fred/strumpract/src/filelistform.mfm - /home/fred/strumpract/src/imagedancer.mfm +modulefiles=1 /home/fred/strumpract/src/main.mfm - /home/fred/mseide-msegui/lib/common/dialogx/msefiledialogx.mfm - /home/fred/strumpract/src/randomnote.mfm - /home/fred/strumpract/src/songplayer.mfm befcommandon=0 makeoptionson=11 4095 @@ -1050,7 +1029,10 @@ beforeload= afterload= beforerun= sourcebase= -sourcedirs=4 +sourcedirs=7 + ${BGRABITMAPDIR}/bgrabitmap/*/ + ${BGRABITMAPDIR}/bgrabitmap/ + ${BGRABITMAPDIR}/*/ ${MSEDIR}lib/addon/*/ ${MSEDIR}lib/common/kernel/$TARGETOSDIR/ ${MSEDIR}lib/common/*/ @@ -1115,7 +1097,7 @@ sigsettings=27 30,30,T,F defaultmake=1 [breakpoints] -on=36 +on=35 0 0 0 @@ -1151,8 +1133,7 @@ on=36 0 0 0 - 0 -path=36 +path=35 /home/fred/drumspract/main.pas /home/fred/strumpract/uos.pas /home/fred/strumpract/uos.pas @@ -1188,8 +1169,7 @@ path=36 /home/fred/strumpract/src/songplayer.pas /home/fred/strumpract/src/waveform.pas /home/fred/strumpract/src/songplayer.pas - /home/fred/strumpract/src/imagedancer.pas -line=36 +line=35 553 6389 7495 @@ -1225,8 +1205,7 @@ line=36 1481 356 1662 - 195 -address=36 +address=35 4603313 7398231 7407398 @@ -1262,9 +1241,7 @@ address=36 4712031 0 4714884 - 4765184 -addbkpt=36 - 0 +addbkpt=35 0 0 0 @@ -1300,7 +1277,7 @@ addbkpt=36 0 0 0 -ignore=36 +ignore=35 0 0 0 @@ -1336,9 +1313,7 @@ ignore=36 0 0 0 - 0 -condition=36 - +condition=35 @@ -1579,10 +1554,10 @@ envvarons=0 [edit] hintwidth=314 hintheight=200 -finddtext=select +finddtext=imagedan findhistory=20 - select imagedan + select onlayout onlaout onim @@ -1602,113 +1577,44 @@ findhistory=20 evpause canvas findoptions=1 -editpos=10 - 0,-1073741823 - 0,-1073741823 - 0,1921 - 0,-1073741823 - 0,-1073741823 - 0,-1073741823 - 0,-1073741823 - 0,-1073741823 - 0,-1073741823 - 8,6 +editpos=1 + 0,6 bookmarks0=0 -bookmarks1=0 -bookmarks2=0 -bookmarks3=0 -bookmarks4=0 -bookmarks5=0 -bookmarks6=0 -bookmarks7=0 -bookmarks8=0 -bookmarks9=0 -sourcefiles=10 +sourcefiles=1 ${PROJECTDIR}/main.pas - ${PROJECTDIR}/filelistform.pas - /home/fred/mseide-msegui/lib/common/dialogx/msefiledialogx.pas - ${PROJECTDIR}/msegrids.pas - ${PROJECTDIR}/dockpanel1.pas - ${PROJECTDIR}/songplayer.pas - ${PROJECTDIR}/imagedancer.pas - ${PROJECTDIR}/randomnote.pas - ${PROJECTDIR}/songplayer.pas - ${PROJECTDIR}/commander.pas -relpaths=10 +relpaths=1 main.pas - filelistform.pas - ../mseide-msegui/lib/common/dialogx/msefiledialogx.pas - msegrids.pas - dockpanel1.pas - songplayer.pas - imagedancer.pas - randomnote.pas - songplayer.pas - commander.pas -ismoduletexts=10 - 0 - 0 - 0 - 0 - 0 +ismoduletexts=1 0 - 0 - 0 - 0 - 0 -modules=11 +modules=5 /home/fred/strumpract/src/main.mfm /home/fred/strumpract/src/commander.mfm /home/fred/strumpract/src/drums.mfm /home/fred/strumpract/src/recorder.mfm /home/fred/strumpract/src/guitars.mfm - /home/fred/strumpract/src/filelistform.mfm - /home/fred/mseide-msegui/lib/common/dialogx/msefiledialogx.mfm - /home/fred/strumpract/src/dockpanel1.mfm - /home/fred/strumpract/src/songplayer.mfm - /home/fred/strumpract/src/imagedancer.mfm - /home/fred/strumpract/src/randomnote.mfm -moduleoptions=11 - 0 - 0 - 0 +moduleoptions=5 0 0 0 0 0 +visiblemodules=5 + -1 0 0 0 -visiblemodules=11 -1 - -1 - 0 +nomenumodules=5 0 -1 -1 -1 -1 - -1 - -1 - -1 -nomenumodules=11 - 0 - 0 - -1 - -1 - -1 - 0 - 0 - 0 - 0 - 0 - 0 [sourcefo.files_tab] firsttab=0 -index=9 +index=0 [layout] -windowlayout=774 +windowlayout=660 [mainfo.basedock] splitdir=2 useroptions=268450944 @@ -1722,13 +1628,13 @@ windowlayout=774 ny=0 ncx=0 ncy=0 - x=120 - y=54 + x=34 + y=53 cx=1224 cy=621 rcx=0 rcy=0 - wsize=6 + wsize=0 active=1 visible=1 [targetconsolefo] @@ -1748,7 +1654,7 @@ windowlayout=774 rcy=0 wsize=0 active=0 - visible=1 + visible=0 [threadsfo] splitdir=0 useroptions=268451945 @@ -1823,10 +1729,10 @@ windowlayout=774 ny=0 ncx=0 ncy=0 - x=0 - y=29 - cx=1360 - cy=710 + x=239 + y=115 + cx=678 + cy=414 rcx=0 rcy=0 [projecttreefo] @@ -1842,7 +1748,7 @@ windowlayout=774 x=0 y=0 cx=205 - cy=526 + cy=450 rcx=0 rcy=0 [projecttreefo.grid] @@ -1853,7 +1759,7 @@ windowlayout=774 sortdescend1=0 sorted=0 col=0 - row=1 + row=7 rowheight=16 [stackfo] splitdir=0 @@ -2028,9 +1934,9 @@ windowlayout=774 ncx=0 ncy=0 x=0 - y=581 - cx=1348 - cy=108 + y=507 + cx=1212 + cy=93 rcx=0 rcy=0 [componentstorefo] @@ -2162,8 +2068,8 @@ windowlayout=774 ncy=0 x=0 y=0 - cx=1348 - cy=49 + cx=1212 + cy=51 rcx=0 rcy=0 [debuggerfo.basedock] @@ -2173,13 +2079,13 @@ windowlayout=774 visible=1 mdistate=0 nx=0 - ny=-1 - ncx=1333 - ncy=19 + ny=0 + ncx=1197 + ncy=58 x=0 - y=-1 - cx=1333 - cy=17 + y=0 + cx=1212 + cy=57 rcx=0 rcy=0 [debuggerfo.edit_options] @@ -2189,18 +2095,9 @@ windowlayout=774 [debuggerfo.edit_compiler] value=Pascal [debuggerfo.file_history] - value=/home/fred/strumpract/src/commander.pas + value=/home/fred/strumpract/src/main.pas history=20 - /home/fred/strumpract/src/commander.pas - /home/fred/strumpract/src/randomnote.pas /home/fred/strumpract/src/main.pas - /home/fred/strumpract/src/filelistform.pas - /home/fred/strumpractlast/src/recorder.mfm - /home/fred/strumpractlast/src/main.pas - /home/fred/strumpract/src/guitars.mfm - /home/fred/strumpractlast/src/guitars.mfm - /home/fred/strumpractlast/src/guitars.pas - /home/fred/strumpract/src/imagedancer.pas /home/fred/atest/test.prj /home/fred/ideu/src/ideU.prj /home/fred/mseide-msegui/apps/ide/mseide.prj @@ -2211,8 +2108,17 @@ windowlayout=774 /home/fred/mseide-msegui/apps/ide/mseide_zeos.prj /home/fred/strumpract/src/strumpract.prj /home/fred/ideu_badplug/src/demos/voiceassist/helloworld/helloworld.prj + /home/fred/xtop/src/ptop.prj + /home/fred/xtop/src/jtop.prj + /home/fred/idegraeme/mseide.prj + /home/fred/fptop/src/jtop.prj + /home/fred/fptop/src/ptop.prj + /home/fred/ptop_fred/ptop.prj + /home/fred/eschecs_mse_argh/eschecs.prj + /home/fred/Downloads/jcf-cli-master/CommandLine/Lazarus/jcf.prj + /home/fred/mseuniverse/samples/widgets/grids/chessboard/chessboard.prj [debuggerfo.project_options] - value=6 + value=1 [debuggerfo.hints] value=0 [sourcefo] @@ -2227,13 +2133,13 @@ windowlayout=774 ncy=0 x=208 y=0 - cx=1140 - cy=526 + cx=1004 + cy=450 rcx=0 rcy=0 [sourcefo.files_tab] firsttab=0 - index=9 + index=0 [confideufo.fontname] value=stf_default [confideufo.usedefaulteditoroptions] @@ -2269,15 +2175,15 @@ windowlayout=774 ncx=0 ncy=0 x=0 - y=52 - cx=1348 - cy=526 + y=54 + cx=1212 + cy=450 rcx=0 rcy=0 [_mse_mainfo_mse_] splitdir=0 useroptions=268451963 - stackedunder=_mse_commanderfo_mse_ + stackedunder=_mse_guitarsfo_mse_ parent= mdistate=3 nx=0 @@ -2296,7 +2202,7 @@ windowlayout=774 [_mse_commanderfo_mse_] splitdir=0 useroptions=268451963 - stackedunder=_mse_guitarsfo_mse_ + stackedunder=confdebuggerfo parent= mdistate=3 nx=0 @@ -2311,11 +2217,11 @@ windowlayout=774 rcy=0 wsize=0 active=0 - visible=1 + visible=0 [_mse_recorderfo_mse_] splitdir=0 useroptions=268451963 - stackedunder=confdebuggerfo + stackedunder=_mse_commanderfo_mse_ parent= mdistate=3 nx=0 @@ -2353,7 +2259,7 @@ windowlayout=774 [_mse_guitarsfo_mse_] splitdir=0 useroptions=268451963 - stackedunder=_mse_filelistfo_mse_ + stackedunder=objectinspectorfo parent= mdistate=3 nx=0 @@ -2369,120 +2275,6 @@ windowlayout=774 wsize=0 active=0 visible=1 - [_mse_filelistfo_mse_] - splitdir=0 - useroptions=268451963 - stackedunder=_mse_filedialogfo_mse_ - parent= - mdistate=3 - nx=0 - ny=0 - ncx=0 - ncy=0 - x=741 - y=84 - cx=452 - cy=128 - rcx=0 - rcy=0 - wsize=0 - active=0 - visible=1 - [_mse_filedialogfo_mse_] - splitdir=0 - useroptions=268451963 - stackedunder=_mse_dockpanel1fo_mse_ - parent= - mdistate=3 - nx=0 - ny=0 - ncx=0 - ncy=0 - x=326 - y=209 - cx=618 - cy=484 - rcx=0 - rcy=0 - wsize=0 - active=0 - visible=1 - [_mse_dockpanel1fo_mse_] - splitdir=0 - useroptions=268451963 - stackedunder=_mse_songplayerfo_mse_ - parent= - mdistate=3 - nx=0 - ny=0 - ncx=0 - ncy=0 - x=462 - y=211 - cx=464 - cy=96 - rcx=0 - rcy=0 - wsize=0 - active=0 - visible=1 - [_mse_songplayerfo_mse_] - splitdir=0 - useroptions=268451963 - stackedunder=_mse_imagedancerfo_mse_ - parent= - mdistate=3 - nx=0 - ny=0 - ncx=0 - ncy=0 - x=258 - y=219 - cx=452 - cy=128 - rcx=0 - rcy=0 - wsize=0 - active=0 - visible=1 - [_mse_imagedancerfo_mse_] - splitdir=0 - useroptions=268451963 - stackedunder=_mse_randomnotefo_mse_ - parent= - mdistate=3 - nx=0 - ny=0 - ncx=0 - ncy=0 - x=403 - y=251 - cx=456 - cy=354 - rcx=0 - rcy=0 - wsize=0 - active=0 - visible=1 - [_mse_randomnotefo_mse_] - splitdir=0 - useroptions=268451963 - stackedunder=targetconsolefo - parent= - mdistate=3 - nx=0 - ny=0 - ncx=0 - ncy=0 - x=0 - y=29 - cx=1360 - cy=710 - rcx=0 - rcy=0 - wsize=0 - active=0 - visible=1 [targetconsole] finddtext= findhistory=0