Merge pull request #94 from d3cod3/0.7.3-pre-release

0.7.3 pre release published

Author: d3cod3

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Mosaic CHANGELOG
 
+### 0.7.3
+
+- **update** : switched to pugiXML, added ofxVP xml engine based on pugiXML
+- **addition** : added internal Fft implementation, reduced addons dependencies
+- **addition** : added A-Chaos non-linear strange attractors library
+- **addition** : added OrderedMap class, original code from Memo Akten, updated for ofxVP
+- **code cleaning** : added std:: namespace where needed ( readability )
+- **addition** : added new object category GENERATIVE, whit his first new object, **strange attractors**
+- **update** : standard texture resolution set at HD res. 1920x1080 ( it was time )
+
 ### 0.7.2
 
 - **addition** : Added new sound objects, **quantizer**, **parametric eq**, **address sequencer**, **polyphonic oscillator**, **summing mixer**

Mosaic.qbs

@@ -30,7 +30,8 @@ Project{
         ]
 
         of.addons: [
-            'ofxInfiniteCanvas','ofxVisualProgramming'
+            'ofxVisualProgramming',
+            'ofxInfiniteCanvas','ofxXmlSettings'
         ]
 
         // additional flags for the project. the of module sets some

README.md

@@ -102,8 +102,6 @@ Mosaic, ofxVisualProgramming, openframeworks, linux, macOS, windows, creative-co
 
 #### [ofxFFmpegRecorder](https://github.com/d3cod3/ofxFFmpegRecorder) -- Fork
 
-#### [ofxFft](https://github.com/kylemcdonald/ofxFft)
-
 #### [ofxGLEditor](https://github.com/Akira-Hayasaka/ofxGLEditor)
 
 #### [ofxImGui](https://github.com/d3cod3/ofxImGui) -- Fork
@@ -167,7 +165,6 @@ git clone https://github.com/d3cod3/ofxBTrack
 git clone https://github.com/kylemcdonald/ofxCv
 git clone https://github.com/arturoc/ofxEasing
 git clone https://github.com/d3cod3/ofxFFmpegRecorder
-git clone https://github.com/kylemcdonald/ofxFft
 git clone https://github.com/Akira-Hayasaka/ofxGLEditor
 git clone https://github.com/d3cod3/ofxImGui
 git clone https://github.com/d3cod3/ofxInfiniteCanvas

addons.make

@@ -1,2 +1,3 @@
 ofxInfiniteCanvas
 ofxVisualProgramming
+ofxXmlSettings

addons.txt

@@ -13,7 +13,7 @@ ofxBTrack				https://github.com/d3cod3/ofxBTrack					master
 ofxCv					https://github.com/kylemcdonald/ofxCv				master
 ofxEasing				https://github.com/arturoc/ofxEasing				master
 ofxFFmpegRecorder		https://github.com/d3cod3/ofxFFmpegRecorder			master
-ofxFft					https://github.com/kylemcdonald/ofxFft				master
+ofxGlEditor             https://github.com/Akira-Hayasaka/ofxGLEditor       master
 ofxImGui				https://github.com/d3cod3/ofxImGui					master
 ofxInfiniteCanvas		https://github.com/d3cod3/ofxInfiniteCanvas			master
 ofxLua					https://github.com/danomatika/ofxLua				master
@@ -23,6 +23,7 @@ ofxNDI					https://github.com/d3cod3/ofxNDI					NDI5
 ofxOpenDHT              https://github.com/d3cod3/ofxOpenDHT                master
 ofxPd					https://github.com/danomatika/ofxPd					master
 ofxPDSP					https://github.com/d3cod3/ofxPDSP					master
+ofxScheme               https://github.com/d3cod3/ofxScheme                 master  
 ofxSyphon				https://github.com/d3cod3/ofxSyphon				    master
 ofxTimeline				https://github.com/d3cod3/ofxTimeline				master
 ofxVisualProgramming	https://github.com/d3cod3/ofxVisualProgramming		master

bin/data/empty_patch.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <github>https://github.com/d3cod3/mosaic</github>
 <www>https://mosaic.d3cod3.org</www>
-<release>072</release>
+<release>073</release>
 <settings>
     <output_width>1280</output_width>
     <output_height>720</output_height>

bin/data/release.txt

@@ -1 +1 @@
-0.7.2
+0.7.3

src/TextEditor.cpp

@@ -250,8 +250,10 @@ void TextEditor::Advance(Coordinates & aCoordinates) const
 
 void TextEditor::DeleteRange(const Coordinates & aStart, const Coordinates & aEnd)
 {
+#ifndef OFXVP_DEBUG
     assert(aEnd >= aStart);
     assert(!mReadOnly);
+#endif
 
     //printf("D(%d.%d)-(%d.%d)\n", aStart.mLine, aStart.mColumn, aEnd.mLine, aEnd.mColumn);
 
@@ -290,13 +292,17 @@ void TextEditor::DeleteRange(const Coordinates & aStart, const Coordinates & aEn
 
 int TextEditor::InsertTextAt(Coordinates& /* inout */ aWhere, const char * aValue)
 {
+    #ifndef OFXVP_DEBUG
     assert(!mReadOnly);
+    #endif
 
     int cindex = GetCharacterIndex(aWhere);
     int totalLines = 0;
     while (*aValue != '\0')
     {
+        #ifndef OFXVP_DEBUG
         assert(!mLines.empty());
+        #endif
 
         if (*aValue == '\r')
         {
@@ -339,7 +345,10 @@ int TextEditor::InsertTextAt(Coordinates& /* inout */ aWhere, const char * aValu
 
 void TextEditor::AddUndo(UndoRecord& aValue)
 {
+#ifndef OFXVP_DEBUG
     assert(!mReadOnly);
+#endif
+
     //printf("AddUndo: (@%d.%d) +\'%s' [%d.%d .. %d.%d], -\'%s', [%d.%d .. %d.%d] (@%d.%d)\n",
     //	aValue.mBefore.mCursorPosition.mLine, aValue.mBefore.mCursorPosition.mColumn,
     //	aValue.mAdded.c_str(), aValue.mAddedStart.mLine, aValue.mAddedStart.mColumn, aValue.mAddedEnd.mLine, aValue.mAddedEnd.mColumn,
@@ -605,9 +614,11 @@ bool TextEditor::IsOnWordBoundary(const Coordinates & aAt) const
 
 void TextEditor::RemoveLine(int aStart, int aEnd)
 {
+#ifndef OFXVP_DEBUG
     assert(!mReadOnly);
     assert(aEnd >= aStart);
     assert(mLines.size() > (size_t)(aEnd - aStart));
+#endif
 
     ErrorMarkers etmp;
     for (auto& i : mErrorMarkers)
@@ -629,15 +640,19 @@ void TextEditor::RemoveLine(int aStart, int aEnd)
     mBreakpoints = std::move(btmp);
 
     mLines.erase(mLines.begin() + aStart, mLines.begin() + aEnd);
+    #ifndef OFXVP_DEBUG
     assert(!mLines.empty());
+    #endif
 
     mTextChanged = true;
 }
 
 void TextEditor::RemoveLine(int aIndex)
 {
+    #ifndef OFXVP_DEBUG
     assert(!mReadOnly);
     assert(mLines.size() > 1);
+    #endif
 
     ErrorMarkers etmp;
     for (auto& i : mErrorMarkers)
@@ -659,14 +674,18 @@ void TextEditor::RemoveLine(int aIndex)
     mBreakpoints = std::move(btmp);
 
     mLines.erase(mLines.begin() + aIndex);
+    #ifndef OFXVP_DEBUG
     assert(!mLines.empty());
+    #endif
 
     mTextChanged = true;
 }
 
 TextEditor::Line& TextEditor::InsertLine(int aIndex)
 {
+    #ifndef OFXVP_DEBUG
     assert(!mReadOnly);
+    #endif
 
     auto& result = *mLines.insert(mLines.begin() + aIndex, Line());
 
@@ -930,7 +949,9 @@ void TextEditor::RenderInternal(const char* aTitle)
         mPalette[i] = ImGui::ColorConvertFloat4ToU32(color);
     }
 
+#ifndef OFXVP_DEBUG
     assert(mLineBuffer.empty());
+#endif
 
     auto contentSize = ImGui::GetContentRegionAvail() - ImGui::GetCursorPos();
     auto drawList = ImGui::GetWindowDrawList();
@@ -974,7 +995,9 @@ void TextEditor::RenderInternal(const char* aTitle)
             float sstart = -1.0f;
             float ssend = -1.0f;
 
+            #ifndef OFXVP_DEBUG
             assert(mState.mSelectionStart <= mState.mSelectionEnd);
+            #endif
             if (mState.mSelectionStart <= lineEndCoord)
                 sstart = mState.mSelectionStart > lineStartCoord ? TextDistanceToLineStart(mState.mSelectionStart) : 0.0f;
             if (mState.mSelectionEnd > lineStartCoord)
@@ -1551,7 +1574,9 @@ void TextEditor::SetTextLines(const std::vector<std::string> & aLines)
 
 void TextEditor::EnterCharacter(ImWchar aChar, bool aShift)
 {
+    #ifndef OFXVP_DEBUG
     assert(!mReadOnly);
+    #endif
 
     UndoRecord u;
 
@@ -1658,7 +1683,9 @@ void TextEditor::EnterCharacter(ImWchar aChar, bool aShift)
     auto coord = GetActualCursorCoordinates();
     u.mAddedStart = coord;
 
+    #ifndef OFXVP_DEBUG
     assert(!mLines.empty());
+    #endif
 
     if (aChar == '\n')
     {
@@ -1823,7 +1850,9 @@ void TextEditor::InsertText(const char * aValue)
 
 void TextEditor::DeleteSelection()
 {
+    #ifndef OFXVP_DEBUG
     assert(mState.mSelectionEnd >= mState.mSelectionStart);
+    #endif
 
     if (mState.mSelectionEnd == mState.mSelectionStart)
         return;
@@ -1863,7 +1892,9 @@ void TextEditor::MoveUp(int aAmount, bool aSelect)
 
 void TextEditor::MoveDown(int aAmount, bool aSelect)
 {
+    #ifndef OFXVP_DEBUG
     assert(mState.mCursorPosition.mColumn >= 0);
+    #endif
     auto oldPos = mState.mCursorPosition;
     mState.mCursorPosition.mLine = std::max(0, std::min((int)mLines.size() - 1, mState.mCursorPosition.mLine + aAmount));
 
@@ -1940,7 +1971,9 @@ void TextEditor::MoveLeft(int aAmount, bool aSelect, bool aWordMode)
 
     mState.mCursorPosition = Coordinates(line, GetCharacterColumn(line, cindex));
 
+    #ifndef OFXVP_DEBUG
     assert(mState.mCursorPosition.mColumn >= 0);
+    #endif
     if (aSelect)
     {
         if (oldPos == mInteractiveStart)
@@ -2096,7 +2129,9 @@ void TextEditor::MoveEnd(bool aSelect)
 
 void TextEditor::Delete()
 {
+    #ifndef OFXVP_DEBUG
     assert(!mReadOnly);
+    #endif
 
     if (mLines.empty())
         return;
@@ -2154,7 +2189,9 @@ void TextEditor::Delete()
 
 void TextEditor::Backspace()
 {
+    #ifndef OFXVP_DEBUG
     assert(!mReadOnly);
+    #endif
 
     if (mLines.empty())
         return;
@@ -2901,8 +2938,10 @@ TextEditor::UndoRecord::UndoRecord(
     , mAdded(aAdded)
     , mRemoved(aRemoved)
 {
+    #ifndef OFXVP_DEBUG
     assert(mAddedStart <= mAddedEnd);
     assert(mRemovedStart <= mRemovedEnd);
+    #endif
 }
 
 void TextEditor::UndoRecord::Undo(TextEditor * aEditor)

src/config.h

@@ -33,14 +33,14 @@
 #pragma mark once
 
 #define PACKAGE	"Mosaic"
-#define	VERSION	"0.7.2"
-#define VERSION_GRAPHIC "072"
+#define	VERSION	"0.7.3"
+#define VERSION_GRAPHIC "073"
 #define DESCRIPTION "Live Visual Patching Creative-Coding Platform"
 #define MOSAIC_WWW "https://mosaic.d3cod3.org/"
 #define MOSAIC_DEVELOPERS "Emanuele Mazza, Daan de Lange"
 #define TAGS "mosaic,openframeworks,macos,linux,windows,creative-coding,video,audio,graphics,live-coding,visual-programming,creative-coding,transmedia"
 
-#define WINDOW_TITLE "Mosaic 0.7.2"
+#define WINDOW_TITLE "Mosaic 0.7.3"
 #define WINDOW_START_WIDTH 1280
 #define WINDOW_START_HEIGHT 720