Browse Source

Atom sample viewer gem updates (#365)

* Officially enabled the Sponza, UiBasics and MaterialEditor gems

Replaced the assets_scan_folders.setreg file with the
assetprocessor_settings.setreg.

The custom scan folder paths for directories no longer use the "/Amazon/Gems/SourcePaths" entries.
Scan Folder paths are no added through the official mechanism of
specifying a "Scan Folder <Name>" key underneath the
"/Amazon/AssetProcessor/Settings" field.

Signed-off-by: lumberyard-employee-dm <[email protected]>

* Updated the project.json and gem.json fields to include the o3de fields
and removed the Lumberyard 1.X fields.

Signed-off-by: lumberyard-employee-dm <[email protected]>
lumberyard-employee-dm 3 years ago
parent
commit
c3ef7b1b4a

+ 0 - 22
AssetProcessorGamePlatformConfig.setreg

@@ -1,22 +0,0 @@
-{
-    "Amazon": {
-        "AssetProcessor": {
-            "Settings": {
-                "RC cgf": {
-                    "ignore": true
-                },
-                "RC fbx": {
-                    "ignore": true
-                },
-                "ScanFolder AtomTestData": {
-                    "watch": "@ENGINEROOT@/Gems/Atom/TestData",
-                    "recursive": 1,
-                    "order": 1000
-                },
-                "Exclude screenshots": {
-                    "pattern": ".*\\\\/Scripts\\\\/ExpectedScreenshots\\\\/.*"
-                }
-            }
-        }
-    }
-}

+ 3 - 0
Gem/Code/enabled_gems.cmake

@@ -19,4 +19,7 @@ set(ENABLED_GEMS
     EditorPythonBindings
     ImGui
     Profiler
+    Sponza
+    MaterialEditor
+    UiBasics
 )

+ 16 - 94
Gem/gem.json

@@ -1,98 +1,20 @@
 {
     "gem_name": "AtomSampleViewerGem",
-    "Dependencies": [
-        {
-            "Uuid": "e011969cf32442fdaac2443a960ab5ff",
-            "VersionConstraints": [
-                "~>0.1.0"
-            ],
-            "_comment": "Atom RHI DX12"
-        },
-        {
-            "Uuid": "150d40d376124d98a388dfe890551c03",
-            "VersionConstraints": [
-                "~>0.1.0"
-            ],
-            "_comment": "Atom RHI Vulkan"
-        },
-        {
-            "Uuid": "5f27cdc951e64fe0be9d823dc7acbc28",
-            "VersionConstraints": [
-                "~>0.1.0"
-            ],
-            "_comment": "Atom RHI Metal"
-        },
-        {
-            "Uuid": "a218db9eb2114477b46600fea4441a6c",
-            "VersionConstraints": [
-                "~>0.1.0"
-            ],
-            "_comment": "Atom RPI"
-        },
-        {
-            "Uuid": "013d1b42ad314c929b292c143bcbf045",
-            "VersionConstraints": [
-                "~>0.1"
-            ],
-            "_comment": "Atom.Component.DebugCamera"
-        },
-        {
-            "Uuid": "d32452026dae4b7dba2ad89dbde9c48f",
-            "VersionConstraints": [
-                "~>0.1"
-            ],
-            "_comment": "Atom.Asset.Shader"
-        },
-        {
-            "Uuid": "b58e5eed0901428ca78544b04dbd61bd",
-            "VersionConstraints": [
-                "~>0.1"
-            ],
-            "_comment": "Atom.Feature.Common"
-        },
-        {
-            "Uuid": "5c850809e890497c82cd9999ecb33250",
-            "VersionConstraints": [
-                "~>0.1"
-            ],
-            "_comment": "Atom.Utils"
-        },
-        {
-            "Uuid": "c7ff89ad6e8b4b45b2fadef2bcf12d6e",
-            "VersionConstraints": [
-                "~>0.1"
-            ],
-            "_comment": "Atom_Bootstrap"
-        },
-        {
-            "Uuid": "b55b2738aa4a46c8b034fe98e6e5158b",
-            "VersionConstraints": [
-                "~>0.1"
-            ],
-            "_comment": "Atom_AtomBridge"
-        }
+    "display_name": "AtomSampleViewerGem",
+    "license": "What license AtomSampleViewerGem uses goes here: i.e. Apache-2.0 or MIT",
+    "license_url": "Link to the license web site goes here: i.e. https://opensource.org/licenses/Apache-2.0 Or https://opensource.org/licenses/MIT",
+    "origin": "The name of the originator goes here. i.e. XYZ Inc.",
+    "origin_url": "The primary repo for AtomSampleViewerGem goes here: i.e. http://www.mydomain.com",
+    "type": "Code",
+    "summary": "A short description of AtomSampleViewerGem goes here.",
+    "canonical_tags": [
+        "Gem"
     ],
-    "GemFormatVersion": 4,
-    "Uuid": "2114099d7a8940c2813e93b8b417277e",
-    "Name": "AtomSampleViewerGem",
-    "DisplayName": "AtomSampleViewerGem",
-    "Version": "0.1.0",
-    "LinkType": "Dynamic",
-    "Summary": "A short description of my Gem.",
-    "Tags": ["Game", "Asset"],
-    "IconPath": "preview.png",
-    "IsGameGem": true,
-    "Modules": [
-        {
-            "Type": "GameModule"
-        },
-        {
-            "Name": "Tools",
-            "Type": "EditorModule"
-        },
-        {
-            "Name": "Lib",
-            "Type": "StaticLib"
-        }
-    ]
+    "user_tags": [
+        "AtomSampleViewerGem"
+    ],
+    "icon_path": "preview.png",
+    "requirements": "Notice of any requirements AtomSampleViewerGem has goes here. i.e. This requires X other gem",
+    "documentation_url": "Link to any documentation of AtomSampleViewerGem goes here: i.e. https://o3de.org/docs/user-guide/gems/reference/design/white-box/",
+    "dependencies": []
 }

+ 35 - 0
Registry/assetprocessor_settings.setreg

@@ -0,0 +1,35 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "ScanFolder Project/ShaderLib": {
+                "watch": "@PROJECTROOT@/ShaderLib",
+                "recursive": 1,
+                "order": 1
+            },
+            "ScanFolder Project/Shaders": {
+                "watch": "@PROJECTROOT@/Shaders",
+                "recurisve": 1,
+                "order": 2
+            },
+            "ScanFolder Project/Registry": {
+                "watch": "@PROJECTROOT@/Registry",
+                "recursive": 1,
+                "order": 3
+            },
+            "ScanFolder AtomTestData": {
+                "watch": "@GEMROOT:Atom@/TestData",
+                "recursive": 1,
+                "order": 1000
+            },
+            "RC cgf": {
+                "ignore": true
+            },
+            "RC fbx": {
+                "ignore": true
+            },
+            "Exclude screenshots": {
+                "pattern": ".*\\\\/Scripts\\\\/ExpectedScreenshots\\\\/.*"
+            }
+        }
+    }
+}

+ 0 - 23
Registry/assets_scan_folders.setreg

@@ -1,23 +0,0 @@
-{
-    "Amazon":
-    {
-        "Gems":
-        {
-            "MaterialEditor":
-            {
-                "SourcePaths":
-                [
-                    "Gems/Atom/Tools/MaterialEditor",
-                    "Gems/AtomContent/Sponza"
-                ]
-            },
-            "UiBasics":
-            {
-                "SourcePaths":
-                [
-                    "Gems/UiBasics"
-                ]
-            }
-        }
-    }
-}

+ 14 - 19
project.json

@@ -1,22 +1,17 @@
 {
     "project_name": "AtomSampleViewer",
-    "product_name": "AtomSampleViewer",
-    "executable_name": "AtomSampleViewer.GameLauncher",
-    "code_folder": "Code/Viewers/AtomSampleViewer",
-    "modules": [],
     "project_id": "{D882E365-54D6-586E-BD78-2650F3057D49}",
-    "android_settings": {
-        "package_name": "com.lumberyard.atomsampleviewer",
-        "version_number": 1,
-        "version_name": "1.0.0.0",
-        "orientation": "landscape",
-        "place_assets_in_apk": 0,
-        "app_public_key": "MY_APP_PUBLIC_KEY",
-        "app_obfuscator_salt": "MY_OBFUSCATOR_SALT_BASE_64",
-        "enable_obb_in_dev": "false",
-        "use_main_obb": "false",
-        "use_patch_obb": "false",
-        "rc_obb_job": "RCJob_Generic_Android_MakeObb.xml"
-    },
-    "engine": "o3de"
-}
+    "origin": "The primary repo for AtomSampleViewer goes here: i.e. http://www.mydomain.com",
+    "license": "What license AtomSampleViewer uses goes here: i.e. https://opensource.org/licenses/Apache-2.0 Or https://opensource.org/licenses/MIT etc.",
+    "display_name": "AtomSampleViewer",
+    "summary": "A short description of AtomSampleViewer.",
+    "canonical_tags": [
+        "Project"
+    ],
+    "user_tags": [
+        "AtomSampleViewer"
+    ],
+    "icon_path": "preview.png",
+    "engine": "o3de",
+    "external_subdirectories": []
+}