From b3c313b5c53f5364ccf3b7ff882b9426ec5586dc Mon Sep 17 00:00:00 2001 From: mfeemster Date: Tue, 29 Jul 2014 08:06:09 -0700 Subject: [PATCH] 0.4.0.9 Beta 07/29/2014 0.4.0.9 Beta 07/29/2014 --Bug Fixes Final render dialog didn't create the renderer properly on first run when more than one platform was present. --- .gitignore | 3 ++- .../FractoriumInstaller.wixproj | 2 +- .../VS2010/FractoriumInstaller/Product.wxs | 4 ++-- Data/Bench.xlsx | Bin 10353 -> 10405 bytes Source/Ember/EmberDefines.h | 2 +- Source/EmberAnimate/EmberAnimate.rc | 8 ++++---- Source/EmberGenome/EmberGenome.rc | 8 ++++---- Source/EmberRender/EmberRender.rc | 8 ++++---- Source/Fractorium/AboutDialog.ui | 2 +- .../Fractorium/FinalRenderEmberController.cpp | 17 ++++++----------- Source/Fractorium/Fractorium.rc | Bin 4574 -> 4574 bytes 11 files changed, 25 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 487619f..6aa79b0 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,5 @@ Builds/MSVC/VS2010/Obj/EmberRender/x64/Debug/EmberRender_manifest.rc Builds/MSVC/VS2010/Obj/EmberGenome/x64/Debug/EmberGenome_manifest.rc Builds/MSVC/VS2010/Obj/EmberAnimate/x64/Debug/EmberAnimate_manifest.rc Builds/MSVC/VS2010/Obj/Ember/x64/Debug/Ember_manifest.rc -Bin/x64/Release/testallvarsout.flame \ No newline at end of file +Bin/x64/Release/testallvarsout.flame +Data/~$Bench.xlsx \ No newline at end of file diff --git a/Builds/MSVC/VS2010/FractoriumInstaller/FractoriumInstaller.wixproj b/Builds/MSVC/VS2010/FractoriumInstaller/FractoriumInstaller.wixproj index 9b094fe..3f2416b 100644 --- a/Builds/MSVC/VS2010/FractoriumInstaller/FractoriumInstaller.wixproj +++ b/Builds/MSVC/VS2010/FractoriumInstaller/FractoriumInstaller.wixproj @@ -6,7 +6,7 @@ 3.7 {c8096c47-e358-438c-a520-146d46b0637d} 2.0 - Fractorium_Beta_0.4.0.9 + Fractorium_Beta_0.4.1.0 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets diff --git a/Builds/MSVC/VS2010/FractoriumInstaller/Product.wxs b/Builds/MSVC/VS2010/FractoriumInstaller/Product.wxs index 138c913..9c1a3e7 100644 --- a/Builds/MSVC/VS2010/FractoriumInstaller/Product.wxs +++ b/Builds/MSVC/VS2010/FractoriumInstaller/Product.wxs @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - + $o+P^D3@v=s^!XXAO}1ONbU6O+CbAAgu#Z=*OAhVNI}|A4q3zWczV;k_|>qn6rZ@6wUQZ7woIi`Wj zlQ6wY?kJc(rRwoO?t#d z(tlW_!X+qsQWpt@pY_3Rsv0Ld9#rJE>o}oZBw1;S4DTE?W^eco=lRmSLoOivpBG{GP{Kadkng*C4;}g6IY;hXOo0%F`4*0y-#SeTGZs- zfE@xdG*!a(8#HHm$7dr?HJJ8T^uRGkK zhK>i_;SU{;x+54mo^%INnz|mbC@tCOmT*|-S$E7%4jVX~V6lzodVg5pK4FSa z2|38`vW66fcdX3PbU9z-Mv8nd%PyKJz4;-_f#WFA53;O`=A*263iGE<>^p@N%erkc zvee*>2=+vmyx0wWXqno!XW{bOj(g$Ebt1o?Hv<;1H{QSk+-F(Hn#O{anP4HyBP?Wj zgoP|CWBDj+>To`FV&5r^MSnNemZL5R5!~tLSO{0g!VQDikHRzS0vdc>l< z0c?cj5)GS<{fPG80H-c?5|pk06ode&+GL=uy@* zB%RoIN<%VYQC=@L!hdoJiEwpDkmLDYkAHxKeUD%NP6h6>NMubz!pck_k>wF2vOI!B zmeo}vYubj@iG8OuBqNsoDa@&Fgyj+v;cAh%P8|4d|7kEl0$)=%AOZJTB(kO{Rv-~a8{(6(N)Gss zq&{S2W8`=bqYhuprcsNt41P~Z#s3SBsV$*!GSU4y!buf|Pe{jt7rQ+nwEF=E9W3up zOkXR5)EOLs@WZF2S&^F7Nk*ZYEw)zE=0UQ(wn5?kDO921?gOjfs z8-Hw)Pj7-S7>Dmm_8pp@+(8Ns6&An{=(L&t24%~Rjdn@`#nH0pw_lxyC1uC=dEQ^! z{L)}{t}F1(TUj1v*`XVkWvAi6*7cJ zrA|)>$=#9HOj^x}3vE7|wq{C??E%SC%YWHk9ywQag+{hLK{YD{1iPjaDuj=kD9(DBUx;#?n3*`EB=5Z?X)n6VDq*^CVMcP*y|7jrQ>6HfB)tme+X4(SA4ZHk z`}|-=wnc_PhSw?103|C726=BMxgHR&Qs9rrz#S${%X>S{v<8l6O>Famt8iV*b$i0s z3CHrh|HRm}oT>aXNPnW}laU$~vlSdF1_h0uP-8%|L?R{ue^E=rFcgK~1^+|Idz)mF zIYZll%AOnuRutbta<>JWG$he(|K7BnwSyt#CHI{B-IGi5)j`+EH#n~vQy`iVlze}Qe^n=j4l|RO^CmMA@}(wD1Wn}Bs2mF6=&ml;{*Tz zZxfT?COjLMtgyjL0RRAl0ssIM0000000000000000KbzrCqV%`lX)jP0umpSwI@6Q f+mrGqIt7iNP-8%oF(?%QW|K!KBnI6i00000xFo;z delta 2036 zcmVodmGfDA>wFwc~hGuy6{GtT4M zB7Y?=06CH>k171EPIg^ZI6m;8JhNTL3GF;i3sYp6Rk!3I$77n{HA!A_Tu_mu!dXnA z|MfX7Ynd%iZb_HN)$>dFB_VkUDfVfW(hr{0H1cG&Jr$&i_Zf`)9rv_IylJ+&dza(+l*1Wb0L!hgqw`3=pUrl!4|bAA3v@msB28#Lbk#2HQ~ zK7dW8K}q==KGGG=vW2;V8_bVAAIom29&8`eY`H6x%~>0K4}==`;4f|U`tKQfx3)! zpW${HKl%)>%h>c8ewXpkX9QiwW1oSvu5Je?T2FR;O4zOQ)MrdC3>$p9n12N;`3|#y zeX(hJNyv@-u3|{@aK*|jOqctM+(?7hD(s?(HkuzQ95{{^y-{IJ%?B0pG|wL;*bWM5 zlx@>xWa+^>5$uT}c~dv^p=WyEo&?Kp2JVFu*NOag-gLZxz3~n&fc>c#D%SIYl^O9u zg$KM);Q=pHSkv-B#dJ9zC4blss^^8&+H&*-A%Z3TnHPd3y>P=|>PO)x>jEA(cX$Ep zPrXpFo)@glh!-k6;Drhgc%j1jx=^vOosWDeKT5D2RL={cq8D1ewh!z?@HH<4tH~0% zVHhFQX6h^pc!J+y1+YK0LdAMkurec7sPKRlDm-9?3hT>4#d=mquzwv?&x(L=F5VQL z^xZ9aCxWk8Ay^kHg3t-0HdDun@E$8xj6I^L3J)l%!UKw`us*p}thdofP*GHy|JwnI z_8{L0$~9>PtJ!fpANkIt-MTu;!rSKUlYGV4Bg(4qfU+t)psWhF^MLOR4=UDER)QnS z4p6j*{Z3G>DJxh~S%2hszSp|gQI?&oZhjqIG4_bEDmnCEBgI}Hr8HHE2d+E9l_(T~U42$2M1v`UvnsyNlH7qeMp2-PC@|4FUeN%X zD8RS*&OTVe7dBi_HeYa?zUA?f@lP9PnN7ASB`jl`wJrFD$4g+Grk%_m#2F=aT_#RB z%Q|l%&9&{aB%&=`*^$hgUq#azTO{8?LcKu4g@QTZy~wcicK1lXt!@~+HSRjA><|Z zocp^cm!zwMs-hpTuB>&2l9-|hw5VmNcNuys)_92`=ed@=sx@Tj2oA0C+nZDvCTa^W zwl-jW2`&mG?U*nb+Iw#pAx`W;aTf=N4&t`9iu-?XwL4-JottUDH-5!(aCp-bBlO`xS8zx4l5::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way. #define ISAAC_SIZE 4 diff --git a/Source/EmberAnimate/EmberAnimate.rc b/Source/EmberAnimate/EmberAnimate.rc index 0c3c781..e25027b 100644 --- a/Source/EmberAnimate/EmberAnimate.rc +++ b/Source/EmberAnimate/EmberAnimate.rc @@ -49,8 +49,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,4,0,9 - PRODUCTVERSION 0,4,0,9 + FILEVERSION 0,4,1,0 + PRODUCTVERSION 0,4,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Renders fractal flames as animations with motion blur" - VALUE "FileVersion", "0.4.0.9" + VALUE "FileVersion", "0.4.1.0" VALUE "InternalName", "EmberAnimate.rc" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2013, GPL v3" VALUE "OriginalFilename", "EmberAnimate.rc" VALUE "ProductName", "Ember Animate" - VALUE "ProductVersion", "0.4.0.9" + VALUE "ProductVersion", "0.4.1.0" END END BLOCK "VarFileInfo" diff --git a/Source/EmberGenome/EmberGenome.rc b/Source/EmberGenome/EmberGenome.rc index 2e57adb..3824869 100644 --- a/Source/EmberGenome/EmberGenome.rc +++ b/Source/EmberGenome/EmberGenome.rc @@ -49,8 +49,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,4,0,9 - PRODUCTVERSION 0,4,0,9 + FILEVERSION 0,4,1,0 + PRODUCTVERSION 0,4,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Manipulates fractal flames parameter files" - VALUE "FileVersion", "0.4.0.9" + VALUE "FileVersion", "0.4.1.0" VALUE "InternalName", "EmberGenome.rc" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2013, GPL v3" VALUE "OriginalFilename", "EmberGenome.rc" VALUE "ProductName", "Ember Genome" - VALUE "ProductVersion", "0.4.0.9" + VALUE "ProductVersion", "0.4.1.0" END END BLOCK "VarFileInfo" diff --git a/Source/EmberRender/EmberRender.rc b/Source/EmberRender/EmberRender.rc index f2747f5..df68541 100644 --- a/Source/EmberRender/EmberRender.rc +++ b/Source/EmberRender/EmberRender.rc @@ -49,8 +49,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,4,0,9 - PRODUCTVERSION 0,4,0,9 + FILEVERSION 0,4,1,0 + PRODUCTVERSION 0,4,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Renders fractal flames as single images" - VALUE "FileVersion", "0.4.0.9" + VALUE "FileVersion", "0.4.1.0" VALUE "InternalName", "EmberRender.rc" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2013, GPL v3" VALUE "OriginalFilename", "EmberRender.rc" VALUE "ProductName", "Ember Render" - VALUE "ProductVersion", "0.4.0.9" + VALUE "ProductVersion", "0.4.1.0" END END BLOCK "VarFileInfo" diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui index 1cccbdb..83a5853 100644 --- a/Source/Fractorium/AboutDialog.ui +++ b/Source/Fractorium/AboutDialog.ui @@ -52,7 +52,7 @@ - <html><head/><body><p align="center"><br/><span style=" font-size:12pt;">Fractorium 0.4.0.9 Beta</span></p><p align="center"><span style=" font-size:10pt;"><br/>A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><span style=" font-size:10pt;">Matt Feemster</span></p></body></html> + <html><head/><body><p align="center"><br/><span style=" font-size:12pt;">Fractorium 0.4.1.0 Beta</span></p><p align="center"><span style=" font-size:10pt;"><br/>A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><span style=" font-size:10pt;">Matt Feemster</span></p></body></html> Qt::RichText diff --git a/Source/Fractorium/FinalRenderEmberController.cpp b/Source/Fractorium/FinalRenderEmberController.cpp index 69c443b..f65ba26 100644 --- a/Source/Fractorium/FinalRenderEmberController.cpp +++ b/Source/Fractorium/FinalRenderEmberController.cpp @@ -436,17 +436,12 @@ bool FinalRenderEmberController::CreateRenderer(eRendererType renderType, uns CancelRender(); - if (m_Renderer.get() && - m_Renderer->Ok() && - m_Renderer->RendererType() == renderType && - m_Platform == platform && - m_Device == device && - m_Shared == shared) - { - return ok; - } - - if (!m_Renderer.get() || (m_Renderer->RendererType() != renderType)) + if (!m_Renderer.get() || + !m_Renderer->Ok() || + m_Renderer->RendererType() != renderType || + m_Platform != platform || + m_Device != device || + m_Shared != shared) { EmberReport emberReport; vector errorReport; diff --git a/Source/Fractorium/Fractorium.rc b/Source/Fractorium/Fractorium.rc index e8d6d0fde253aaff71c2ece2f05fecac62e8d2cc..1de293964dd67bf03287b0d7b037c89fb6154138 100644 GIT binary patch delta 58 zcmcbod{23U8waZ)gARkiWN!{#2y1gK2QxFXA%oszc`nJx0=#0IH*x=Cgb8du!z;uB E0G;m*y8r+H delta 62 zcmcbod{23U8waZagARk`WN!{#2y1gK2QxE}sRtBP