Загрузка изображений без proxy

Assets/Scenes/Editor2D.unity

@@ -312,7 +312,7 @@ Camera:
   near clip plane: 0.3
   far clip plane: 1000
   field of view: 60
-  orthographic: 1
+  orthographic: 0
   orthographic size: 5
   m_Depth: -1
   m_CullingMask:
@@ -355,7 +355,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 22629138}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 15f63ac17de22e740bdce6c2d3a18986, type: 3}
   m_Name: 
@@ -374,6 +374,11 @@ MonoBehaviour:
   zoom: 0.5
   zoomMax: 50
   zoomMin: 0.5
+  movementSpeed: 0.1
+  rotationSpeed: 4
+  smoothness: 0.85
+  targetRotation: {x: 0, y: 0, z: 0, w: 0}
+  dragSpeed: 0.00001
 --- !u!1 &153530783
 GameObject:
   m_ObjectHideFlags: 0
@@ -901,6 +906,7 @@ GameObject:
   - component: {fileID: 488654198}
   - component: {fileID: 488654197}
   - component: {fileID: 488654196}
+  - component: {fileID: 488654200}
   m_Layer: 5
   m_Name: Panel_Image
   m_TagString: Untagged
@@ -1000,6 +1006,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 488654194}
   m_CullTransparentMesh: 0
+--- !u!114 &488654200
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 488654194}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cc33a39070010f94fb1c2dd721c1286d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &493986112
 GameObject:
   m_ObjectHideFlags: 0
@@ -1837,7 +1855,7 @@ MonoBehaviour:
   Image: {fileID: 8323760}
   SizeX: {fileID: 265782952}
   SizeY: {fileID: 2088359224}
-  Plane: {fileID: 2121551164}
+  plane: {fileID: 2121551164}
 --- !u!1 &1497404089
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/Location.unity

@@ -3608,7 +3608,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 15f63ac17de22e740bdce6c2d3a18986, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  axes: 5
+  axes: 3
   sensitivityX: 2
   sensitivityY: 2
   minimumX: -360
@@ -3634,7 +3634,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 534669902}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: ecf9c99718207794e9a73d6d047147a6, type: 3}
   m_Name: 
@@ -8521,7 +8521,6 @@ GameObject:
   - component: {fileID: 1379848289}
   - component: {fileID: 1379848288}
   - component: {fileID: 1379848287}
-  - component: {fileID: 1379848290}
   m_Layer: 0
   m_Name: EventSystem
   m_TagString: Untagged
@@ -8577,20 +8576,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1379848290
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1379848286}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ecf9c99718207794e9a73d6d047147a6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  account_id: 0
-  _dataPath: 
 --- !u!1 &1389559211 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7472118420504627702, guid: 7850c6db5506d6f4683d61bfd7dd9672,

Assets/Scripts/Components/TouchScript.cs

@@ -108,17 +108,19 @@ public class TouchScript : MonoBehaviour
                 //StagesEditorController.ToolsValue(tools, StagesEditorController.selectCursor.panel_cursor.transform);
                 break;
             case Tools.Scale:
-                //var scale = StagesEditorController.selectCursor.panel_cursor.transform.localScale;
+                //var scale = transform.localScale;
                 //transform.localScale = new Vector3(scale.x + (h + v), scale.z + (h + v), scale.z);
+
+                //transform.transform.position = new Vector3(scale.x *5, 0, scale.z *5);
                 if (increase)
                 {
-                    scaleChange = new Vector3(0.005f, 0, 0.005f);
-                    positionChange = new Vector3(0.025f, 0, 0.025f);
+                    scaleChange = new Vector3(0.01f, 0, 0.01f);
+                    positionChange = new Vector3(0.05f, 0, 0.05f);
                 }
                 else
                 {
-                    scaleChange = new Vector3(-0.005f, 0, -0.005f);
-                    positionChange = new Vector3(-0.025f, 0, -0.025f);
+                    scaleChange = new Vector3(-0.01f, 0, -0.01f);
+                    positionChange = new Vector3(-0.05f, 0, -0.05f);
                 }
                 transform.transform.localScale += scaleChange;
                 transform.transform.position += positionChange;

Assets/Scripts/Controllers/CameraController.cs

@@ -8,7 +8,7 @@ using UnityEngine.EventSystems;
 /// </summary>
 public class CameraController : MonoBehaviour
 {
-    public enum RotationAxes { MouseXAndY, MouseX, MouseY, RelativeObject, KeyBoard, Mouse }
+    public enum RotationAxes { MouseXAndY, MouseX, MouseY, RelativeObject, KeyBoard, Mouse, TrackMarker }
     public RotationAxes axes = RotationAxes.MouseXAndY;
     public float sensitivityX = 2F;
     public float sensitivityY = 2F;
@@ -36,7 +36,9 @@ public class CameraController : MonoBehaviour
     {
         limit = Mathf.Abs(limit);
         if (limit > 90) limit = 90;
-        if(axes != RotationAxes.Mouse)offset = new Vector3(offset.x, offset.y, offset.z/*-Mathf.Abs(zoomMax) / 2*/);
+        if (axes != RotationAxes.Mouse) offset = new Vector3(offset.x, offset.y, offset.z/*-Mathf.Abs(zoomMax) / 2*/);
+        else 
+            offset = transform.position;
         if(target != null) transform.position = target.position + offset;
 
         targetPosition = transform.position;
@@ -275,40 +277,56 @@ public class CameraController : MonoBehaviour
 
         //if (!Input.GetMouseButton(2)) return;
 
-        if (Input.GetMouseButton(2))
+        if (Input.GetMouseButton(1))
         {    
             Vector3 pos = Camera.main.ScreenToViewportPoint(Input.mousePosition - dragOrigin);
             if(pos.x < 0)
-                targetPosition -= transform.right * movementSpeed;
+                targetPosition -= transform.right * movementSpeed * 0.1f;
             if (pos.x>0)
-                targetPosition += transform.right * movementSpeed;
+                targetPosition += transform.right * movementSpeed * 0.1f;
             if (pos.y > 0)
-                targetPosition -= transform.up * movementSpeed;
+                targetPosition -= transform.up * movementSpeed*0.1f;
             if (pos.y < 0)
-                targetPosition += transform.up * movementSpeed;
+                targetPosition += transform.up * movementSpeed * 0.1f;            
         }
 
         if (Input.GetAxis("Mouse ScrollWheel") > 0)
         {
-            offset.z += zoom;
+            //offset.z += zoom;   
+            targetPosition += transform.forward * movementSpeed;
         }
         else if (Input.GetAxis("Mouse ScrollWheel") < 0)
-            offset.z -= zoom;
-        offset.z = Mathf.Clamp(offset.z, -Mathf.Abs(zoomMax), -Mathf.Abs(zoomMin));
-
-        transform.position = transform.localRotation * offset;
-
-        if (Input.GetMouseButton(1))
         {
-            Cursor.visible = false;
-            targetRotationY += Input.GetAxis("Mouse X") * rotationSpeed;
-            targetRotationX -= Input.GetAxis("Mouse Y") * rotationSpeed;
-            targetRotation = Quaternion.Euler(targetRotationX, targetRotationY, 0.0f);
+            //offset.z -= zoom;
+            targetPosition -= transform.forward * movementSpeed;
         }
-        else
-            Cursor.visible = true;
+        //offset.z = Mathf.Clamp(offset.z, -Mathf.Abs(zoomMax), -Mathf.Abs(zoomMin));
 
-        transform.position = Vector3.Lerp(transform.position, targetPosition, (1.0f - smoothness));
-        transform.rotation = Quaternion.Lerp(transform.rotation, targetRotation, (1.0f - smoothness));
+        //if (Input.GetAxis("Mouse ScrollWheel") != 0)
+        //{
+
+        //    X = transform.localEulerAngles.y + Input.GetAxis("Mouse X") * sensitivity;
+        //    Y += Input.GetAxis("Mouse Y") * sensitivity;
+        //    Y = Mathf.Clamp(Y, -limit, limit);
+        //    //transform.localEulerAngles = new Vector3(-Y, X, 0);
+        //    transform.position = new Vector3(transform.position.x, Y, transform.position.z);
+         
+        //}
+       
+
+        //transform.position = transform.localRotation * offset;
+
+        //if (Input.GetMouseButton(1))
+        //{ 
+        //    Cursor.visible = false;
+        //    targetRotationY += Input.GetAxis("Mouse X") * rotationSpeed;
+        //    targetRotationX -= Input.GetAxis("Mouse Y") * rotationSpeed;
+        //    targetRotation = Quaternion.Euler(targetRotationX, targetRotationY, 0.0f);
+        //}
+        //else
+        //    Cursor.visible = true;
+
+     transform.position = Vector3.Lerp(transform.position, targetPosition, (1.0f - smoothness));
+        //transform.rotation = Quaternion.Lerp(transform.rotation, targetRotation, (1.0f - smoothness));
     }   
 }

Assets/Scripts/Controllers/Editor2DController.cs

@@ -10,8 +10,7 @@ public class Editor2DController : MonoBehaviour
     public InputField Image;
     public InputField SizeX;
     public InputField SizeY;
-    public GameObject Plane;
-    Vector3 scale;
+    public GameObject plane;
 
     CultureInfo culture = CultureInfo.CreateSpecificCulture("eu-ES");
     // Start is called before the first frame update
@@ -29,13 +28,17 @@ public class Editor2DController : MonoBehaviour
     public void UpdatePanel()
     {
         if (!Image.text.Equals(""))
-            StartCoroutine(SendingFormController.LoadImage(Image.text, Plane));
-        scale = Plane.transform.localScale;
+            StartCoroutine(SendingFormController.LoadImage(Image.text, plane));
+
         var x = 1f;
-        if (SizeX.text.Equals("")) x = float.Parse(SizeX.text.ToString(culture));
+        if (!SizeX.text.Equals(""))
+            x = float.Parse(SizeX.text, CultureInfo.InvariantCulture);
         var y = 1f;
-        if (SizeY.text.Equals("")) y = float.Parse(SizeY.text.ToString(culture));
-        Plane.transform.localScale = new Vector3(x, 1, y);
+        if (!SizeY.text.Equals(""))
+            y = float.Parse(SizeY.text, CultureInfo.InvariantCulture);
+        plane.transform.localScale = new Vector3(x, 1, y); 
+        var scale = plane.transform.localScale;
+        plane.transform.position = new Vector3(scale.x * 5, 0, scale.z * 5);
     }
 
     public void Save()

Assets/Scripts/Controllers/SendingFormController.cs

@@ -122,34 +122,42 @@ public class SendingFormController : MonoBehaviour
         Debug.Log(data);
     }
 
-   /* public static IEnumerator LoadImage(Image img, System.Action<Texture2D> result)
-    {
-        WWW www = new WWW(url);
-        yield return www;
-        img.sprite = Sprite.Create(www.texture, new Rect(0, 0, www.texture.width, www.texture.height), new Vector2(0, 0));
-    }*/
+    /* public static IEnumerator LoadImage(Image img, System.Action<Texture2D> result)
+     {
+         WWW www = new WWW(url);
+         yield return www;
+         img.sprite = Sprite.Create(www.texture, new Rect(0, 0, www.texture.width, www.texture.height), new Vector2(0, 0));
+     }*/
 
 
     public static IEnumerator LoadImage(string url, GameObject plane)
     {
-       
-            //string url = "https://example.com/image.jpeg";
-            WWWForm form = new WWWForm();
-        //var headers = form.headers;
-        //headers["Access-Control-Allow-Origin"] = "http://test.prmsys.net/areditor/";
-        //headers["Access-Control-Allow-Credentials"] = "true";
+
+        //string url = "https://example.com/image.jpeg";
+        WWWForm form = new WWWForm();
+        var headers = form.headers;
+        headers["Access-Control-Allow-Credentials"] = "true";
+        headers["Access-Control-Allow-Headers"] = "Accept, X-Access-Token, X-Application-Name, X-Request-Sent-Time";
+        headers["Access-Control-Allow-Methods"] = "GET, POST, OPTIONS";
+        //headers["Access-Control-Allow-Origin"] = "http://test.prmsys.net/";
+        headers["Content-type"] = "image/jpg, image/jpeg, image/png, image/bmp";
+
         var proxy = "http://dev.prmsys.net/areditor/proxy.php?url=";
-            Debug.Log("proxy=" +  url);
-            WWW img = new WWW(proxy + url); //, null, headers);
+        Debug.Log("proxy=" + url);
+        WWW img = new WWW( url); //, null, headers);
 
-            yield return img;
+        yield return img;
+
+        Texture2D texture = new Texture2D(1, 1);
+        img.LoadImageIntoTexture(texture);
+
+        Renderer renderer = plane.GetComponent<Renderer>();
+        renderer.material.mainTexture = texture;
+        plane.transform.localScale = new Vector3(img.texture.width / 100f, 1, img.texture.height / 100f);
+        var scale = plane.transform.localScale;
+        plane.transform.position = new Vector3(scale.x * 5, 0, scale.z * 5);
+        //GetComponent<Renderer>().material.mainTexture = img.texture;
 
-            Texture2D texture = new Texture2D(1, 1);
-            img.LoadImageIntoTexture(texture);
-            Renderer renderer = plane.GetComponent<Renderer>();
-            renderer.material.mainTexture = texture;
-            //GetComponent<Renderer>().material.mainTexture = img.texture;
-        
     }
 
     /*public static IEnumerator LoadResources(string url_resources, string file, Action<Sprite> image = null, Action<WWW> errorCallback = null)