Skip to content

Commit aa712b6

Browse files
committed
a13 - fix for rare SyphonClientObject rendering issue
1 parent 3377442 commit aa712b6

37 files changed

+55
-21
lines changed

Syphon Implementations/Unity3D/Unity3D-3_5/Read Me.rtf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
\f0\fs36 \cf0 Syphon for Unity Pro 4.0 \
88
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
99

10-
\fs20 \cf0 1.0 Public Beta 2 a12
10+
\fs20 \cf0 1.0 Public Beta 2 a13
1111
\fs36 \
1212
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
1313

@@ -79,7 +79,10 @@ Syphon for Unity3D - Brian Chasalow (Unity 3D integration and scripting), Tom Bu
7979
\b \cf0 Release Notes:\
8080
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ri-2496\pardirnatural\qj
8181
82-
\b0 \cf0 a12: added SyphonClientTextureProjector script, and made it so that SyphonClientTexture adds the mainTexture on all materials on a gameObject, not just the first\
82+
\b0 \cf0 a13: fix SyphonClientObject issue with not rendering under rare instances due to cachedTexID == 0
83+
\b \
84+
85+
\b0 a12: added SyphonClientTextureProjector script, and made it so that SyphonClientTexture adds the mainTexture on all materials on a gameObject, not just the first\
8386
a11: added a custom resolution syphon example, and fixed a rare threading issue on syphon exit or creation. \
8487
a10: fixed a bug with OnRetireServer crashing with OpenFrameworks servers exiting.\
8588
a9: fixed some Unity 4.2 texture creation and 64 bit issues. uses custom Syphon framework with multithreading changes.\

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonObject/SyphonClientObject.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public void DefineSyphonClient(SyphonServerObject server){
9595
RenderTexture.active = attachedTexture;
9696
GL.Clear(false, true, new Color(0, 0, 0, 0));
9797
RenderTexture.active = null;
98+
cachedTexID = -1;
9899
}
99100

100101
InitSyphonClient();

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Headers.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Resources.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Resources/English.lproj.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Resources/Info.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
<key>DTCompiler</key>
2626
<string>com.apple.compilers.llvm.clang.1_0</string>
2727
<key>DTPlatformBuild</key>
28-
<string>4H1003</string>
28+
<string>4H1503</string>
2929
<key>DTPlatformVersion</key>
3030
<string>GM</string>
3131
<key>DTSDKBuild</key>
3232
<string>12D75</string>
3333
<key>DTSDKName</key>
3434
<string>macosx10.8</string>
3535
<key>DTXcode</key>
36-
<string>0462</string>
36+
<string>0463</string>
3737
<key>DTXcodeBuild</key>
38-
<string>4H1003</string>
38+
<string>4H1503</string>
3939
</dict>
4040
</plist>

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Versions.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Versions/A.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Versions/A/Headers.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Versions/A/Resources.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Versions/A/Resources/English.lproj.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Versions/A/Resources/Info.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
<key>DTCompiler</key>
2626
<string>com.apple.compilers.llvm.clang.1_0</string>
2727
<key>DTPlatformBuild</key>
28-
<string>4H1003</string>
28+
<string>4H1503</string>
2929
<key>DTPlatformVersion</key>
3030
<string>GM</string>
3131
<key>DTSDKBuild</key>
3232
<string>12D75</string>
3333
<key>DTSDKName</key>
3434
<string>macosx10.8</string>
3535
<key>DTXcode</key>
36-
<string>0462</string>
36+
<string>0463</string>
3737
<key>DTXcodeBuild</key>
38-
<string>4H1003</string>
38+
<string>4H1503</string>
3939
</dict>
4040
</plist>

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Versions/Current.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Versions/Current/Headers.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Versions/Current/Resources.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Versions/Current/Resources/English.lproj.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Frameworks/Syphon.framework/Versions/Current/Resources/Info.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
<key>DTCompiler</key>
2626
<string>com.apple.compilers.llvm.clang.1_0</string>
2727
<key>DTPlatformBuild</key>
28-
<string>4H1003</string>
28+
<string>4H1503</string>
2929
<key>DTPlatformVersion</key>
3030
<string>GM</string>
3131
<key>DTSDKBuild</key>
3232
<string>12D75</string>
3333
<key>DTSDKName</key>
3434
<string>macosx10.8</string>
3535
<key>DTXcode</key>
36-
<string>0462</string>
36+
<string>0463</string>
3737
<key>DTXcodeBuild</key>
38-
<string>4H1003</string>
38+
<string>4H1503</string>
3939
</dict>
4040
</plist>

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Info.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
<key>DTCompiler</key>
2626
<string></string>
2727
<key>DTPlatformBuild</key>
28-
<string>4H1003</string>
28+
<string>4H1503</string>
2929
<key>DTPlatformVersion</key>
3030
<string>GM</string>
3131
<key>DTSDKBuild</key>
3232
<string>12D75</string>
3333
<key>DTSDKName</key>
3434
<string>macosx10.8</string>
3535
<key>DTXcode</key>
36-
<string>0462</string>
36+
<string>0463</string>
3737
<key>DTXcodeBuild</key>
38-
<string>4H1003</string>
38+
<string>4H1503</string>
3939
</dict>
4040
</plist>

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/MacOS.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Resources.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/Resources/English.lproj.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Read Me.rtf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
\f0\fs36 \cf0 Syphon for Unity Pro 4.0 \
88
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
99

10-
\fs20 \cf0 1.0 Public Beta 2 a12
10+
\fs20 \cf0 1.0 Public Beta 2 a13
1111
\fs36 \
1212
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
1313

@@ -79,7 +79,10 @@ Syphon for Unity3D - Brian Chasalow (Unity 3D integration and scripting), Tom Bu
7979
\b \cf0 Release Notes:\
8080
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ri-2496\pardirnatural\qj
8181
82-
\b0 \cf0 a12: added SyphonClientTextureProjector script, and made it so that SyphonClientTexture adds the mainTexture on all materials on a gameObject, not just the first\
82+
\b0 \cf0 a13: fix SyphonClientObject issue with not rendering under rare instances due to cachedTexID == 0
83+
\b \
84+
85+
\b0 a12: added SyphonClientTextureProjector script, and made it so that SyphonClientTexture adds the mainTexture on all materials on a gameObject, not just the first\
8386
a11: added a custom resolution syphon example, and fixed a rare threading issue on syphon exit or creation. \
8487
a10: fixed a bug with OnRetireServer crashing with OpenFrameworks servers exiting.\
8588
a9: fixed some Unity 4.2 texture creation and 64 bit issues. uses custom Syphon framework with multithreading changes.\

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Resources/SyphonShaders/SyphonProjector.shader.meta

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/SyphonUnityExample-csharp.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Global
2323
GlobalSection(SolutionProperties) = preSolution
2424
HideSolutionNode = FALSE
2525
EndGlobalSection
26-
GlobalSection(MonoDevelopProperties) = preSolution
26+
GlobalSection(MonoDevelopProperties) = preSolution
2727
StartupItem = Assembly-CSharp.csproj
2828
Policies = $0
2929
$0.TextStylePolicy = $1

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/SyphonUnityExample.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Global
2929
GlobalSection(SolutionProperties) = preSolution
3030
HideSolutionNode = FALSE
3131
EndGlobalSection
32-
GlobalSection(MonoDevelopProperties) = preSolution
32+
GlobalSection(MonoDevelopProperties) = preSolution
3333
StartupItem = Assembly-CSharp.csproj
3434
Policies = $0
3535
$0.TextStylePolicy = $1

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/SyphonUnityExample.userprefs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<Properties>
22
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
3-
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Plugins/SyphonTexture/SyphonClientTexture.cs">
3+
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Plugins/SyphonObject/SyphonClientObject.cs">
44
<Files>
5-
<File FileName="Assets/Plugins/SyphonTexture-AdvancedUsers/SyphonClientTextureProjector.cs" Line="38" Column="1" />
6-
<File FileName="Assets/Plugins/SyphonTexture/SyphonClientTexture.cs" Line="41" Column="20" />
5+
<File FileName="Assets/Plugins/SyphonTexture-AdvancedUsers/SyphonClientTextureProjector.cs" Line="1" Column="1" />
6+
<File FileName="Assets/Plugins/SyphonTexture/SyphonClientTexture.cs" Line="50" Column="66" />
7+
<File FileName="Assets/Editor/SyphonEditor.cs" Line="1" Column="1" />
8+
<File FileName="Assets/Editor/SyphonHelper.cs" Line="38" Column="16" />
9+
<File FileName="Assets/Plugins/SyphonObject/SyphonClientObject.cs" Line="98" Column="21" />
10+
<File FileName="Assets/Plugins/SyphonTexture/SyphonServerTexture.cs" Line="1" Column="1" />
711
</Files>
812
</MonoDevelop.Ide.Workbench>
913
<MonoDevelop.Ide.DebuggingService.Breakpoints>

0 commit comments

Comments
 (0)