Update graphics modes

5 files changed, 128 insertions, 90 deletions

diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua
index 52ca6d6..82e1351 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua
@@ -49,8 +49,8 @@ return {
         },
         sizes       = {
           {
-            width  =   6,
-            height =   8,
+            width  = 6,
+            height = 8,
           },
         },
         map         = {
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua
index 0f5d9c3..7bfdff3 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua
@@ -76,8 +76,8 @@ return {
         },
         sizes       = {
           {
-            width  =   8,
-            height =   8,
+            width  = 8,
+            height = 8,
           },
         },
         map         = {
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua
index fa2d7da..4657a8f 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua
@@ -76,8 +76,8 @@ return {
         },
         sizes       = {
           {
-            width  =   8,
-            height =   8,
+            width  = 8,
+            height = 8,
           },
         },
         map         = {
diff --git a/src/hardware_data/scripts/load/graphics/vdp_gg-tms9918_mode4.lua b/src/hardware_data/scripts/load/graphics/vdp_gg-tms9918_mode4.lua
index 54b555c..ebfd215 100644
--- a/src/hardware_data/scripts/load/graphics/vdp_gg-tms9918_mode4.lua
+++ b/src/hardware_data/scripts/load/graphics/vdp_gg-tms9918_mode4.lua
@@ -1,6 +1,6 @@
 return {
   screen = {
-    default = {
+    ntsc = {
       width  = 160,
       height = 144,
       fps    = 29.97,
@@ -9,7 +9,7 @@ return {
         y = 0,
       },
     },
-    pal     = {
+    pal  = {
       width  = 160,
       height = 144,
       fps    = 25,
@@ -19,58 +19,77 @@ return {
       },
     },
   },
-  colors = {
-    '12bpp',
-    limit       = '5bpp',
+  colours = {
+    total       = '12bpp',
+    limit       = 32,
+    background  = true,
     transparent = 'colorKey',
   },
-  mesh   = false,
-  api    = false,
-  shader = {
-    false,
-    fragment = false,
+  meshes  = false,
+  shaders = {
+    api          = false,
+    version      = false,
+    fragment     = false,
+    vectex       = false,
+    geometry     = false,
+    tessellation = false,
   },
-  physic = false,
-  sprite = {
-    true,
-    colors = '4bpp',
-    limits = {
-      true,
-      screen = 64,
-      line   =  8,
+  physic  = false,
+  sprites = {
+    onScreen  = 64,
+    onLine    =  8,
+    palettes  = {
+      specify = true,
+      free = {
+        colours = 15,
+        keys    = 1,
+      },
+    },
+    transform = {
+      move   = true,
+      rotate = false,
+      scale  = false,
+      shear  = false,
+      affine = false,
     },
-    rotate = false,
-    scale  = false,
-    shear  = false,
-    affine = false,
-    size   = {
-      default = {
+    sizes     = {
+      {
         width  =  8,
         height =  8,
       },
-      big     = {
+      {
         width  = 16,
         height = 16,
       },
     },
   },
-  tile   = {
-    layers = 1,
-    {
-      tilesSet       = false,
-      colors         = '4bpp',
-      specifyColors  = false,
-      moveIndividual = false,
-      independent    = false,
-      mirror         = false,
-      rotate         = false,
-      scale          = false,
-      shear          = false,
-      affine         = false,
-      size           = {
-        default = {
-          width  = 8,
-          height = 8,
+  tiles   = {
+    layers = {
+      {
+        independent = false,
+        palettes    = {
+          specify = true,
+          free = {
+            colours = 15,
+            keys    = 1,
+          },
+        },
+        mirror      = false,
+        transform   = {
+          individual = false,
+          move       = false,
+          rotate     = false,
+          scale      = false,
+          shear      = false,
+          affine     = false,
+        },
+        sizes       = {
+          {
+            width  = 8,
+            height = 8,
+          },
+        },
+        map         = false,
         },
       },
     },
diff --git a/src/hardware_data/scripts/load/graphics/vdp_ms-tms9918_mode4.lua b/src/hardware_data/scripts/load/graphics/vdp_ms-tms9918_mode4.lua
index f3201b1..08b9aea 100644
--- a/src/hardware_data/scripts/load/graphics/vdp_ms-tms9918_mode4.lua
+++ b/src/hardware_data/scripts/load/graphics/vdp_ms-tms9918_mode4.lua
@@ -1,6 +1,6 @@
 return {
   screen = {
-    default = {
+    ntsc = {
       width  = 256,
       height = 192,
       fps    = 29.97,
@@ -9,7 +9,7 @@ return {
         y = 0,
       },
     },
-    pal     = {
+    pal  = {
       width  = 256,
       height = 192,
       fps    = 25,
@@ -19,58 +19,77 @@ return {
       },
     },
   },
-  colors = {
-    '6bpp',
-    limit       = '5bpp',
+  colours = {
+    total       = 64,
+    limit       = 32,
+    background  = true,
     transparent = 'colorKey',
   },
-  mesh   = false,
-  api    = false,
-  shader = {
-    false,
-    fragment = false,
+  meshes  = false,
+  shaders = {
+    api          = false,
+    version      = false,
+    fragment     = false,
+    vectex       = false,
+    geometry     = false,
+    tessellation = false,
   },
-  physic = false,
-  sprite = {
-    true,
-    colors = '4bpp',
-    limits = {
-      true,
-      screen = 64,
-      line   =  8,
+  physic  = false,
+  sprites = {
+    onScreen  = 64,
+    onLine    =  8,
+    palettes  = {
+      specify = true,
+      free = {
+        colours = 15,
+        keys    = 1,
+      },
+    },
+    transform = {
+      move   = true,
+      rotate = false,
+      scale  = false,
+      shear  = false,
+      affine = false,
     },
-    rotate = false,
-    scale  = false,
-    shear  = false,
-    affine = false,
-    size   = {
-      default = {
+    sizes     = {
+      {
         width  =  8,
         height =  8,
       },
-      big     = {
+      {
         width  = 16,
         height = 16,
       },
     },
   },
-  tile   = {
-    layers = 1,
-    {
-      tilesSet       = false,
-      colors         = '4bpp',
-      specifyColors  = false,
-      moveIndividual = false,
-      independent    = false,
-      mirror         = false,
-      rotate         = false,
-      scale          = false,
-      shear          = false,
-      affine         = false,
-      size           = {
-        default = {
-          width  = 8,
-          height = 8,
+  tiles   = {
+    layers = {
+      {
+        independent = false,
+        palettes    = {
+          specify = true,
+          free = {
+            colours = 15,
+            keys    = 1,
+          },
+        },
+        mirror      = false,
+        transform   = {
+          individual = false,
+          move       = false,
+          rotate     = false,
+          scale      = false,
+          shear      = false,
+          affine     = false,
+        },
+        sizes       = {
+          {
+            width  = 8,
+            height = 8,
+          },
+        },
+        map         = false,
         },
       },
     },