Commit: b93168b39560f10fbc792d0ad2478731da17c48f - HotshotOnline (hg)

Commit MetaInfo

• Revision: b93168b39560f10fbc792d0ad2478731da17c48f (tree)
• Zeit: 2020-01-14 06:56:59
• Autor: sebastian_bugiu <sebastian_ <bugiu@head...>
• Commiter: sebastian_bugiu <sebastian_

Log Message

Pbs workflow now taken into account when creating item. 3rd person view for player ship now adapted for larger ship. Further adaptation might be needed. Updated ambient light source in level patrol.

Ändern Zusammenfassung

• modified: android/src/main/jni/blackholedarksunmain.cpp
• modified: core/src/headwayEnt/HotshotEngine/Renderer/nativeinterface/pipeline/ENG_NativeCalls.java
• modified: core/src/headwayEnt/blackholedarksun/physics/PlayerShipMotionState.java
• modified: desktop/raw/hotshot_gamedata/level_patrol.txt
• add: core/src/headwayEnt/HotshotEngine/Renderer/ENG_Workflows.java

Diff

diff -r bb37a1489dc1 -r b93168b39560 android/src/main/jni/blackholedarksunmain.cpp
--- a/android/src/main/jni/blackholedarksunmain.cpp	Wed Jan 08 22:00:23 2020 +0200
+++ b/android/src/main/jni/blackholedarksunmain.cpp	Mon Jan 13 23:56:59 2020 +0200
@@ -1365,6 +1365,7 @@
             case SCENEMANAGER_ITEM_CREATE:
             {
                 BufferRead<long long> bufferReadLong;
+                BufferRead<char> bufferReadChar;
                 alignPointer(&buf, 4);
                 long long int sceneManagerPtr = bufferReadLong.read(&buf);
                 Ogre::SceneManager *sceneManager = (Ogre::SceneManager*) getLongAsPointer(sceneManagerPtr);
@@ -1372,6 +1373,7 @@
                 bool ptrJustCreated = isPointerJustCreated(ptrFlag);
                 long long int itemPtr = bufferReadLong.read(&buf);
                 const Ogre::String &meshName = readString(&buf);
+                char workflow = bufferReadChar.read(&buf);
                 Ogre::Item *item = sceneManager->createItem(meshName);
                 addToItemList(item, MovableObjectType::ITEM);
                 Ogre::String name(std::string("create_item ") + meshName);
@@ -1383,12 +1385,14 @@
                 for (size_t i = 0; i < itemsCount; ++i)
                 {
                     Ogre::SubItem *pSubItem = item->getSubItem(i);
-                    Ogre::HlmsPbsDatablock *datablock = (Ogre::HlmsPbsDatablock*) pSubItem->getDatablock();
-                    datablock->setWorkflow(Ogre::HlmsPbsDatablock::Workflows::MetallicWorkflow);
+                    if (workflow != (char) Ogre::HlmsPbsDatablock::Workflows::SpecularWorkflow)
+                    {
+                        Ogre::HlmsPbsDatablock *datablock = (Ogre::HlmsPbsDatablock*) pSubItem->getDatablock();
+                        datablock->setWorkflow((Ogre::HlmsPbsDatablock::Workflows) workflow);
+                    }
                     write(&wbuf, getPointerAsLong(pSubItem));
                 }
 
-
             }
                 break;
             case SCENEMANAGER_ITEM_CREATE_ALL_PARAMS:
@@ -1404,6 +1408,7 @@
                 const Ogre::String &meshName = readString(&buf);
                 const Ogre::String &groupName = readString(&buf);
                 char sceneMemoryMgrTypeChar = bufferReadChar.read(&buf);
+                char workflow = bufferReadChar.read(&buf);
                 Ogre::Item *item = sceneManager->createItem(meshName, groupName,
                                                             sceneMemoryMgrTypeChar == 0 ? ::Ogre::SCENE_DYNAMIC : ::Ogre::SCENE_STATIC);
                 addToItemList(item, MovableObjectType::ITEM);
@@ -1416,8 +1421,11 @@
                 for (size_t i = 0; i < itemsCount; ++i)
                 {
                     Ogre::SubItem *pSubItem = item->getSubItem(i);
-                    Ogre::HlmsPbsDatablock *datablock = (Ogre::HlmsPbsDatablock*) pSubItem->getDatablock();
-                    datablock->setWorkflow(Ogre::HlmsPbsDatablock::Workflows::MetallicWorkflow);
+                    if (workflow != (char) Ogre::HlmsPbsDatablock::Workflows::SpecularWorkflow)
+                    {
+                        Ogre::HlmsPbsDatablock *datablock = (Ogre::HlmsPbsDatablock*) pSubItem->getDatablock();
+                        datablock->setWorkflow((Ogre::HlmsPbsDatablock::Workflows) workflow);
+                    }
                     write(&wbuf, getPointerAsLong(pSubItem));
                 }
             }

diff -r bb37a1489dc1 -r b93168b39560 core/src/headwayEnt/HotshotEngine/Renderer/ENG_Workflows.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/src/headwayEnt/HotshotEngine/Renderer/ENG_Workflows.java	Mon Jan 13 23:56:59 2020 +0200
@@ -0,0 +1,25 @@
+package headwayent.hotshotengine.renderer;
+
+public enum ENG_Workflows {
+    /// Specular workflow. Many popular PBRs use SpecularAsFresnelWorkflow
+    /// though. @see setWorkflow
+    SpecularWorkflow(0),
+
+    /// Specular workflow where the specular texture is addressed to the fresnel
+    /// instead of kS. This is normally referred as simply Specular workflow
+    /// in many other PBRs. @see setWorkflow
+    SpecularAsFresnelWorkflow(1),
+
+    //// Metallic workflow. @see setWorkflow
+    MetallicWorkflow(2);
+
+    private byte workflow;
+
+    private ENG_Workflows(int i) {
+        workflow = (byte) i;
+    }
+
+    public byte getWorkflow() {
+        return workflow;
+    }
+}

diff -r bb37a1489dc1 -r b93168b39560 core/src/headwayEnt/HotshotEngine/Renderer/nativeinterface/pipeline/ENG_NativeCalls.java
--- a/core/src/headwayEnt/HotshotEngine/Renderer/nativeinterface/pipeline/ENG_NativeCalls.java	Wed Jan 08 22:00:23 2020 +0200
+++ b/core/src/headwayEnt/HotshotEngine/Renderer/nativeinterface/pipeline/ENG_NativeCalls.java	Mon Jan 13 23:56:59 2020 +0200
@@ -62,6 +62,7 @@
 import headwayent.hotshotengine.renderer.ENG_TextAreaOverlayElement;
 import headwayent.hotshotengine.renderer.ENG_TextureNative;
 import headwayent.hotshotengine.renderer.ENG_TiledAnimationNative;
+import headwayent.hotshotengine.renderer.ENG_Workflows;
 import headwayent.hotshotengine.renderer.nativeinterface.classwrappers.ENG_NativePointer;
 import headwayent.hotshotengine.renderer.nativeinterface.classwrappers.ENG_NativePointerWithSetter;
 
@@ -1159,12 +1160,17 @@
     }
 
     public static void sceneManager_createItem(final ENG_Item item, String meshName, final int subItemCount) {
+        sceneManager_createItem(item, meshName, subItemCount, ENG_Workflows.SpecularWorkflow);
+    }
+
+    public static void sceneManager_createItem(final ENG_Item item, String meshName, final int subItemCount, ENG_Workflows workflow) {
         ENG_RenderingThread.writeByte(NativeCallsList.SCENEMANAGER_ITEM_CREATE.getCallPos());
         ENG_SceneManager sceneManager = ENG_RenderRoot.getRenderRoot().getSceneManager();
         ENG_RenderingThread.writeLong(sceneManager.getPointer());
         item.setPointer(ENG_Utility.getUniqueId());
         setPtr(item, true);
         writeString(meshName);
+        ENG_RenderingThread.writeByte(workflow.getWorkflow());
         ENG_RenderingThread.addFrameEndListener(new ENG_RenderedFrameListenerWithBufferCopyWithLock(
                 ENG_Long.SIZE_IN_BYTES * (subItemCount + 1), true) {
             @Override
@@ -1176,7 +1182,12 @@
 
     public static void sceneManager_createItem(final ENG_Item item, String meshName, String groupName,
                                                ENG_Common.SceneMemoryMgrTypes type, final int subItemCount) {
-        ENG_RenderingThread.writeByte(NativeCallsList.SCENEMANAGER_ITEM_CREATE.getCallPos());
+        sceneManager_createItem(item, meshName, groupName, type, subItemCount, ENG_Workflows.SpecularWorkflow);
+    }
+
+    public static void sceneManager_createItem(final ENG_Item item, String meshName, String groupName,
+                                               ENG_Common.SceneMemoryMgrTypes type, final int subItemCount, ENG_Workflows workflow) {
+        ENG_RenderingThread.writeByte(NativeCallsList.SCENEMANAGER_ITEM_CREATE_ALL_PARAMS.getCallPos());
         ENG_SceneManager sceneManager = ENG_RenderRoot.getRenderRoot().getSceneManager();
         ENG_RenderingThread.writeLong(sceneManager.getPointer());
         item.setPointer(ENG_Utility.getUniqueId());
@@ -1184,6 +1195,7 @@
         writeString(meshName);
         writeString(groupName);
         ENG_RenderingThread.writeByte(type.getPos());
+        ENG_RenderingThread.writeByte(workflow.getWorkflow());
         ENG_RenderingThread.addFrameEndListener(new ENG_RenderedFrameListenerWithBufferCopyWithLock(
                 ENG_Long.SIZE_IN_BYTES * (subItemCount + 1), true) {
             @Override

diff -r bb37a1489dc1 -r b93168b39560 core/src/headwayEnt/blackholedarksun/physics/PlayerShipMotionState.java
--- a/core/src/headwayEnt/blackholedarksun/physics/PlayerShipMotionState.java	Wed Jan 08 22:00:23 2020 +0200
+++ b/core/src/headwayEnt/blackholedarksun/physics/PlayerShipMotionState.java	Mon Jan 13 23:56:59 2020 +0200
@@ -26,7 +26,7 @@
 
     private CameraProperties cameraProperties;
     private final ENG_Quaternion tempOrientation = new ENG_Quaternion(true);
-    private final ENG_Vector4D cameraDelta = new ENG_Vector4D(0.0f, 30.0f, 150.0f, 1.0f);
+    private final ENG_Vector4D cameraDelta = new ENG_Vector4D(0.0f, 50.0f, 200.0f, 1.0f);
     private final ENG_Vector4D finalCameraPos = new ENG_Vector4D();
     private final ENG_Vector4D tempCameraPos = new ENG_Vector4D();
     private final LinkedList<ENG_Vector4D> finalCameraPositions = new LinkedList<>();

diff -r bb37a1489dc1 -r b93168b39560 desktop/raw/hotshot_gamedata/level_patrol.txt
--- a/desktop/raw/hotshot_gamedata/level_patrol.txt	Wed Jan 08 22:00:23 2020 +0200
+++ b/desktop/raw/hotshot_gamedata/level_patrol.txt	Mon Jan 13 23:56:59 2020 +0200
@@ -5,10 +5,10 @@
 		skybox SkyboxWorkspace0
 		light_dir -1.0 0.0 0.0
 		light_type directional
-		light_power_scale 1.0
-		light_diffuse_color 1.0 1.0 1.0 1.0
+		light_power_scale 3.14
+		light_diffuse_color 0.8 0.4 0.2 1.0
 		light_specular_color 0.8 0.4 0.2 1.0
-		ambient_light_upperhemi_lowerhemi_dir 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 -1.0 0.0 0.0
+		ambient_light_upperhemi_lowerhemi_dir 0.3 0.5 0.7 0.1 0.6 0.45 0.3 0.1 -1.0 0.0 0.0
 	//	play_cutscene sl_level_patrol_begin
 	//	use_skybox_data_from_level 1
 		player_ship_selection