Upgraded to 2018.1 and added assembly def files

Xenation · May 6, 2018 · 49a9c3a · 49a9c3a
1 parent 508b388
commit 49a9c3a
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 4 deletions.
diff --git a/Assets/Xenon/Editor/Scripts/Essentials.cs b/Assets/Xenon/Editor/Scripts/Essentials.cs
@@ -233,15 +233,18 @@ private void SceneRepaint(SceneView view) {
 		}
 
 		private void SwitchRenderMode(SceneView sceneView) {
-			switch (sceneView.renderMode) {
+			SceneView.CameraMode camMode;
+			camMode = sceneView.cameraMode;
+			switch (camMode.drawMode) {
 				default:
 				case DrawCameraMode.Textured:
-					sceneView.renderMode = DrawCameraMode.TexturedWire;
+					camMode.drawMode = DrawCameraMode.TexturedWire;
 					break;
 				case DrawCameraMode.TexturedWire:
-					sceneView.renderMode = DrawCameraMode.Textured;
+					camMode.drawMode = DrawCameraMode.Textured;
 					break;
 			}
+			sceneView.cameraMode = camMode;
 			sceneView.Repaint();
 		}
 

diff --git a/Assets/Xenon/Editor/Scripts/Xenon.Editor.asmdef b/Assets/Xenon/Editor/Scripts/Xenon.Editor.asmdef
@@ -0,0 +1,12 @@
+{
+    "name": "Xenon.Editor",
+    "references": [
+        "Xenon"
+    ],
+    "optionalUnityReferences": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false
+}
diff --git a/Assets/Xenon/Editor/Scripts/Xenon.Editor.asmdef.meta b/Assets/Xenon/Editor/Scripts/Xenon.Editor.asmdef.meta
diff --git a/Assets/Xenon/Scripts/Xenon.asmdef b/Assets/Xenon/Scripts/Xenon.asmdef
@@ -0,0 +1,3 @@
+{
+	"name": "Xenon"
+}
diff --git a/Assets/Xenon/Scripts/Xenon.asmdef.meta b/Assets/Xenon/Scripts/Xenon.asmdef.meta
diff --git a/UnityPackageManager/manifest.json → Packages/manifest.json b/UnityPackageManager/manifest.json → Packages/manifest.json
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.3.0p2
+m_EditorVersion: 2018.1.0f2
diff --git a/XenonBuild/XenonBuild.csproj b/XenonBuild/XenonBuild.csproj
@@ -372,6 +372,7 @@
     <Compile Include="..\Assets\Xenon\Scripts\Singleton.cs" />
     <Compile Include="..\Assets\Xenon\Scripts\TimingDebugger.cs" />
     <Compile Include="..\Assets\Xenon\Scripts\XEvent.cs" />
+	<Compile Include="..\Assets\Xenon\Scripts\MathPlus.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		m_EditorVersion: 2017.3.0p2
		m_EditorVersion: 2018.1.0f2