Commit aefd08b2 authored by ATREVI Dieudonne's avatar ATREVI Dieudonne
Browse files

fixed conflict

parent 23893ac4
fileFormatVersion: 2
guid: 1846b4a6021d3ac449c7a6b24af5688f
timeCreated: 1452696482
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
......@@ -99,47 +99,47 @@ public class FiltersControl : MonoBehaviour
return newCamera;
}
public void cycleReset()
{
int newCam = 0;
Debug.Log(currentCam + " => " + newCam);
//capturePasses[currentCam].camera.enabled = false;
//capturePasses[newCam].camera.enabled = true;
capturePasses[currentCam].camera.targetDisplay = 1;
capturePasses[newCam].camera.targetDisplay = 0;
currentCam = newCam;
public void cycleReset()
{
int newCam = 0;
Debug.Log(currentCam + " => " + newCam);
//capturePasses[currentCam].camera.enabled = false;
//capturePasses[newCam].camera.enabled = true;
capturePasses[currentCam].camera.targetDisplay = 1;
capturePasses[newCam].camera.targetDisplay = 0;
currentCam = newCam;
}
public void cycleForward()
{
int newCam = (currentCam + 1) % capturePasses.Length;
Debug.Log(currentCam + " => " + newCam);
//capturePasses[currentCam].camera.enabled = false;
//capturePasses[newCam].camera.enabled = true;
capturePasses[currentCam].camera.targetDisplay = 1;
capturePasses[newCam].camera.targetDisplay= 0;
currentCam = newCam;
}
public void cycleBackward()
{
int newCam = currentCam - 1;
if (newCam < 0)
newCam = capturePasses.Length - 1;
Debug.Log(currentCam + " => " + newCam);
//capturePasses[currentCam].camera.enabled = false;
//capturePasses[newCam].camera.enabled = true;
capturePasses[currentCam].camera.targetDisplay = 1;
capturePasses[newCam].camera.targetDisplay = 0;
currentCam = newCam;
public void cycleForward()
{
int newCam = (currentCam + 1) % capturePasses.Length;
Debug.Log(currentCam + " => " + newCam);
//capturePasses[currentCam].camera.enabled = false;
//capturePasses[newCam].camera.enabled = true;
capturePasses[currentCam].camera.targetDisplay = 1;
capturePasses[newCam].camera.targetDisplay= 0;
currentCam = newCam;
}
public void cycleBackward()
{
int newCam = currentCam - 1;
if (newCam < 0)
newCam = capturePasses.Length - 1;
Debug.Log(currentCam + " => " + newCam);
//capturePasses[currentCam].camera.enabled = false;
//capturePasses[newCam].camera.enabled = true;
capturePasses[currentCam].camera.targetDisplay = 1;
capturePasses[newCam].camera.targetDisplay = 0;
currentCam = newCam;
}
static private void SetupCameraWithReplacementShader(Camera cam, Shader shader, ReplacementMode mode)
......@@ -195,7 +195,7 @@ public class FiltersControl : MonoBehaviour
// set targetDisplay here since it gets overriden by CopyFrom()
if (targetDisplay== currentCam)
pass.camera.targetDisplay = 0;
else
else
pass.camera.targetDisplay = targetDisplay+1;
targetDisplay++;
}
......@@ -292,7 +292,9 @@ public class FiltersControl : MonoBehaviour
RenderTexture.GetTemporary(width, height, depth, format, readWrite, antiAliasing);
var renderRT = (!needsRescale) ? finalRT :
RenderTexture.GetTemporary(mainCamera.pixelWidth, mainCamera.pixelHeight, depth, format, readWrite, antiAliasing);
var tex = new Texture2D(width, height, TextureFormat.RGB24, false);
//var tex = new Texture2D(width, height, TextureFormat.RGB24, false);
var tex = new Texture2D(width, height, TextureFormat.ASTC_RGBA_8x8, false);
var prevActiveRT = RenderTexture.active;
var prevCameraRT = cam.targetTexture;
......
......@@ -8,15 +8,15 @@
<rotation x="0" y="0" z="0" />
</env_stageInfos>
<cam>
<position x="-29.80366" y="-3" z="5" />
<position x="-20" y="-3" z="5" />
<rotation x="30.00001" y="0" z="90" />
<lookAtAgent agentID="-1" />
<followAgent agentID="0" followOnX="true" followOnY="false" />
<CamResolution x="-1" y="-1" />
</cam>
<recording start="0" end="0" framerate="15">
<recording start="1" end="5" framerate="15">
<saveDir>./Output/</saveDir>
<savedData ImgOriginal="true" ImgSegmentation="false" ImgCategories="false" ImgDepth="false" ImgNormals="false" ImgOpticalFlow="false" BodyBoundingBoxes="false" HeadBoundingBoxes="false" />
<savedData ImgOriginal="true" ImgSegmentation="false" ImgCategories="false" ImgDepth="false" ImgNormals="false" ImgOpticalFlow="true" BodyBoundingBoxes="false" HeadBoundingBoxes="false" />
</recording>
<AgentColorList />
</ConfigData>
\ No newline at end of file
File added
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment