Skip to content

Commit 3377442

Browse files
committed
a12 added SyphonClientTextureProjector script, and made it so that SyphonClientTexture adds the mainTexture on all materials on a gameObject, not just the first
1 parent 33842fa commit 3377442

22 files changed

Lines changed: 280 additions & 48 deletions

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

Lines changed: 34 additions & 10 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 a11
10+
\fs20 \cf0 1.0 Public Beta 2 a12
1111
\fs36 \
1212
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
1313

@@ -30,19 +30,41 @@ Open the .unitypackage to import to an existing project, or simply create a new
3030
\
3131
Add a Syphon.cs to your main camera. this will act as your Syphon manager.\
3232
\
33-
Syphon Server: \
34-
You have two options.\
33+
34+
\b (*For new users*) \
35+
----------------------
36+
\b0 \
37+
38+
\b Syphon Server:
39+
\b0 \
3540
1) if you want to simply output the existing Unity scene camera as a syphon server, add a SyphonServerTexture to any camera in your scene. For basic setups, use this.\
3641
\
37-
2) (*For advanced users*) if you want to output a custom resolution video texture (i.e., 3072x768 for a triplehead, etc) add a SyphonServerTextureCustomResolution to the main camera in your scene. If you want a quick way to use Unity as a control surface, where its GUI is only visible inside the Unity app itself, additionally take a look at the code in ControlSurfaceExample. See the unity scene SyphonServerCustomResolution.unity for a demo.\
38-
\
39-
\
40-
Syphon Client: \
42+
43+
\b Syphon Client:
44+
\b0 \
4145
Add a SyphonClientTexture to any object in your scene.\
4246
On the SyphonClientTexture, in the public inspector fields, add the name and appName of the client you just added.\
47+
48+
\b ----------------------\
49+
50+
\b0 \
4351
\
44-
Take a look at the code in SyphonClientTexture.cs's ApplyTexture() method to see how to add additional functionality- adding the texture to projectors, bump maps, etc.\
52+
53+
\b (*For advanced users*)\
54+
----------------------\
55+
Syphon Server:
56+
\b0 \
57+
if you want to output a custom resolution video texture (i.e., 3072x768 for a triplehead, etc) add a SyphonServerTextureCustomResolution to the main camera in your scene. If you want a quick way to use Unity as a control surface, where its GUI is only visible inside the Unity app itself, additionally take a look at the code in ControlSurfaceExample. See the unity scene SyphonServerCustomResolution.unity for a demo.\
4558
\
59+
60+
\b SyphonClient:
61+
\b0 \
62+
if you want to use a Projector as a Syphon client, add the SyphonClientTextureProjector script to a gameObject that has a Projector on it, and then in its public inspector fields, add the name and appName of the client.\
63+
64+
\b ----------------------\
65+
66+
\b0 \
67+
Take a look at the code in SyphonClientTexture.cs's ApplyTexture() method to see how to add additional functionality- adding the texture to projectors, bump maps, etc.\
4668
\
4769
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ri-2496\pardirnatural\qj
4870
\cf0 Syphon for Unity is published under a BSD license. See the included License.txt file.\
@@ -54,8 +76,10 @@ Syphon for Unity3D - Brian Chasalow (Unity 3D integration and scripting), Tom Bu
5476
\
5577
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ri-2496\pardirnatural\qj
5678

57-
\b \cf0 Release Notes:
58-
\b0 \
79+
\b \cf0 Release Notes:\
80+
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ri-2496\pardirnatural\qj
81+
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\
5983
a11: added a custom resolution syphon example, and fixed a rare threading issue on syphon exit or creation. \
6084
a10: fixed a bug with OnRetireServer crashing with OpenFrameworks servers exiting.\
6185
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/Assembly-CSharp-Editor-vs.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<None Include="Assets\Resources\SyphonShaders\AlphaTest-Glossy01.shader" />
5757
<None Include="Assets\Resources\SyphonShaders\Particle MultiplyDouble.shader" />
5858
<None Include="Assets\Resources\SyphonShaders\Particle AddMultiply.shader" />
59+
<None Include="Assets\Resources\SyphonShaders\SyphonProjector.shader" />
5960
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendDepthtestOff.shader" />
6061
<None Include="Assets\Resources\SyphonShaders\SyphonSkybox.shader" />
6162
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendFront.shader" />

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assembly-CSharp-Editor.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<None Include="Assets\Resources\SyphonShaders\AlphaTest-Glossy01.shader" />
5757
<None Include="Assets\Resources\SyphonShaders\Particle MultiplyDouble.shader" />
5858
<None Include="Assets\Resources\SyphonShaders\Particle AddMultiply.shader" />
59+
<None Include="Assets\Resources\SyphonShaders\SyphonProjector.shader" />
5960
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendDepthtestOff.shader" />
6061
<None Include="Assets\Resources\SyphonShaders\SyphonSkybox.shader" />
6162
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendFront.shader" />
Binary file not shown.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assembly-CSharp-firstpass-vs.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<Compile Include="Assets\Plugins\SyphonObject\SyphonClientObject.cs" />
5050
<Compile Include="Assets\Plugins\SyphonObject\SyphonServerObject.cs" />
5151
<Compile Include="Assets\Plugins\SyphonTexture-AdvancedUsers\ControlSurfaceExample.cs" />
52+
<Compile Include="Assets\Plugins\SyphonTexture-AdvancedUsers\SyphonClientTextureProjector.cs" />
5253
<Compile Include="Assets\Plugins\SyphonTexture-AdvancedUsers\SyphonServerTextureCustomResolution.cs" />
5354
<Compile Include="Assets\Plugins\SyphonTexture\SyphonClientTexture.cs" />
5455
<Compile Include="Assets\Plugins\SyphonTexture\SyphonServerTexture.cs" />
@@ -62,6 +63,7 @@
6263
<None Include="Assets\Resources\SyphonShaders\AlphaTest-Glossy01.shader" />
6364
<None Include="Assets\Resources\SyphonShaders\Particle MultiplyDouble.shader" />
6465
<None Include="Assets\Resources\SyphonShaders\Particle AddMultiply.shader" />
66+
<None Include="Assets\Resources\SyphonShaders\SyphonProjector.shader" />
6567
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendDepthtestOff.shader" />
6668
<None Include="Assets\Resources\SyphonShaders\SyphonSkybox.shader" />
6769
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendFront.shader" />

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assembly-CSharp-firstpass.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<Compile Include="Assets\Plugins\SyphonObject\SyphonClientObject.cs" />
5050
<Compile Include="Assets\Plugins\SyphonObject\SyphonServerObject.cs" />
5151
<Compile Include="Assets\Plugins\SyphonTexture-AdvancedUsers\ControlSurfaceExample.cs" />
52+
<Compile Include="Assets\Plugins\SyphonTexture-AdvancedUsers\SyphonClientTextureProjector.cs" />
5253
<Compile Include="Assets\Plugins\SyphonTexture-AdvancedUsers\SyphonServerTextureCustomResolution.cs" />
5354
<Compile Include="Assets\Plugins\SyphonTexture\SyphonClientTexture.cs" />
5455
<Compile Include="Assets\Plugins\SyphonTexture\SyphonServerTexture.cs" />
@@ -62,6 +63,7 @@
6263
<None Include="Assets\Resources\SyphonShaders\AlphaTest-Glossy01.shader" />
6364
<None Include="Assets\Resources\SyphonShaders\Particle MultiplyDouble.shader" />
6465
<None Include="Assets\Resources\SyphonShaders\Particle AddMultiply.shader" />
66+
<None Include="Assets\Resources\SyphonShaders\SyphonProjector.shader" />
6567
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendDepthtestOff.shader" />
6668
<None Include="Assets\Resources\SyphonShaders\SyphonSkybox.shader" />
6769
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendFront.shader" />
Binary file not shown.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assembly-UnityScript-firstpass-vs.unityproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<None Include="Assets\Resources\SyphonShaders\AlphaTest-Glossy01.shader" />
5656
<None Include="Assets\Resources\SyphonShaders\Particle MultiplyDouble.shader" />
5757
<None Include="Assets\Resources\SyphonShaders\Particle AddMultiply.shader" />
58+
<None Include="Assets\Resources\SyphonShaders\SyphonProjector.shader" />
5859
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendDepthtestOff.shader" />
5960
<None Include="Assets\Resources\SyphonShaders\SyphonSkybox.shader" />
6061
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendFront.shader" />
Binary file not shown.

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assembly-UnityScript-firstpass.unityproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<None Include="Assets\Resources\SyphonShaders\AlphaTest-Glossy01.shader" />
5656
<None Include="Assets\Resources\SyphonShaders\Particle MultiplyDouble.shader" />
5757
<None Include="Assets\Resources\SyphonShaders\Particle AddMultiply.shader" />
58+
<None Include="Assets\Resources\SyphonShaders\SyphonProjector.shader" />
5859
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendDepthtestOff.shader" />
5960
<None Include="Assets\Resources\SyphonShaders\SyphonSkybox.shader" />
6061
<None Include="Assets\Resources\SyphonShaders\Particle Alpha BlendFront.shader" />

0 commit comments

Comments
 (0)