universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge fix and additional templates

Browse Source
This commit is contained in:
Michael Becker 2022-03-17 14:47:55 -04:00
parent 38b61618eb
commit fadfa36c82
No known key found for this signature in database
GPG Key ID: 98C333A81F18C22C
20 changed files with 476 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -18,5 +18,5 @@ repos:
hooks:
- id: forbid-space-in-indent
language: script
exclude: (^.*\.(csproj|glade|resx|svg|yaml|txt|uexml)$)|LICENSE
exclude: (^.*\.(csproj|glade|resx|svg|yaml|txt|uexml|cxxproj)$)|LICENSE
exclude_types: ['binary']

25
Content/UniversalEditor.Content.PlatformIndependent/ProjectTypes/{2dae6c31-c0c0-4097-ae95-60d201570baf}.uexml Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE UniversalEditor SYSTEM "U:\Doctypes\UniversalEditor.dtd">
<UniversalEditor Version="3.0">
<ProjectTypes>
<ProjectType ID="{2dae6c31-c0c0-4097-ae95-60d201570baf}">
<Information>
<Title>C/C++ Project</Title>
</Information>
<Tasks>
<!--
ActionTypes are defined in libraries.
{EE505E05-F125-4718-BA0A-879C72B5125A} corresponds to the built-in task action type ExecutableAction
When Tasks are executed, each Action in Actions gets executed.
When Actions are executed, the TaskType gets the inner XML of the task and processes it to extract parameters.
Certain tags are expanded by the preprocessor, like StringBuilder which is common to all TaskTypes.
-->
<!-- Build Project -->
<Task ID="{feb2614c-e6c1-4200-8a2c-7b0ad1c90eae}">
<Actions>
</Actions>
</Task>
</Tasks>
</ProjectType>
</ProjectTypes>
</UniversalEditor>

17
Content/UniversalEditor.Content.PlatformIndependent/ProjectTypes/{F184B08F-C81C-45F6-A57F-5ABD9991F28F}.uexml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE UniversalEditor SYSTEM "U:\Doctypes\UniversalEditor.dtd">
<UniversalEditor Version="3.0">
<ProjectTypes>
<ProjectType ID="{F184B08F-C81C-45F6-A57F-5ABD9991F28F}">
<Information>
<Title>VB.NET Project</Title>
</Information>
<Settings>
<Group Title="Application">
<TextSetting Title="Assembly name" />
<TextSetting Title="Root namespace" />
</Group>
</Settings>
</ProjectType>
</ProjectTypes>
</UniversalEditor>

23
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C#/ConsoleApplication/ConsoleApplication.uexml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<UniversalEditor Version="2.0">
<ProjectTemplates>
<ProjectTemplate ID="{f563387c-d583-41df-bed1-661d98914cb4}" TypeID="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}">
<ProjectTypes>
<!-- These are also called 'natures' in Eclipse -->
<!-- Microsoft.CSharp.projecttype -->
<ProjectType ID="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" />
</ProjectTypes>
<Information>
<Title>Console Application</Title>
<ProjectNamePrefix>ConsoleApplication</ProjectNamePrefix>
<Description>Creates a basic text-only (console) application in C#.</Description>
<IconPath LargeFileName="Images/Console_32x32.png" SmallFileName="Images/Console_16x16.png" />
<Path>
<Part>Software Development</Part>
<Part>C#</Part>
</Path>
</Information>
<FileSystem CopyFrom="content" />
</ProjectTemplate>
</ProjectTemplates>
</UniversalEditor>

49
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C#/ConsoleApplication/content/$(Project.Title).csproj Normal file
View File

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7FB49F92-2DB6-42DE-8A9B-8568615CAD32}</ProjectGuid>
<ProjectTypeGuids>{69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Exe</OutputType>
<RootNamespace>PsmRuntime</RootNamespace>
<AssemblyName>PsmRuntime</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Sce.PlayStation.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="AppMain.cs" />
</ItemGroup>
<ItemGroup>
<ShaderProgram Include="shaders\Simple.fcg" />
<ShaderProgram Include="shaders\Simple.vcg" />
</ItemGroup>
<ItemGroup>
<PsmMetadata Include="app.xml" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
</Project>

48
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C#/ConsoleApplication/content/AppMain.cs Normal file
View File

@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
using Sce.PlayStation.Core;
using Sce.PlayStation.Core.Environment;
using Sce.PlayStation.Core.Graphics;
using Sce.PlayStation.Core.Input;
namespace $(Project.Title)
{
public class AppMain
{
private static GraphicsContext graphics;
public static void Main (string[] args)
{
Initialize ();
while (true) {
SystemEvents.CheckEvents ();
Update ();
Render ();
}
}
public static void Initialize ()
{
// Set up the graphics system
graphics = new GraphicsContext ();
}
public static void Update ()
{
// Query gamepad for current state
var gamePadData = GamePad.GetData (0);
}
public static void Render ()
{
// Clear the screen
graphics.SetClearColor (0.0f, 0.0f, 0.0f, 0.0f);
graphics.Clear ();
// Present the screen
graphics.SwapBuffers ();
}
}
}

10
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C#/ConsoleApplication/content/app.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<application project_name="*" version="1.00" default_locale="en-US">
<runtime_config>
<memory managed_heap_size="32768" resource_heap_size="65536" />
</runtime_config>
<feature_list>
<feature value="GamePad" />
<feature value="Touch" />
</feature_list>
</application>

6
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C#/ConsoleApplication/content/shaders/Simple.fcg Normal file
View File

@ -0,0 +1,6 @@
void main( float4 out Color : COLOR,
uniform float4 MaterialColor )
{
Color = MaterialColor;
}

8
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C#/ConsoleApplication/content/shaders/Simple.vcg Normal file
View File

@ -0,0 +1,8 @@
void main( float4 in a_Position : POSITION,
float4 out v_Position : POSITION,
uniform float4x4 WorldViewProj
)
{
v_Position = mul( a_Position, WorldViewProj );
}

24
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C++/ConsoleApplication/ConsoleApplication.uexml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
<UniversalEditor Version="2.0">
<ProjectTemplates>
<ProjectTemplate ID="{69f7f2a3-e899-433b-a8aa-66c155f12a58}" TypeID="{2dae6c31-c0c0-4097-ae95-60d201570baf}">
<ProjectTypes>
<!-- These are also called 'natures' in Eclipse -->
<!-- Microsoft.CSharp.projecttype -->
<ProjectType ID="{2dae6c31-c0c0-4097-ae95-60d201570baf}" />
</ProjectTypes>
<Information>
<Title>Cross-Platform Console Application</Title>
<ProjectNamePrefix>ConsoleApplication</ProjectNamePrefix>
<Description>Creates a basic text-only (console) application in C++.</Description>
<IconPath LargeFileName="Images/Console_32x32.png" SmallFileName="Images/Console_16x16.png" />
<Path>
<Part>Software Development</Part>
<Part>C++</Part>
<Part>Cross-Platform</Part>
</Path>
</Information>
<FileSystem CopyFrom="content" />
</ProjectTemplate>
</ProjectTemplates>
</UniversalEditor>

49
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C++/ConsoleApplication/content/$(Project.Title).csproj Normal file
View File

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7FB49F92-2DB6-42DE-8A9B-8568615CAD32}</ProjectGuid>
<ProjectTypeGuids>{69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Exe</OutputType>
<RootNamespace>PsmRuntime</RootNamespace>
<AssemblyName>PsmRuntime</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Sce.PlayStation.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="AppMain.cs" />
</ItemGroup>
<ItemGroup>
<ShaderProgram Include="shaders\Simple.fcg" />
<ShaderProgram Include="shaders\Simple.vcg" />
</ItemGroup>
<ItemGroup>
<PsmMetadata Include="app.xml" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
</Project>

48
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C++/ConsoleApplication/content/AppMain.cs Normal file
View File

@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
using Sce.PlayStation.Core;
using Sce.PlayStation.Core.Environment;
using Sce.PlayStation.Core.Graphics;
using Sce.PlayStation.Core.Input;
namespace $(Project.Title)
{
public class AppMain
{
private static GraphicsContext graphics;
public static void Main (string[] args)
{
Initialize ();
while (true) {
SystemEvents.CheckEvents ();
Update ();
Render ();
}
}
public static void Initialize ()
{
// Set up the graphics system
graphics = new GraphicsContext ();
}
public static void Update ()
{
// Query gamepad for current state
var gamePadData = GamePad.GetData (0);
}
public static void Render ()
{
// Clear the screen
graphics.SetClearColor (0.0f, 0.0f, 0.0f, 0.0f);
graphics.Clear ();
// Present the screen
graphics.SwapBuffers ();
}
}
}

10
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C++/ConsoleApplication/content/app.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<application project_name="*" version="1.00" default_locale="en-US">
<runtime_config>
<memory managed_heap_size="32768" resource_heap_size="65536" />
</runtime_config>
<feature_list>
<feature value="GamePad" />
<feature value="Touch" />
</feature_list>
</application>

6
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C++/ConsoleApplication/content/shaders/Simple.fcg Normal file
View File

@ -0,0 +1,6 @@
void main( float4 out Color : COLOR,
uniform float4 MaterialColor )
{
Color = MaterialColor;
}

8
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C++/ConsoleApplication/content/shaders/Simple.vcg Normal file
View File

@ -0,0 +1,8 @@
void main( float4 in a_Position : POSITION,
float4 out v_Position : POSITION,
uniform float4x4 WorldViewProj
)
{
v_Position = mul( a_Position, WorldViewProj );
}

24
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C++/ControlPanel/CplApplet.uexml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
<UniversalEditor Version="2.0">
<ProjectTemplates>
<ProjectTemplate ID="{18ed6e0e-80b8-474e-91d4-4c7e9890c1cc}" TypeID="{2dae6c31-c0c0-4097-ae95-60d201570baf}">
<ProjectTypes>
<!-- These are also called 'natures' in Eclipse -->
<!-- Microsoft.CPlusPlus.projecttype -->
<ProjectType ID="{2dae6c31-c0c0-4097-ae95-60d201570baf}" />
</ProjectTypes>
<Information>
<Title>Windows Control Panel Applet Project</Title>
<ProjectNamePrefix>CplApplet</ProjectNamePrefix>
<Description>Creates a basic Windows Control Panel applet.</Description>
<IconPath LargeFileName="Images/Applet_32x32.png" SmallFileName="Images/Applet_16x16.png" />
<Path>
<Part>Software Development</Part>
<Part>C++</Part>
<Part>Control Panel</Part>
</Path>
</Information>
<FileSystem CopyFrom="content" />
</ProjectTemplate>
</ProjectTemplates>
</UniversalEditor>

49
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C++/ControlPanel/content/$(Project.Title).cxxproj Normal file
View File

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7FB49F92-2DB6-42DE-8A9B-8568615CAD32}</ProjectGuid>
<ProjectTypeGuids>{69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Exe</OutputType>
<RootNamespace>PsmRuntime</RootNamespace>
<AssemblyName>PsmRuntime</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Sce.PlayStation.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="AppMain.cs" />
</ItemGroup>
<ItemGroup>
<ShaderProgram Include="shaders\Simple.fcg" />
<ShaderProgram Include="shaders\Simple.vcg" />
</ItemGroup>
<ItemGroup>
<PsmMetadata Include="app.xml" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
</Project>

48
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/C++/ControlPanel/content/Program.c Normal file
View File

@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
using Sce.PlayStation.Core;
using Sce.PlayStation.Core.Environment;
using Sce.PlayStation.Core.Graphics;
using Sce.PlayStation.Core.Input;
namespace $(Project.Title)
{
public class AppMain
{
private static GraphicsContext graphics;
public static void Main (string[] args)
{
Initialize ();
while (true) {
SystemEvents.CheckEvents ();
Update ();
Render ();
}
}
public static void Initialize ()
{
// Set up the graphics system
graphics = new GraphicsContext ();
}
public static void Update ()
{
// Query gamepad for current state
var gamePadData = GamePad.GetData (0);
}
public static void Render ()
{
// Clear the screen
graphics.SetClearColor (0.0f, 0.0f, 0.0f, 0.0f);
graphics.Clear ();
// Present the screen
graphics.SwapBuffers ();
}
}
}

23
Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/VBNET/ConsoleApplication/ConsoleApplication.uexml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<UniversalEditor Version="2.0">
<ProjectTemplates>
<ProjectTemplate ID="{f563387c-d583-41df-bed1-661d98914cb4}" TypeID="{F184B08F-C81C-45F6-A57F-5ABD9991F28F}">
<ProjectTypes>
<!-- These are also called 'natures' in Eclipse -->
<!-- Microsoft.CSharp.projecttype -->
<ProjectType ID="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" />
</ProjectTypes>
<Information>
<Title>Console Application</Title>
<ProjectNamePrefix>ConsoleApplication</ProjectNamePrefix>
<Description>Creates a basic text-only (console) application in VB.NET.</Description>
<IconPath LargeFileName="Images/Console_32x32.png" SmallFileName="Images/Console_16x16.png" />
<Path>
<Part>Software Development</Part>
<Part>VB.NET</Part>
</Path>
</Information>
<FileSystem CopyFrom="content" />
</ProjectTemplate>
</ProjectTemplates>
</UniversalEditor>

2
Libraries/UniversalEditor.Essential/Template.cs
View File

@ -93,8 +93,6 @@ namespace UniversalEditor
/// </summary>
public string Description { get { return mvarDescription; } set { mvarDescription = value; } }
public string Prefix { get; set; } = null;
private TemplateVariable.TemplateVariableCollection mvarVariables = new TemplateVariable.TemplateVariableCollection();
/// <summary>
/// Variables that affect the content of this template.