emu: 3d fixes (#5)

* test * emu: Improvements 3d
RadratSoftworks · Jun 17, 2023 · ee18a3a · ee18a3a
1 parent 49dd8c4
commit ee18a3a
Show file tree

Hide file tree

Showing 66 changed files with 2,059 additions and 347 deletions.
diff --git a/Assets/Scripts/Driver.Unity/Audio/PCMSound.cs b/Assets/Scripts/Driver.Unity/Audio/PCMSound.cs
@@ -37,11 +37,6 @@ public PCMSound(AudioDriver driver, AudioSource assignedAudioSource, byte[] audi
 
             if (isAdpcm)
             {
-                if (bitsPerSample != 16)
-                {
-                    throw new ArgumentException("Sample bits must be 16 bits for ADPCM audio!");
-                }
-
                 clip = AudioClip.Create("ADPCM sound", audioData.Length * 2 / channels, channels,
                     frequency, false);
 

diff --git a/Assets/Scripts/Driver.Unity/Graphics/BufferPusher.cs b/Assets/Scripts/Driver.Unity/Graphics/BufferPusher.cs
@@ -32,6 +32,7 @@ private struct Vertex
             public Vector3 normal;
             public Color color;
             public Vector2 uv;
+            public Color specularColor;
         }
 
         private Mesh bigMesh;
@@ -54,7 +55,8 @@ public BufferPusher(int maxVerticesCount = 10000, int maxIndiciesCount = 30000)
                 new VertexAttributeDescriptor(VertexAttribute.Position, VertexAttributeFormat.Float32, 3),
                 new VertexAttributeDescriptor(VertexAttribute.Normal, VertexAttributeFormat.Float32, 3),
                 new VertexAttributeDescriptor(VertexAttribute.Color, VertexAttributeFormat.Float32, 4),
-                new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 2)
+                new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 2),
+                new VertexAttributeDescriptor(VertexAttribute.TexCoord1, VertexAttributeFormat.Float32, 4)
             });
 
             bigMesh.SetIndexBufferParams(maxIndiciesCount, IndexFormat.UInt32);
@@ -93,7 +95,8 @@ public int Push(MpMesh meshes)
                     position = meshes.vertices[i].ToUnity(),
                     uv = meshes.uvs.IsEmpty ? Vector2.zero : meshes.uvs[i].ToUnity(),
                     normal = meshes.normals.IsEmpty ? Vector3.one : meshes.normals[i].ToUnity(),
-                    color = meshes.diffuses.IsEmpty ? Color.white : meshes.diffuses[i].ToUnity()
+                    color = meshes.diffuses.IsEmpty ? Color.white : meshes.diffuses[i].ToUnity(),
+                    specularColor = meshes.speculars.IsEmpty ? Color.white : meshes.speculars[i].ToUnity()
                 });
             }
 
@@ -105,7 +108,7 @@ public int Push(MpMesh meshes)
             return submeshes.Count - 1;
         }
 
-        public int Push(List<Vector3> positions, List<Vector2> uvs, List<Vector3> normals, List<Color> colors, List<int> indiciesSpan)
+        public int Push(List<Vector3> positions, List<Vector2> uvs, List<Vector3> normals, List<Color> colors, List<Color> specularColors, List<int> indiciesSpan)
         {
             if ((vertices.Count + positions.Count > maxVerticesCount) || (indicies.Count + indiciesSpan.Count > maxIndiciesCount))
             {
@@ -121,7 +124,8 @@ public int Push(List<Vector3> positions, List<Vector2> uvs, List<Vector3> normal
                     position = positions[i],
                     uv = uvs[i],
                     normal = normals[i],
-                    color = colors[i]
+                    color = colors[i],
+                    specularColor = specularColors[i]
                 });
             }
 

diff --git a/Assets/Scripts/Driver.Unity/Graphics/ClientState.cs b/Assets/Scripts/Driver.Unity/Graphics/ClientState.cs
@@ -23,17 +23,28 @@ namespace Nofun.Driver.Unity.Graphics
 {
     public class ClientState
     {
+        public const int MaximumLight = 8;
+
         public MpCullMode cullMode = MpCullMode.CounterClockwise;
-        public MpBlendMode blendMode = MpBlendMode.Alpha;
+        public MpBlendMode blendMode = MpBlendMode.Replace;
         public MpTextureBlendMode textureBlendMode = MpTextureBlendMode.Modulate;
         public bool textureMode = false;
         public MpCompareFunc depthCompareFunc = MpCompareFunc.Always;
         public Rect scissorRect;
         public Rect viewportRect;
         public Matrix4x4 projectionMatrix3D;
         public Matrix4x4 viewMatrix3D;
+        public Matrix4x4 lightMatrix3D;
         public Texture mainTexture;
-
+        public MpExtendedMaterial extendedMaterial;
+        public bool lighting = false;
+        public bool specular = false;
+        public bool fog = false;
+        public SColor globalAmbient;
+        public MpLight[] lights = new MpLight[MaximumLight];
+        public Vector3 cameraPosition;
+        public bool transparentTest = false;
+
         public ulong MaterialIdentifier
         {
             get