Added Net Yaroze under psy-q tab

tools/vscode-extension/README.md

@@ -19,6 +19,11 @@ The panel will have the ability to install the tools on the most popular platfor
 
 ### Changelog
 
+- 0.3.3
+  - Adding Net Yaroze template.
+  - Refactored the template panel page a bit.
+- 0.3.2
+  - Fixing PSYQo's template.
 - 0.3.1
   - Fixing EASTL paths in PSYQo template for Unix-like systems.
 - 0.3.0

tools/vscode-extension/extension.js

@@ -68,7 +68,8 @@
           case 'getTemplates':
             this._panel.webview.postMessage({
               command: 'templates',
-              templates: templates.list
+              templates: templates.list,
+              categories: templates.categories
             })
             break
           case 'refreshTools':

tools/vscode-extension/media/main.js

@@ -90,94 +90,103 @@
           }
           for (const [category, templateKeys] of Object.entries(categories)) {
             const panel = document.createElement('vscode-panel-view')
+            const panelDiv = document.createElement('div')
+            panelDiv.className = 'templatespanel'
+            if (message.categories[category] !== undefined) {
+              const categoryDescription = document.createElement('h3')
+              categoryDescription.textContent =
+                message.categories[category].description
+              panelDiv.appendChild(categoryDescription)
+            }
             for (const key of templateKeys) {
               const template = templates[key]
               const templateDiv = document.createElement('div')
               templateDiv.className = 'template'
-              const templateName = document.createElement('h3')
+              const templateName = document.createElement('h2')
               templateName.textContent = template.name
               templateDiv.appendChild(templateName)
               const templateDescription = document.createElement('p')
               templateDescription.textContent = template.description
               templateDiv.appendChild(templateDescription)
               const templateDocumentation =
                 document.createElement('vscode-button')
               templateDocumentation.textContent = 'Documentation'
               templateDocumentation.appearance = 'secondary'
               if (template.url) {
                 templateDocumentation.addEventListener('click', () => {
                   vscode.postMessage({ command: 'openUrl', url: template.url })
                 })
               } else {
                 templateDocumentation.disabled = true
               }
               templateDiv.appendChild(templateDocumentation)
               const spaceTextNode0 = document.createTextNode('  ')
               templateDiv.appendChild(spaceTextNode0)
               const templateExamples = document.createElement('vscode-button')
               templateExamples.textContent = 'Examples'
               templateExamples.appearance = 'secondary'
               if (template.examples) {
                 templateExamples.addEventListener('click', () => {
                   vscode.postMessage({
                     command: 'openUrl',
                     url: template.examples
                   })
                 })
               } else {
                 templateExamples.disabled = true
               }
               templateDiv.appendChild(templateExamples)
               const spaceTextNode1 = document.createTextNode('  ')
               templateDiv.appendChild(spaceTextNode1)
               const templateInstallRequiredTools =
                 document.createElement('vscode-button')
               templateInstallRequiredTools.textContent =
                 'Install required tools'
               templateInstallRequiredTools.appearance = 'secondary'
               templateInstallRequiredTools.addEventListener('click', () => {
                 vscode.postMessage({
                   command: 'installTools',
                   tools: template.requiredTools
                 })
               })
               templateDiv.appendChild(templateInstallRequiredTools)
               const spaceTextNode2 = document.createTextNode('  ')
               templateDiv.appendChild(spaceTextNode2)
               const templateInstallRecommendedTools =
                 document.createElement('vscode-button')
               templateInstallRecommendedTools.textContent =
                 'Install recommended tools'
               templateInstallRecommendedTools.appearance = 'secondary'
               templateInstallRecommendedTools.addEventListener('click', () => {
                 vscode.postMessage({
                   command: 'installTools',
                   tools: [
                     ...template.recommendedTools,
                     ...template.requiredTools
                   ]
                 })
               })
               templateDiv.appendChild(templateInstallRecommendedTools)
               const spaceTextNode3 = document.createTextNode('  ')
               templateDiv.appendChild(spaceTextNode3)
               const templateCreate = document.createElement('vscode-button')
               templateCreate.textContent = 'Create'
               templateCreate.id = 'create-' + key
               templateCreate.disabled = true
               templateCreate.addEventListener('click', () => {
                 vscode.postMessage({
                   command: 'createProjectFromTemplate',
                   template: key,
                   path: document.getElementById('project-path').value,
                   name: document.getElementById('project-name').value
                 })
               })
               templateDiv.appendChild(templateCreate)
               const hr = document.createElement('hr')
               templateDiv.appendChild(hr)
-              panel.appendChild(templateDiv)
+              panelDiv.appendChild(templateDiv)
             }
+            panel.appendChild(panelDiv)
             panels.appendChild(panel)
           }
           templatesDiv.appendChild(panels)

tools/vscode-extension/package.json

@@ -2,7 +2,7 @@
   "name": "psx-dev",
   "displayName": "PSX.Dev",
   "description": "PlayStation 1 development made easy",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "engines": {
     "vscode": "^1.75.0"
   },

tools/vscode-extension/templates.js

@@ -267,6 +267,36 @@
     }
   ]
 })
+
+const netyarozeTemplate = combine(psyqTemplate, {
+  files: [
+    {
+      name: '.vscode/c_cpp_properties.json',
+      content: {
+        configurations: [
+          {
+            includePath: [
+              '${workspaceFolder}/third_party/net-yaroze/include'
+            ],
+            name: 'Win32'
+          },
+          {
+            includePath: [
+              '${workspaceFolder}/third_party/net-yaroze/include'
+            ],
+            name: 'linux'
+          }
+        ]
+      }
+    }
+  ],
+  modules: [
+    {
+      name: 'third_party/net-yaroze',
+      url: 'https://github.com/gwald/psyq_to_netyaroze.git'
+    }
+  ]
+})
 /* eslint-enable no-template-curly-in-string */
 
 async function createGitRepository (fullPath, template, progressReporter) {
@@ -354,7 +384,7 @@
     name: 'Psy-Q Cube',
     category: 'Psy-Q SDK',
     description:
-      'A project showing a spinning cube using the Psy-Q SDK. Please note that while it is probably considered abandonware at this point, you will not receive a proper license from Sony. Use it at your own risk. Additionally, while the project folder on your harddrive will have the SDK installed on it, the created git repository will not. If you publish the created git repository, users who clone it will need to restore the SDK using the WELCOME page button.',
+      'A project showing a spinning cube using the Psy-Q SDK.',
     url: 'https://psx.arthus.net/sdk/Psy-Q/DOCS/',
     examples: 'https://github.com/ABelliqueux/nolibgs_hello_worlds',
     requiredTools: ['git', 'make', 'toolchain', 'psyq'],
@@ -380,7 +410,7 @@
     name: 'PSYQo Hello World',
     category: 'PSYQo SDK',
     description:
-      'A project simply displaying Hello World using the PSYQo SDK. The PSYQo library is a C++-20 MIT-licensed framework cleanly written from scratch, allowing you to write modern, readable code targeting the PlayStation 1, while still being efficient. Additionally, you will have access to the EASTL library, which is a BSD-3-Clause licensed implementation of the C++ Standard Template Library.',
+      'A project simply displaying Hello World using the PSYQo SDK.',
     url: 'https://github.com/pcsx-redux/nugget/tree/main/psyqo#how',
     examples:
       'https://github.com/grumpycoders/pcsx-redux/tree/main/src/mips/psyqo/examples',
@@ -400,11 +430,48 @@
         { projectName: name }
       )
     }
+  },
+  psyq_netyaroze: {
+    name: 'Net Yaroze Sprite',
+    category: 'Psy-Q SDK',
+    description:
+      'A SCEE Net Yaroze tutorial showing 2D sprite movement, scaling and rotation using a subset of Psy-Q SDK (full compatibility is still Work In Progress).',
+    url: 'https://github.com/gwald/psyq_to_netyaroze/',
+    examples: 'https://github.com/gwald/netyaroze_demo',
+    requiredTools: ['git', 'make', 'toolchain', 'psyq'],
+    recommendedTools: ['gdb', 'debugger', 'redux'],
+    create: async function (fullPath, name, progressReporter, tools) {
+      const git = await createGitRepository(
+        fullPath,
+        netyarozeTemplate,
+        progressReporter
+      )
+
+      await copyTemplateDirectory(
+        git,
+        fullPath,
+        name,
+        path.join(extensionUri.fsPath, 'templates', 'psyq', 'net-yaroze'),
+        { projectName: name }
+      )
+      progressReporter.report({ message: 'Unpacking Net Yaroze...' })
+      await tools.psyq.unpack(path.join(fullPath, 'third_party', 'psyq'))
+    }
   }
 }
 
 exports.list = templates
-
+exports.categories = {
+  'Bare metal': {
+    description: 'Bare metal projects. These examples are using little to no external dependencies to work.'
+  },
+  'Psy-Q SDK': {
+    description: 'Projects using the Psy-Q SDK. This SDK was the original one published by Sony to create software for the PlayStation 1. Please note that while it is probably considered abandonware at this point, you will not receive a proper license from Sony. Use it at your own risk. Additionally, while the project folder on your harddrive will have the SDK installed on it, the created git repository will not. If you publish the created git repository, users who clone it will need to restore the SDK using the WELCOME page button.'
+  },
+  'PSYQo SDK': {
+    description: 'Projects using the PSYQo SDK. The PSYQo library is a C++-20 MIT-licensed framework cleanly written from scratch, allowing you to write modern, readable code targeting the PlayStation 1, while still being efficient. Additionally, you will have access to the EASTL library, which is a BSD-3-Clause licensed implementation of the C++ Standard Template Library.'
+  }
+}
 exports.createProjectFromTemplate = async function (tools, options) {
   const fullPath = path.join(options.path, options.name)
   const template = templates[options.template]

tools/vscode-extension/templates/psyq/net-yaroze/compile_flags.txt

@@ -0,0 +1,5 @@
+-m32
+-I.
+-Ithird_party/net-yaroze/include
+-Ithird_party/nugget
+-Ithird_party/psyq-iwyu/include