コミット: 2d8633a93d98b18fa64cff531bb34131274ab04c - HotshotOnline (hg)

コミットメタ情報

• リビジョン: 2d8633a93d98b18fa64cff531bb34131274ab04c (tree)
• 日時: 2020-01-15 05:45:18
• 作者: sebastian_bugiu <sebastian_ <bugiu@head...>
• コミッター: sebastian_bugiu <sebastian_

ログメッセージ

Modified so that only ships use the metallic workflow while asteroids and flags only use specular workflow.

変更サマリ

• modified: core/src/headwayEnt/HotshotEngine/Renderer/ENG_Item.java
• modified: core/src/headwayEnt/HotshotEngine/Renderer/ENG_ItemFactory.java
• modified: core/src/headwayEnt/HotshotEngine/Renderer/ENG_SceneManager.java
• modified: core/src/headwayEnt/HotshotEngine/Renderer/ENG_Workflows.java
• modified: core/src/headwayEnt/blackholedarksun/menus/ShipSelection.java
• modified: core/src/headwayEnt/blackholedarksun/world/WorldManager.java
• modified: core/src/headwayEnt/blackholedarksun/world/WorldManagerBase.java
• modified: core/src/headwayEnt/blackholedarksun/world/WorldManagerMP.java
• modified: core/src/headwayEnt/blackholedarksun/world/WorldManagerSP.java
• modified: core/src/headwayEnt/blackholedarksun/world/WorldManagerServerSide.java

差分

diff -r b93168b39560 -r 2d8633a93d98 core/src/headwayEnt/HotshotEngine/Renderer/ENG_Item.java
--- a/core/src/headwayEnt/HotshotEngine/Renderer/ENG_Item.java	Mon Jan 13 23:56:59 2020 +0200
+++ b/core/src/headwayEnt/HotshotEngine/Renderer/ENG_Item.java	Tue Jan 14 22:45:18 2020 +0200
@@ -25,18 +25,18 @@
 //    private boolean nativePtrSet;
 //    protected boolean attached;
 
-    public ENG_Item(long id, String name, String meshName) {
-        this(id, name, meshName, 1);
+    public ENG_Item(long id, String name, String meshName, ENG_Workflows workflow) {
+        this(id, name, meshName, 1, workflow);
     }
 
-    public ENG_Item(long id, String name, String meshName, int subItemCount) {
+    public ENG_Item(long id, String name, String meshName, int subItemCount, ENG_Workflows workflow) {
         this.id = id;
         this.name = name;
-        initializeNative(meshName, subItemCount);
+        initializeNative(meshName, subItemCount, workflow);
     }
 
-    public void initializeNative(String meshName, int subItemCount) {
-        ENG_NativeCalls.sceneManager_createItem(this, meshName, subItemCount);
+    private void initializeNative(String meshName, int subItemCount, ENG_Workflows workflow) {
+        ENG_NativeCalls.sceneManager_createItem(this, meshName, subItemCount, workflow);
     }
 
     public void setSubItemPtr(long ptr) {

diff -r b93168b39560 -r 2d8633a93d98 core/src/headwayEnt/HotshotEngine/Renderer/ENG_ItemFactory.java
--- a/core/src/headwayEnt/HotshotEngine/Renderer/ENG_ItemFactory.java	Mon Jan 13 23:56:59 2020 +0200
+++ b/core/src/headwayEnt/HotshotEngine/Renderer/ENG_ItemFactory.java	Tue Jan 14 22:45:18 2020 +0200
@@ -14,7 +14,13 @@
     protected Object createInstanceImpl(String name, TreeMap<String, String> params) {
         String mesh = params.get("mesh");
         long lId = getIdParam(params);
-        return new ENG_Item(lId, name, mesh);
+        String pbsWorkflow = params.get(ENG_SceneManager.MOVABLE_OBJECT_PARAM_PBSWORKFLOW);
+        ENG_Workflows workflow = ENG_Workflows.SpecularWorkflow;
+        if (pbsWorkflow != null) {
+            int workflowByte = Integer.parseInt(pbsWorkflow);
+            workflow = ENG_Workflows.toWorkflow(workflowByte);
+        }
+        return new ENG_Item(lId, name, mesh, workflow);
     }
 
     @Override

diff -r b93168b39560 -r 2d8633a93d98 core/src/headwayEnt/HotshotEngine/Renderer/ENG_SceneManager.java
--- a/core/src/headwayEnt/HotshotEngine/Renderer/ENG_SceneManager.java	Mon Jan 13 23:56:59 2020 +0200
+++ b/core/src/headwayEnt/HotshotEngine/Renderer/ENG_SceneManager.java	Tue Jan 14 22:45:18 2020 +0200
@@ -64,6 +64,8 @@
     public static final String INTERNAL_RESOURCE_GROUP_NAME = "Internal";
     public static final String AUTODETECT_RESOURCE_GROUP_NAME = "Autodetect";
     public static final byte V_1_FAST_RENDER_QUEUE = (byte) 3;
+    public static final String MOVABLE_OBJECT_PARAM_PBSWORKFLOW = "pbsworkflow";
+    public static final String MOVABLE_OBJECT_PARAM_ID = "id";
 
     @Override
     public long getPointer() {
@@ -1442,8 +1444,14 @@
      * @return
      */
     public ENG_Item createItem(String name, long id, String meshName, String groupName) {
+        return createItem(name, id, meshName, groupName, ENG_Workflows.SpecularWorkflow);
+    }
+
+
+    public ENG_Item createItem(String name, long id, String meshName, String groupName, ENG_Workflows pbsWorkflow) {
         TreeMap<String, String> params = getCreateEntityParams(meshName, groupName);
-        params.put("id", String.valueOf(id));
+        params.put(MOVABLE_OBJECT_PARAM_ID, String.valueOf(id));
+        params.put(MOVABLE_OBJECT_PARAM_PBSWORKFLOW, String.valueOf(pbsWorkflow.getWorkflow()));
         ENG_Item item = (ENG_Item) createMovableObject(name, ENG_ItemFactory.FACTORY_TYPE_NAME, params);
         addMovableObject(item, AttachableObjectType.ITEM);
         return item;

diff -r b93168b39560 -r 2d8633a93d98 core/src/headwayEnt/HotshotEngine/Renderer/ENG_Workflows.java
--- a/core/src/headwayEnt/HotshotEngine/Renderer/ENG_Workflows.java	Mon Jan 13 23:56:59 2020 +0200
+++ b/core/src/headwayEnt/HotshotEngine/Renderer/ENG_Workflows.java	Tue Jan 14 22:45:18 2020 +0200
@@ -22,4 +22,18 @@
     public byte getWorkflow() {
         return workflow;
     }
+
+    public static ENG_Workflows toWorkflow(int value) {
+        switch (value)
+        {
+            case 0:
+                return ENG_Workflows.SpecularWorkflow;
+            case 1:
+                return ENG_Workflows.SpecularAsFresnelWorkflow;
+            case 2:
+                return ENG_Workflows.MetallicWorkflow;
+            default:
+                throw new IllegalArgumentException(value + " is an invalid workflow");
+        }
+    }
 }

diff -r b93168b39560 -r 2d8633a93d98 core/src/headwayEnt/blackholedarksun/menus/ShipSelection.java
--- a/core/src/headwayEnt/blackholedarksun/menus/ShipSelection.java	Mon Jan 13 23:56:59 2020 +0200
+++ b/core/src/headwayEnt/blackholedarksun/menus/ShipSelection.java	Tue Jan 14 22:45:18 2020 +0200
@@ -21,6 +21,7 @@
 import headwayent.hotshotengine.ENG_Vector4D;
 import headwayent.hotshotengine.renderer.ENG_ColorValue;
 import headwayent.hotshotengine.renderer.ENG_Item;
+import headwayent.hotshotengine.renderer.ENG_Workflows;
 import headwayent.hotshotengine.statedebugger.ENG_FrameInterval;
 import headwayent.hotshotengine.statedebugger.ENG_State;
 
@@ -436,7 +437,7 @@
         destroySelectedShip();
         ENG_SceneManager sceneManager = ENG_RenderRoot.getRenderRoot().getSceneManager("Main");
         selectionShip = sceneManager.createItem("SelectionShip", ENG_Utility.getUniqueId(),
-                /*FilenameUtils.getBaseName(shipData.filename)*/shipData.filename, "");
+                /*FilenameUtils.getBaseName(shipData.filename)*/shipData.filename, "", ENG_Workflows.MetallicWorkflow);
 //        ENG_Entity entity = sceneManager.createEntity("SelectionShip", FilenameUtils.getBaseName(shipData.filename), "");
 //        selectionShip.setDatablockName("Rocks");
 //        selectionShip.setVisibilityFlag( 0x000000001 );

diff -r b93168b39560 -r 2d8633a93d98 core/src/headwayEnt/blackholedarksun/world/WorldManager.java
--- a/core/src/headwayEnt/blackholedarksun/world/WorldManager.java	Mon Jan 13 23:56:59 2020 +0200
+++ b/core/src/headwayEnt/blackholedarksun/world/WorldManager.java	Tue Jan 14 22:45:18 2020 +0200
@@ -782,7 +782,8 @@
 //        int nextId = weaponProperties.getNextId();
         String name = shipEntityProperties.getName() + "_" + headwayent.blackholedarksun.entitydata.WeaponData.WeaponType.getWeapon(weaponData.weaponType) + nextId;
         // System.out.println("creating projectile: " + name);
-        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(name, gameEntityId), ENG_Utility.getUniqueId(), meshName, "");
+        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(name, gameEntityId), ENG_Utility.getUniqueId(),
+                meshName, "", ENG_Workflows.MetallicWorkflow);
 //        ENG_Entity entity = sceneManager.createEntity(EntityProperties.generateUniqueName(name, gameEntityId), gameEntityId, meshName, ENTITY_GROUP_NAME);
 
 

diff -r b93168b39560 -r 2d8633a93d98 core/src/headwayEnt/blackholedarksun/world/WorldManagerBase.java
--- a/core/src/headwayEnt/blackholedarksun/world/WorldManagerBase.java	Mon Jan 13 23:56:59 2020 +0200
+++ b/core/src/headwayEnt/blackholedarksun/world/WorldManagerBase.java	Tue Jan 14 22:45:18 2020 +0200
@@ -1922,6 +1922,14 @@
         this.cameraNode = null;
     }
 
+    public ENG_Workflows getWorkflow(LevelObject obj) {
+        if (obj.type == LevelObject.LevelObjectType.FLAG_BLUE || obj.type == LevelObject.LevelObjectType.FLAG_RED ||
+                obj.type == LevelObject.LevelObjectType.ASTEROID) {
+            return ENG_Workflows.SpecularWorkflow;
+        }
+        return ENG_Workflows.MetallicWorkflow;
+    }
+
     public static void incrementGameEntityId() {
         ++gameEntityId;
     }

diff -r b93168b39560 -r 2d8633a93d98 core/src/headwayEnt/blackholedarksun/world/WorldManagerMP.java
--- a/core/src/headwayEnt/blackholedarksun/world/WorldManagerMP.java	Mon Jan 13 23:56:59 2020 +0200
+++ b/core/src/headwayEnt/blackholedarksun/world/WorldManagerMP.java	Tue Jan 14 22:45:18 2020 +0200
@@ -37,6 +37,7 @@
 import headwayent.hotshotengine.renderer.ENG_CameraNative;
 import headwayent.hotshotengine.renderer.ENG_Item;
 import headwayent.hotshotengine.renderer.ENG_SceneNode;
+import headwayent.hotshotengine.renderer.ENG_Workflows;
 import headwayent.hotshotengine.resource.ENG_ModelResource;
 
 import java.util.ArrayList;
@@ -237,7 +238,8 @@
         String name = projectileLauncherEntityProperties.getName() + "_" + WeaponData.WeaponType.getWeapon(weaponData.weaponType) +
                 serverEntityProperties.getEntityId();
 
-        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(name, serverEntityProperties.getEntityId()), serverEntityProperties.getEntityId(), weaponData.filename, "");
+        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(name, serverEntityProperties.getEntityId()),
+                serverEntityProperties.getEntityId(), weaponData.filename, "", ENG_Workflows.MetallicWorkflow);
 //        ENG_Entity entity = sceneManager.createEntity(EntityProperties.generateUniqueName(name, serverEntityProperties.getEntityId()),
 //                serverEntityProperties.getEntityId(), weaponData.filename, ENTITY_GROUP_NAME);
         // This is a blocking call!!!
@@ -755,7 +757,8 @@
 
         EntityProperties serverEntityProperties = currentlyAddedEntity.getEntityProperties();
 
-        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(obj.name, serverEntityProperties.getEntityId()), ENG_Utility.getUniqueId()/*serverEntityProperties.getEntityId()*/, obj.meshName, "");
+        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(obj.name, serverEntityProperties.getEntityId()),
+                ENG_Utility.getUniqueId()/*serverEntityProperties.getEntityId()*/, obj.meshName, "", getWorkflow(obj));
 
         // This is a blocking call!!!
         EntityAabb entityAabb = getEntityAabb(obj.meshName);

diff -r b93168b39560 -r 2d8633a93d98 core/src/headwayEnt/blackholedarksun/world/WorldManagerSP.java
--- a/core/src/headwayEnt/blackholedarksun/world/WorldManagerSP.java	Mon Jan 13 23:56:59 2020 +0200
+++ b/core/src/headwayEnt/blackholedarksun/world/WorldManagerSP.java	Tue Jan 14 22:45:18 2020 +0200
@@ -490,7 +490,8 @@
             // Change this to EntityData. That contains the needed filename.
             ShipData entityData = MainApp.getGame().getNameToShipMap("reloader");
 
-            ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(entityData.name, gameEntityId), ENG_Utility.getUniqueId(), entityData.filename, "");
+            ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(entityData.name, gameEntityId),
+                    ENG_Utility.getUniqueId(), entityData.filename, "", ENG_Workflows.MetallicWorkflow);
             currentReloaderShipId = gameEntityId;
 
             // This is a blocking call!!!
@@ -588,7 +589,8 @@
         long beginTime = currentTimeMillis();
         availableNameList.add(obj.name);
 
-        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(obj.name, gameEntityId), ENG_Utility.getUniqueId(), obj.meshName, "");
+        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(obj.name, gameEntityId),
+                ENG_Utility.getUniqueId(), obj.meshName, "", getWorkflow(obj));
 
         // This is a blocking call!!!
         EntityAabb entityAabb = getEntityAabb(obj.meshName);

diff -r b93168b39560 -r 2d8633a93d98 core/src/headwayEnt/blackholedarksun/world/WorldManagerServerSide.java
--- a/core/src/headwayEnt/blackholedarksun/world/WorldManagerServerSide.java	Mon Jan 13 23:56:59 2020 +0200
+++ b/core/src/headwayEnt/blackholedarksun/world/WorldManagerServerSide.java	Tue Jan 14 22:45:18 2020 +0200
@@ -35,6 +35,7 @@
 import headwayent.hotshotengine.*;
 import headwayent.hotshotengine.renderer.ENG_Item;
 import headwayent.hotshotengine.renderer.ENG_SceneNode;
+import headwayent.hotshotengine.renderer.ENG_Workflows;
 
 import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
@@ -531,7 +532,8 @@
             obj.meshName = obj.meshName + ".mesh";
         }
 
-        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(obj.name, gameEntityId), ENG_Utility.getUniqueId(), obj.meshName, "");
+        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(obj.name, gameEntityId),
+                ENG_Utility.getUniqueId(), obj.meshName, "", getWorkflow(obj));
 
         EntityAabb entityAabb = getEntityAabb(obj.meshName);
         System.out.println("centre: " + entityAabb.centre.toString() + " halfSize: " + entityAabb.halfSize.toString());
@@ -894,7 +896,8 @@
 //        int nextId = weaponProperties.getNextId();
         String name = entityProperties.getName() + "_" + headwayent.blackholedarksun.entitydata.WeaponData.WeaponType.getWeapon(weaponData.weaponType) + nextId;
         System.out.println("creating projectile: " + name);
-        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(name, gameEntityId), ENG_Utility.getUniqueId(), weaponData.filename, "");
+        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(name, gameEntityId),
+                ENG_Utility.getUniqueId(), weaponData.filename, "", ENG_Workflows.MetallicWorkflow);
 //        ENG_Entity entity = sceneManager.createEntity(EntityProperties.generateUniqueName(name, gameEntityId), gameEntityId, meshName, ENTITY_GROUP_NAME);
         EntityAabb entityAabb = getEntityAabb(weaponData.filename);
         ENG_SceneNode node = sceneManager.getRootSceneNode().createChildSceneNode(item.getName());
@@ -1014,7 +1017,8 @@
         long nextId = serverWeaponProperties.getNextId();//clientProjectileProperties.getId();
         String name = entityProperties.getName() + "_" + headwayent.blackholedarksun.entitydata.WeaponData.WeaponType.getWeapon(clientProjectileProperties.getType()) + "_" + nextId;
         System.out.println("creating projectile: " + name);
-        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(name, gameEntityId), ENG_Utility.getUniqueId(), weaponData.filename, "");
+        ENG_Item item = sceneManager.createItem(EntityProperties.generateUniqueName(name, gameEntityId),
+                ENG_Utility.getUniqueId(), weaponData.filename, "", ENG_Workflows.MetallicWorkflow);
 //        ENG_Entity entity = sceneManager.createEntity(EntityProperties.generateUniqueName(name, gameEntityId), gameEntityId, weaponData.filename, ENTITY_GROUP_NAME);
         EntityAabb entityAabb = getEntityAabb(weaponData.filename);
         ENG_SceneNode node = sceneManager.getRootSceneNode().createChildSceneNode(item.getName());