Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

gamma controls

  • Loading branch information...
commit 1e2930b0713bf6fec1707b5d2e03356a5332c064 1 parent 878ae3c
@elliotwoods authored
View
50 Common/Layer/VoxelLayer.v4p
@@ -1,6 +1,6 @@
<!DOCTYPE PATCH SYSTEM "http://vvvv.org/versions/vvvv45beta27.1.dtd" >
<PATCH nodename="C:\vvvv\HanRiver-VVVV\Common\Layer\VoxelLayer.v4p" filename="C:\vvvv\HanRiver-VVVV\Common\Layer\VoxelLayer.v4p" systemname="VoxelLayer">
- <BOUNDS height="6570" left="2220" top="15975" type="Window" width="14925">
+ <BOUNDS height="6570" left="1395" top="16245" type="Window" width="14925">
</BOUNDS>
<NODE componentmode="Hidden" id="15" nodename="Grid (EX9.Geometry)" systemname="Grid (EX9.Geometry)">
<BOUNDS height="100" left="825" top="3855" type="Node" width="100">
@@ -35,7 +35,7 @@
</PIN>
</NODE>
<NODE componentmode="Hidden" filename="..\Shaders\effects\VoxelMain.fx" id="16" nodename="VoxelMain (EX9.Effect)" systemname="VoxelMain (EX9.Effect)">
- <BOUNDS height="270" left="225" top="4500" type="Node" width="13005">
+ <BOUNDS height="270" left="225" top="4500" type="Node" width="13590">
</BOUNDS>
<PIN pinname="Render State" visible="1">
</PIN>
@@ -83,6 +83,8 @@
</PIN>
<PIN pinname="Enabled" visible="1">
</PIN>
+ <PIN pinname="gamma" visible="1">
+ </PIN>
</NODE>
<LINK dstnodeid="16" dstpinname="Render State" srcnodeid="6" srcpinname="Render State Out">
</LINK>
@@ -99,19 +101,19 @@
</PIN>
</NODE>
<NODE componentmode="InABox" id="18" nodename="IOBox (Enumerations)" systemname="IOBox (Enumerations)">
- <BOUNDS height="0" left="12900" top="3570" type="Node" width="0">
+ <BOUNDS height="0" left="12585" top="3570" type="Node" width="0">
</BOUNDS>
- <BOUNDS height="240" left="12900" top="3570" type="Box" width="1590">
+ <BOUNDS height="240" left="12585" top="3570" type="Box" width="1590">
</BOUNDS>
<PIN pinname="Input Enum" slicecount="1" values="| TFill|">
</PIN>
<PIN encoded="0" pinname="Descriptive Name" slicecount="1" values="Technique">
</PIN>
</NODE>
- <LINK dstnodeid="16" dstpinname="Technique" linkstyle="Bezier" srcnodeid="18" srcpinname="Output Enum">
- <LINKPOINT x="12900" y="4140">
+ <LINK dstnodeid="16" dstpinname="Technique" linkstyle="VHV" srcnodeid="18" srcpinname="Output Enum">
+ <LINKPOINT x="12690" y="4140">
</LINKPOINT>
- <LINKPOINT x="12060" y="4140">
+ <LINKPOINT x="11955" y="4140">
</LINKPOINT>
</LINK>
<NODE componentmode="InABox" id="19" nodename="IOBox (Node)" systemname="IOBox (Node)">
@@ -367,7 +369,7 @@
<LINK dstnodeid="16" dstpinname="XYZ" srcnodeid="37" srcpinname="Input Value">
</LINK>
<NODE componentmode="Hidden" id="38" nodename="R (Value)" systemname="R (Value)">
- <BOUNDS height="100" left="9660" top="3855" type="Node" width="100">
+ <BOUNDS height="100" left="10245" top="3855" type="Node" width="100">
</BOUNDS>
<PIN pinname="Input Value" visible="1">
</PIN>
@@ -407,7 +409,7 @@
</PIN>
</NODE>
<NODE componentmode="Hidden" id="41" nodename="Rotate (Transform)" systemname="Rotate (Transform)">
- <BOUNDS height="100" left="7860" top="3540" type="Node" width="100">
+ <BOUNDS height="100" left="7860" top="3555" type="Node" width="100">
</BOUNDS>
<PIN pinname="Z" pintype="Input" slicecount="1" visible="-1" values="0">
</PIN>
@@ -431,15 +433,15 @@
</PIN>
</NODE>
<LINK dstnodeid="41" dstpinname="X" linkstyle="VHV" srcnodeid="42" srcpinname="X">
- <LINKPOINT x="8115" y="3420">
+ <LINKPOINT x="8115" y="3320">
</LINKPOINT>
- <LINKPOINT x="8235" y="3420">
+ <LINKPOINT x="8235" y="3220">
</LINKPOINT>
</LINK>
<LINK dstnodeid="41" dstpinname="Y" linkstyle="VHV" srcnodeid="42" srcpinname="Y">
- <LINKPOINT x="8700" y="3428">
+ <LINKPOINT x="8700" y="3328">
</LINKPOINT>
- <LINKPOINT x="8505" y="3428">
+ <LINKPOINT x="8505" y="3228">
</LINKPOINT>
</LINK>
<LINK dstnodeid="16" dstpinname="gradient" srcnodeid="41" srcpinname="Transform Out">
@@ -466,8 +468,8 @@
</LINK>
<LINK dstnodeid="43" dstpinname="Z" srcnodeid="40" srcpinname="Y Output Value">
</LINK>
- <NODE systemname="GT (Value)" nodename="GT (Value)" componentmode="Hidden" id="44">
- <BOUNDS type="Node" left="13170" top="4080" width="100" height="100">
+ <NODE componentmode="Hidden" id="44" nodename="GT (Value)" systemname="GT (Value)">
+ <BOUNDS height="100" left="13770" top="4080" type="Node" width="100">
</BOUNDS>
<PIN pinname="Output" visible="1">
</PIN>
@@ -476,12 +478,22 @@
<PIN pinname="Input 2" slicecount="1" values="0.01">
</PIN>
</NODE>
- <LINK srcnodeid="44" srcpinname="Output" dstnodeid="16" dstpinname="Enabled">
+ <LINK dstnodeid="16" dstpinname="Enabled" srcnodeid="44" srcpinname="Output">
</LINK>
- <LINK srcnodeid="27" srcpinname="Y Output Value" dstnodeid="44" dstpinname="Input 1" linkstyle="Bezier" hiddenwhenlocked="1">
- <LINKPOINT x="6405" y="2520">
+ <LINK dstnodeid="44" dstpinname="Input 1" hiddenwhenlocked="1" linkstyle="Bezier" srcnodeid="27" srcpinname="Y Output Value">
+ <LINKPOINT x="6605" y="2520">
</LINKPOINT>
- <LINKPOINT x="13170" y="2520">
+ <LINKPOINT x="13570" y="2520">
</LINKPOINT>
</LINK>
+ <NODE componentmode="Hidden" id="45" nodename="R (Value)" systemname="R (Value)">
+ <BOUNDS height="100" left="8445" top="3855" type="Node" width="100">
+ </BOUNDS>
+ <PIN pinname="Receive String" slicecount="1" values="scene.gamma">
+ </PIN>
+ <PIN pinname="Input Value" visible="1">
+ </PIN>
+ </NODE>
+ <LINK dstnodeid="16" dstpinname="gamma" srcnodeid="45" srcpinname="Input Value">
+ </LINK>
</PATCH>
View
56 Common/Output/Projectors (Fullscreen 5of6).v4p
@@ -1,8 +1,8 @@
<!DOCTYPE PATCH SYSTEM "http://vvvv.org/versions/vvvv45beta27.1.dtd" >
<PATCH nodename="C:\vvvv\HanRiver-VVVV\Common\Output\Projectors (Fullscreen 5of6).v4p" filename="C:\vvvv\HanRiver-VVVV\Common\Output\Projectors (Fullscreenx6).v4p" systemname="Projectors (Fullscreenx6)">
- <BOUNDS height="4935" left="1485" top="14790" type="Window" width="14460">
+ <BOUNDS height="5325" left="1485" top="14790" type="Window" width="14460">
</BOUNDS>
- <NODE componentmode="Hidden" id="78" nodename="Renderer (EX9)" systemname="Renderer (EX9)">
+ <NODE componentmode="InAWindow" id="78" nodename="Renderer (EX9)" systemname="Renderer (EX9)">
<BOUNDS height="270" left="885" top="2160" type="Node" width="10545">
</BOUNDS>
<BOUNDS height="1800" left="885" top="2160" type="Box" width="2400">
@@ -19,6 +19,8 @@
</PIN>
<PIN pinname="Fullscreen" visible="1">
</PIN>
+ <PIN pinname="Is Fullscreen" visible="1">
+ </PIN>
</NODE>
<NODE componentmode="InABox" id="79" nodename="IOBox (Node)" systemname="IOBox (Node)">
<BOUNDS height="0" left="885" top="885" type="Node" width="0">
@@ -168,4 +170,54 @@
</LINK>
<LINK dstnodeid="78" dstpinname="Fullscreen" srcnodeid="87" srcpinname="Inverse Output">
</LINK>
+ <NODE systemname="Change (Animation)" nodename="Change (Animation)" componentmode="Hidden" id="89">
+ <BOUNDS type="Node" left="7425" top="2805" width="100" height="100">
+ </BOUNDS>
+ <PIN pinname="Input" visible="1">
+ </PIN>
+ <PIN pinname="OnChange" visible="1">
+ </PIN>
+ </NODE>
+ <LINK srcnodeid="78" srcpinname="Is Fullscreen" dstnodeid="89" dstpinname="Input">
+ </LINK>
+ <NODE nodename="IOBox (Value Advanced)" componentmode="InABox" id="90" systemname="IOBox (Value Advanced)">
+ <BOUNDS type="Node" left="8130" top="3900" width="0" height="0">
+ </BOUNDS>
+ <BOUNDS type="Box" left="8130" top="3900" width="480" height="480">
+ </BOUNDS>
+ <PIN pinname="Units" slicecount="1" values="||" encoded="0">
+ </PIN>
+ <PIN pinname="Precision" slicecount="1" values="4">
+ </PIN>
+ <PIN pinname="Value Type" slicecount="1" values="Boolean">
+ </PIN>
+ <PIN pinname="Behavior" slicecount="1" values="Bang">
+ </PIN>
+ <PIN pinname="Descriptive Name" slicecount="1" values="|Change fullscreen|" encoded="0">
+ </PIN>
+ <PIN pinname="Y Input Value" visible="1">
+ </PIN>
+ </NODE>
+ <NODE systemname="MonoFlop (Animation)" nodename="MonoFlop (Animation)" componentmode="Hidden" id="91">
+ <BOUNDS type="Node" left="7410" top="3150" width="100" height="100">
+ </BOUNDS>
+ <PIN pinname="Set" visible="1">
+ </PIN>
+ <PIN pinname="Output" visible="1">
+ </PIN>
+ </NODE>
+ <LINK srcnodeid="89" srcpinname="OnChange" dstnodeid="91" dstpinname="Set">
+ </LINK>
+ <NODE systemname="TogEdge (Animation)" nodename="TogEdge (Animation)" componentmode="Hidden" id="92">
+ <BOUNDS type="Node" left="7410" top="3510" width="100" height="100">
+ </BOUNDS>
+ <PIN pinname="Input" visible="1">
+ </PIN>
+ <PIN pinname="Down Edge" visible="1">
+ </PIN>
+ </NODE>
+ <LINK srcnodeid="91" srcpinname="Output" dstnodeid="92" dstpinname="Input">
+ </LINK>
+ <LINK srcnodeid="92" srcpinname="Down Edge" dstnodeid="90" dstpinname="Y Input Value">
+ </LINK>
</PATCH>
View
38 Common/Settings/scene properties.v4p
@@ -512,16 +512,16 @@
<LINKPOINT x="4260" y="1845">
</LINKPOINT>
</LINK>
- <NODE systemname="LFO (Animation)" nodename="LFO (Animation)" componentmode="Hidden" id="36">
- <BOUNDS type="Node" left="4335" top="510" width="100" height="100">
+ <NODE componentmode="Hidden" id="36" nodename="LFO (Animation)" systemname="LFO (Animation)">
+ <BOUNDS height="100" left="4335" top="510" type="Node" width="100">
</BOUNDS>
<PIN pinname="Period" slicecount="1" values="3">
</PIN>
<PIN pinname="Change" visible="1">
</PIN>
</NODE>
- <NODE systemname="AND (Boolean)" nodename="AND (Boolean)" componentmode="Hidden" id="37">
- <BOUNDS type="Node" left="4680" top="930" width="735" height="270">
+ <NODE componentmode="Hidden" id="37" nodename="AND (Boolean)" systemname="AND (Boolean)">
+ <BOUNDS height="270" left="4680" top="930" type="Node" width="735">
</BOUNDS>
<PIN pinname="Input 1" visible="1">
</PIN>
@@ -530,10 +530,34 @@
<PIN pinname="Output" visible="1">
</PIN>
</NODE>
- <LINK srcnodeid="36" srcpinname="Change" dstnodeid="37" dstpinname="Input 1">
+ <LINK dstnodeid="37" dstpinname="Input 1" srcnodeid="36" srcpinname="Change">
</LINK>
- <LINK srcnodeid="30" srcpinname="Output" dstnodeid="37" dstpinname="Input 2">
+ <LINK dstnodeid="37" dstpinname="Input 2" srcnodeid="30" srcpinname="Output">
</LINK>
- <LINK srcnodeid="37" srcpinname="Output" dstnodeid="33" dstpinname="Input 1">
+ <LINK dstnodeid="33" dstpinname="Input 1" srcnodeid="37" srcpinname="Output">
+ </LINK>
+ <NODE componentmode="Hidden" id="38" nodename="S (Value)" systemname="S (Value)">
+ <BOUNDS height="100" left="12975" top="7575" type="Node" width="100">
+ </BOUNDS>
+ <PIN encoded="0" pinname="Send String" slicecount="1" values="scene.gamma">
+ </PIN>
+ <PIN pinname="Input Value">
+ </PIN>
+ </NODE>
+ <NODE componentmode="InABox" id="39" nodename="IOBox (Value Advanced)" systemname="IOBox (Value Advanced)">
+ <BOUNDS height="0" left="12975" top="7065" type="Node" width="0">
+ </BOUNDS>
+ <BOUNDS height="240" left="12975" top="7065" type="Box" width="795">
+ </BOUNDS>
+ <PIN pinname="Y Input Value" slicecount="1" values="0.5">
+ </PIN>
+ <PIN encoded="0" pinname="Units" slicecount="1" values="||">
+ </PIN>
+ <PIN pinname="Precision" slicecount="1" values="4">
+ </PIN>
+ <PIN encoded="0" pinname="Descriptive Name" slicecount="1" values="Gamma">
+ </PIN>
+ </NODE>
+ <LINK dstnodeid="38" dstpinname="Input Value" srcnodeid="39" srcpinname="Y Output Value">
</LINK>
</PATCH>
View
2  Common/Shaders/effects/VoxelMetaball.fx
@@ -35,7 +35,7 @@ float4 PSMetaballs(vs2ps In): COLOR
density /= count;
float existence = (density > 1) * ((1.0f + thickness) - density) / thickness;
float4 output;
- output.rgb = col;
+ output.rgb = pow(col, gamma);
output.a = existence * pixel.active * Alpha;
return output;
}
View
3  Common/Shaders/effects/VoxelUtilities.fxh
@@ -2,6 +2,7 @@
// VOXEL PARAMETERS
// --------------------------------------------------------------------------------------------------
+
texture TexXYZ <string uiname="XYZ";>;
sampler SampNoFilter = sampler_state //sampler for doing the texture-lookup
{
@@ -28,6 +29,7 @@ float4 color1 : COLOR <String uiname="Color 1";> = {1, 1, 1, 1};
float4 color2 : COLOR <String uiname="Color 2";> = {1, 0, 0, 1};
float Alpha = 1;
float4x4 gradient;
+float gamma = 1.0f;
//
////
@@ -56,5 +58,6 @@ Pixel ReadPixel(vs2ps In) {
color1 = clamp(color1, 0, 1);
color2 = clamp(color2, 0, 1);
pixel.color = lerp(color1, color2, gradientposition);
+ pixel.color.rgb = pow(pixel.color.rgb, gamma);
return pixel;
}
View
14 Draft1-March19th/Layers/4. Metaballs.v4p
@@ -191,7 +191,7 @@
</BOUNDS>
<PIN pinname="Transform Out" visible="1">
</PIN>
- <PIN pinname="Z" slicecount="1" values="0.6">
+ <PIN pinname="Z" slicecount="1" values="0.2">
</PIN>
<PIN pinname="X" slicecount="1" values="0.16">
</PIN>
@@ -304,20 +304,20 @@
</NODE>
<LINK dstnodeid="24" dstpinname="Input Node" srcnodeid="23" srcpinname="Layer">
</LINK>
- <NODE nodename="IOBox (Value Advanced)" componentmode="InABox" id="25" systemname="IOBox (Value Advanced)">
- <BOUNDS type="Node" left="11025" top="120" width="0" height="0">
+ <NODE componentmode="InABox" id="25" nodename="IOBox (Value Advanced)" systemname="IOBox (Value Advanced)">
+ <BOUNDS height="0" left="11025" top="120" type="Node" width="0">
</BOUNDS>
- <BOUNDS type="Box" left="11025" top="120" width="795" height="240">
+ <BOUNDS height="240" left="11025" top="120" type="Box" width="795">
</BOUNDS>
<PIN pinname="Y Input Value" slicecount="1" values="1">
</PIN>
- <PIN pinname="Units" slicecount="1" values="||" encoded="0">
+ <PIN encoded="0" pinname="Units" slicecount="1" values="||">
</PIN>
<PIN pinname="Precision" slicecount="1" values="4">
</PIN>
- <PIN pinname="Descriptive Name" slicecount="1" values="Alpha" encoded="0">
+ <PIN encoded="0" pinname="Descriptive Name" slicecount="1" values="Alpha">
</PIN>
</NODE>
- <LINK srcnodeid="25" srcpinname="Y Output Value" dstnodeid="23" dstpinname="Alpha">
+ <LINK dstnodeid="23" dstpinname="Alpha" srcnodeid="25" srcpinname="Y Output Value">
</LINK>
</PATCH>
View
40 Draft1-March19th/main.v4p
@@ -27,11 +27,11 @@
</PIN>
</NODE>
<NODE componentmode="Hidden" filename="..\Common\Settings\scene properties.v4p" id="63" nodename="..\Common\Settings\scene properties.v4p" systemname="scene properties">
- <BOUNDS height="100" left="8040" top="3825" type="Node" width="100">
+ <BOUNDS height="100" left="8490" top="3825" type="Node" width="100">
</BOUNDS>
<BOUNDS height="7500" left="4470" top="14835" type="Window" width="13755">
</BOUNDS>
- <PIN pinname="Reload map">
+ <PIN pinname="Reload map" visible="1">
</PIN>
</NODE>
<NODE componentmode="Hidden" id="111" nodename="Group (EX9)" systemname="Group (EX9)">
@@ -83,9 +83,9 @@
</PIN>
<PIN encoded="0" pinname="Descriptive Name" slicecount="1" values="|Reload map|">
</PIN>
+ <PIN pinname="Y Output Value" visible="1">
+ </PIN>
</NODE>
- <LINK dstnodeid="63" dstpinname="Reload map" srcnodeid="114" srcpinname="Y Output Value">
- </LINK>
<NODE componentmode="InABox" id="115" nodename="IOBox (String)" systemname="IOBox (String)">
<BOUNDS height="270" left="7515" top="2205" type="Node" width="1890">
</BOUNDS>
@@ -126,7 +126,7 @@
</NODE>
<LINK dstnodeid="111" dstpinname="Layer 3" srcnodeid="117" srcpinname="Layer">
</LINK>
- <NODE componentmode="Hidden" filename="Layers\3. Surface wave.v4p" id="118" nodename="Layers\3. Surface wave.v4p" systemname="3. Surface wave">
+ <NODE componentmode="InAWindow" filename="Layers\3. Surface wave.v4p" id="118" nodename="Layers\3. Surface wave.v4p" systemname="3. Surface wave">
<BOUNDS height="100" left="8325" top="4905" type="Node" width="100">
</BOUNDS>
<PIN pinname="Layer" visible="1">
@@ -523,6 +523,8 @@
</PIN>
<PIN pinname="frames per second" visible="1">
</PIN>
+ <PIN pinname="Change fullscreen" visible="1">
+ </PIN>
</NODE>
<LINK dstnodeid="145" dstpinname="Layers" srcnodeid="125" srcpinname="Layer">
</LINK>
@@ -554,18 +556,38 @@
</NODE>
<LINK dstnodeid="146" dstpinname="Transform" srcnodeid="147" srcpinname="Transform Out">
</LINK>
- <NODE systemname="Grid (EX9.Geometry)" nodename="Grid (EX9.Geometry)" componentmode="Hidden" id="148">
- <BOUNDS type="Node" left="8025" top="7095" width="100" height="100">
+ <NODE componentmode="Hidden" id="148" nodename="Grid (EX9.Geometry)" systemname="Grid (EX9.Geometry)">
+ <BOUNDS height="100" left="8025" top="7095" type="Node" width="100">
</BOUNDS>
<PIN pinname="Mesh" visible="1">
</PIN>
</NODE>
- <LINK srcnodeid="148" srcpinname="Mesh" dstnodeid="146" dstpinname="Mesh">
+ <LINK dstnodeid="146" dstpinname="Mesh" srcnodeid="148" srcpinname="Mesh">
</LINK>
- <LINK srcnodeid="142" srcpinname="Texture Out" dstnodeid="146" dstpinname="Texture" linkstyle="Bezier" hiddenwhenlocked="1">
+ <LINK dstnodeid="146" dstpinname="Texture" hiddenwhenlocked="1" linkstyle="Bezier" srcnodeid="142" srcpinname="Texture Out">
<LINKPOINT x="12945" y="5355">
</LINKPOINT>
<LINKPOINT x="9990" y="5355">
</LINKPOINT>
</LINK>
+ <NODE systemname="OR (Boolean)" nodename="OR (Boolean)" componentmode="Hidden" id="149">
+ <BOUNDS type="Node" left="9420" top="3390" width="100" height="100">
+ </BOUNDS>
+ <PIN pinname="Input 1" visible="1">
+ </PIN>
+ <PIN pinname="Output" visible="1">
+ </PIN>
+ <PIN pinname="Input 2" visible="1">
+ </PIN>
+ </NODE>
+ <LINK srcnodeid="114" srcpinname="Y Output Value" dstnodeid="149" dstpinname="Input 1">
+ </LINK>
+ <LINK srcnodeid="149" srcpinname="Output" dstnodeid="63" dstpinname="Reload map">
+ </LINK>
+ <LINK srcnodeid="145" srcpinname="Change fullscreen" dstnodeid="149" dstpinname="Input 2" linkstyle="Bezier" hiddenwhenlocked="1">
+ <LINKPOINT x="1275" y="6473">
+ </LINKPOINT>
+ <LINKPOINT x="9780" y="6473">
+ </LINKPOINT>
+ </LINK>
</PATCH>
Please sign in to comment.
Something went wrong with that request. Please try again.