Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Livecode plugin #1

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1236423
CommandLineArgs parser : config file
totetmatt Sep 5, 2024
9b79b1e
All LC option
totetmatt Sep 6, 2024
64e7124
Make Resizable
totetmatt Sep 6, 2024
19c7e4e
Network Basic
totetmatt Sep 8, 2024
f38af46
Minimalistic sender
totetmatt Sep 15, 2024
2566725
SetupDialogWorking
totetmatt Sep 19, 2024
f8b6d6a
Complete Dialog setup + Working sender grabber
totetmatt Sep 20, 2024
147c418
Midi sender only + review parsing json + Network Name display
totetmatt Sep 21, 2024
39a03ec
Improvement
totetmatt Sep 22, 2024
93f2190
revert _strdup as non linux ok
totetmatt Sep 22, 2024
e942a01
Merge branch 'master' of https://github.com/livecode-demoscene/Bonzom…
totetmatt Sep 23, 2024
eb2ba16
Sync time from sender in grabber mode
totetmatt Sep 26, 2024
1a0df84
Borderless + FFT Initial preprocessing review
totetmatt Sep 28, 2024
1a29bf8
Add FFT Option
totetmatt Sep 28, 2024
1e45184
Fix aweight
totetmatt Sep 29, 2024
37ac63b
Grabber ping back
totetmatt Sep 30, 2024
98f4732
Explicit FFT input and FFT output size
totetmatt Sep 30, 2024
e271596
First shader from grabber is compiled
totetmatt Sep 30, 2024
9348d9a
remove travis
Gargaj Oct 5, 2024
87dbe10
Resize windwos
totetmatt Oct 6, 2024
3979482
Dx9/11 resize
totetmatt Oct 7, 2024
ee6dbac
Default config
totetmatt Oct 7, 2024
2bebdc6
Merge branch 'Gargaj:master' into master
totetmatt Oct 10, 2024
e431780
BugFix parsing network
totetmatt Oct 8, 2024
4924436
CommandArgs Override
totetmatt Oct 12, 2024
76b797d
borderless
totetmatt Oct 12, 2024
8c9a0ea
COmmandLineArgs parsing compatible with launcher.exe
totetmatt Oct 13, 2024
f15c663
Default values
totetmatt Oct 14, 2024
bb900fa
MacOSX:Code Entitlements
totetmatt Oct 15, 2024
f80a5e3
AudioSelect
totetmatt Oct 20, 2024
9b89fd1
network enhancement - retry on disconnect ?
totetmatt Dec 9, 2024
979490d
Merge branch 'master' of https://github.com/livecode-demoscene/Bonzom…
totetmatt Dec 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,23 @@ if (WIN32 AND BONZOMATIC_NDI)
set(BZC_PROJECT_LIBS ${BZC_PROJECT_LIBS} "${NDI_SDK_DIR}/Lib/x86/Processing.NDI.Lib.x86.lib")
endif ()
endif ()
##############################################################################
# MONGOOSE NETWORK
set(BZC_PROJECT_INCLUDES ${BZC_PROJECT_INCLUDES} ${CMAKE_SOURCE_DIR}/external/mongoose)
set(MONGOOSE_SRCS
${CMAKE_SOURCE_DIR}/external/mongoose/mongoose.c
)
add_library(bzc_mongoose STATIC ${MONGOOSE_SRCS})

target_include_directories(bzc_mongoose PUBLIC ${CMAKE_SOURCE_DIR}/external/mongoose)
if (MSVC)
target_compile_options(bzc_mongoose PUBLIC "$<$<CONFIG:Release>:/MT>")
endif ()
set(BZC_PROJECT_LIBS ${BZC_PROJECT_LIBS} bzc_mongoose)


set(BZC_NETWORK_SRCS ${CMAKE_SOURCE_DIR}/src/platform_common/Network.cpp)
source_group("Bonzomatic\\Network" FILES ${BZC_NETWORK_SRCS})

##############################################################################
# SCINTILLA
Expand Down Expand Up @@ -419,7 +436,7 @@ else ()
endif ()
source_group("Bonzomatic\\Capture" FILES ${BZC_CAPTURE_SRCS})

set(BZC_PROJECT_SRCS ${BZC_PROJECT_SRCS} ${BZC_PLATFORM_SRCS} ${BZC_RESOURCES_DATA} ${BZC_CAPTURE_SRCS})
set(BZC_PROJECT_SRCS ${BZC_PROJECT_SRCS} ${BZC_PLATFORM_SRCS} ${BZC_RESOURCES_DATA} ${BZC_CAPTURE_SRCS} ${BZC_NETWORK_SRCS})

set(BZC_PROJECT_INCLUDES ${CMAKE_SOURCE_DIR}/src ${BZC_PROJECT_INCLUDES})

Expand Down Expand Up @@ -452,6 +469,7 @@ if (WIN32)
# MacOS
elseif (APPLE)
set_target_properties(${BZC_EXE_NAME} PROPERTIES MACOSX_BUNDLE ON MACOSX_BUNDLE_BUNDLE_NAME "Bonzomatic" MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/data/macosx/MacOSXBundleInfo.plist.in)
set_target_properties(${BZC_EXE_NAME} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_SOURCE_DIR}/data/macosx/entitlements.plist)
if (BONZOMATIC_TOUCHBAR)
target_compile_definitions(${BZC_EXE_NAME} PUBLIC -DBONZOMATIC_ENABLE_TOUCHBAR)
endif ()
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

[![Github workflow status](https://github.com/Gargaj/Bonzomatic/actions/workflows/main.yml/badge.svg)](https://github.com/Gargaj/Bonzomatic/actions/workflows/main.yml)
[![Appveyor build status](https://ci.appveyor.com/api/projects/status/ix6fwi6nym1tu4e7?svg=true)](https://ci.appveyor.com/project/Gargaj/bonzomatic)
[![Travis build status](https://img.shields.io/travis/Gargaj/Bonzomatic?logo=travis)](https://travis-ci.org/Gargaj/Bonzomatic)

## What's this?
This is a live-coding tool, where you can write a 2D fragment/pixel shader while it is running in the background.
Expand Down
18 changes: 18 additions & 0 deletions data/macosx/entitlements.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
<key>com.apple.security.device.audio-input</key>
<true/>
<key>com.apple.security.personal-information.addressbook</key>
<true/>
<key>com.apple.security.get-task-allow</key>
<true/>
</dict>
</plist>
Binary file added data/windows/SetupDialog.aps
Binary file not shown.
114 changes: 70 additions & 44 deletions data/windows/SetupDialog.rc
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,71 @@
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// Hungarian (Hungary) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN)
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
#pragma code_page(1250)

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE
BEGIN
"resource.h\0"
END

2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END

3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END

#endif // APSTUDIO_INVOKED


/////////////////////////////////////////////////////////////////////////////
//
// Icon
//

// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_APPLICATION ICON "icon.ico"

#endif // Hungarian (Hungary) resources
/////////////////////////////////////////////////////////////////////////////


/////////////////////////////////////////////////////////////////////////////
// Neutral resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#pragma code_page(1250)
#pragma code_page(1252)

/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//

IDD_SETUP DIALOGEX 0, 0, 186, 104
IDD_SETUP DIALOGEX 0, 0, 187, 225
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "ümlaüt design"
CAPTION "�mla�t design"
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
DEFPUSHBUTTON "Run",IDOK,60,84,116,14
PUSHBUTTON "Cancel",IDCANCEL,6,84,50,14
DEFPUSHBUTTON "Run",IDOK,62,196,116,14
PUSHBUTTON "Cancel",IDCANCEL,8,196,50,14
RTEXT "Resolution:",IDC_STATIC,7,22,65,10
COMBOBOX IDC_RESOLUTION,83,20,91,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
RTEXT "Fullscreen:",IDC_STATIC,7,36,65,10
Expand All @@ -40,6 +86,16 @@ BEGIN
CONTROL "",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,83,50,9,10
RTEXT "Audio source:",IDC_STATIC,6,64,65,10
COMBOBOX IDC_AUDIOSOURCE,82,62,91,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
RTEXT "Network:",IDC_STATIC,6,79,65,10
CONTROL "",IDC_NETWORK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,83,79,16,10
RTEXT "Server:",IDC_STATIC,46,110,25,8
RTEXT "Roomname:",IDC_STATIC,32,123,39,8
RTEXT "Nickname:",IDC_STATIC,37,138,34,8
EDITTEXT IDC_NETWORK_SERVER,83,108,90,14,ES_AUTOHSCROLL | WS_DISABLED
EDITTEXT IDC_NETWORK_ROOMNAME,83,123,90,14,ES_AUTOHSCROLL | WS_DISABLED
EDITTEXT IDC_NETWORK_NICKNAME,83,138,90,14,ES_AUTOHSCROLL | WS_DISABLED
COMBOBOX IDC_NETWORK_MODE,83,89,91,125,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
RTEXT "Mode:",IDC_STATIC,50,93,21,8
END


Expand All @@ -53,57 +109,27 @@ GUIDELINES DESIGNINFO
BEGIN
IDD_SETUP, DIALOG
BEGIN
BOTTOMMARGIN, 89
RIGHTMARGIN, 186
VERTGUIDE, 71
VERTGUIDE, 83
BOTTOMMARGIN, 210
HORZGUIDE, 20
END
END
#endif // APSTUDIO_INVOKED

#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////


/////////////////////////////////////////////////////////////////////////////
// Hungarian (Hungary) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN)
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
#pragma code_page(1250)

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
// AFX_DIALOG_LAYOUT
//

1 TEXTINCLUDE
IDD_SETUP AFX_DIALOG_LAYOUT
BEGIN
"resource.h\0"
0
END

2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END

3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END

#endif // APSTUDIO_INVOKED


/////////////////////////////////////////////////////////////////////////////
//
// Icon
//

// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_APPLICATION ICON "icon.ico"
#endif // Hungarian (Hungary) resources
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////


Expand Down
11 changes: 8 additions & 3 deletions data/windows/resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -1160,11 +1160,13 @@
#define IDC_COMBO2 1002
#define IDC_MULTISAMPLE 1002
#define IDC_RESOLUTION2 1002
#define IDC_NETWORK_MODE 1002
#define IDC_CHECK1 1003
#define IDC_FULLSCREEN 1003
#define IDC_CHECK2 1004
#define IDC_ONTOP 1004
#define IDC_FULLSCREEN2 1004
#define IDC_NETWORK 1004
#define IDC_CHECK3 1005
#define IDC_VSYNC 1005
#define IDC_COMBO3 1006
Expand All @@ -1174,6 +1176,10 @@
#define IDC_AUDIOSOURCE 1006
#define IDC_EDIT1 1007
#define IDC_RANDOMSEED 1007
#define IDC_NETWORK_SERVER 1007
#define IDC_NETWORK_ROOMNAME 1008
#define IDC_NETWORK_NICKNAME 1009
#define IDC_NETWORK_GROUP 1010
#define CF_GDIOBJLAST 0x03FF
#define _WIN32_WINNT_NT4 0x0400
#define _WIN32_IE_IE40 0x0400
Expand Down Expand Up @@ -1520,15 +1526,14 @@
#define PWR_FAIL -1
#define UNICODE_NOCHAR 0xFFFF
#define HTTRANSPARENT -1
#define IDC_STATIC -1

// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102
#define _APS_NEXT_RESOURCE_VALUE 104
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1008
#define _APS_NEXT_CONTROL_VALUE 1011
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
16 changes: 16 additions & 0 deletions external/mongoose/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Copyright (c) 2004-2013 Sergey Lyubka
Copyright (c) 2013-2021 Cesanta Software Limited
All rights reserved

This software is dual-licensed: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation. For the terms of this
license, see <http://www.gnu.org/licenses/>.

You are free to use this software under the terms of the GNU General
Public License, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.

Alternatively, you can license this software under a commercial
license, as set out in <https://mongoose.ws/licensing/>.
Loading
Loading