SWM: Ported xrRender

Author: ShokerStlk

src/Layers/xrRender/Blender_Recorder_StandartBinding.cpp

@@ -17,7 +17,7 @@
 #define BIND_DECLARE(xf)\
     class cl_xform_##xf : public R_constant_setup\
     {\
-        virtual void setup(R_constant* C) {RCache.xforms.set_c_##xf(C); }\
+        virtual void setup(R_constant* C) { RCache.xforms.set_c_##xf(C); }\
     };\
     static cl_xform_##xf binder_##xf
 BIND_DECLARE(w);
@@ -318,9 +318,53 @@ static class cl_screen_res : public R_constant_setup
     }
 } binder_screen_res;
 
+// SM_TODO: RCache.hemi заменить на более "логичное" место
+static class cl_hud_params : public R_constant_setup //--#SM+#--
+{
+    virtual void setup(R_constant* C) { RCache.set_c(C, g_pGamePersistent->m_pGShaderConstants->hud_params); }
+} binder_hud_params;
+
+static class cl_script_params : public R_constant_setup //--#SM+#--
+{
+    virtual void setup(R_constant* C) { RCache.set_c(C, g_pGamePersistent->m_pGShaderConstants->m_script_params); }
+} binder_script_params;
+
+static class cl_blend_mode : public R_constant_setup //--#SM+#--
+{
+    virtual void setup(R_constant* C) { RCache.set_c(C, g_pGamePersistent->m_pGShaderConstants->m_blender_mode); }
+} binder_blend_mode;
+
+class cl_camo_data : public R_constant_setup //--#SM+#--
+{
+    virtual void setup(R_constant* C) { RCache.hemi.c_camo_data = C; }
+};
+static cl_camo_data binder_camo_data;
+
+class cl_custom_data : public R_constant_setup //--#SM+#--
+{
+    virtual void setup(R_constant* C) { RCache.hemi.c_custom_data = C; }
+};
+static cl_custom_data binder_custom_data;
+
+class cl_entity_data : public R_constant_setup //--#SM+#--
+{
+    virtual void setup(R_constant* C) { RCache.hemi.c_entity_data = C; }
+};
+static cl_entity_data binder_entity_data;
+
 // Standart constant-binding
 void CBlender_Compile::SetMapping()
 {
+    // misc
+    r_Constant("m_hud_params", &binder_hud_params); //--#SM+#--
+    r_Constant("m_script_params", &binder_script_params); //--#SM+#--
+    r_Constant("m_blender_mode", &binder_blend_mode); //--#SM+#--
+
+    // objects data
+    r_Constant("m_obj_camo_data", &binder_camo_data); //--#SM+#--
+    r_Constant("m_obj_custom_data", &binder_custom_data); //--#SM+#--
+    r_Constant("m_obj_entity_data", &binder_entity_data); //--#SM+#--
+
     // matrices
     r_Constant("m_W", &binder_w);
     r_Constant("m_invW", &binder_invw);
@@ -374,7 +418,7 @@ void CBlender_Compile::SetMapping()
     r_Constant("screen_res", &binder_screen_res);
 
     // detail
-    //if (bDetail  && detail_scaler)
+    // if (bDetail  && detail_scaler)
     // Igor: bDetail can be overridden by no_detail_texture option.
     // But shader can be deatiled implicitly, so try to set this parameter
     // anyway.

src/Layers/xrRender/D3DXRenderBase.h

@@ -108,6 +108,7 @@ class D3DXRenderBase : public IRender, public pureFrame
         d = counter_D;
     }
     void clear_Counters() { counter_S = counter_D = 0; }
+
 public:
     D3DXRenderBase();
 

src/Layers/xrRender/DetailManager.cpp

@@ -32,14 +32,14 @@ void bwdithermap(int levels, int magic[16][16])
     float N = 255.0f / (levels - 1);
 
     /*
-    * Expand 4x4 dither pattern to 16x16.  4x4 leaves obvious patterning,
-    * and doesn't give us full intensity range (only 17 sublevels).
-    *
-    * magicfact is (N - 1)/16 so that we get numbers in the matrix from 0 to
-    * N - 1: mod N gives numbers in 0 to N - 1, don't ever want all
-    * pixels incremented to the next level (this is reserved for the
-    * pixel value with mod N == 0 at the next level).
-    */
+     * Expand 4x4 dither pattern to 16x16.  4x4 leaves obvious patterning,
+     * and doesn't give us full intensity range (only 17 sublevels).
+     *
+     * magicfact is (N - 1)/16 so that we get numbers in the matrix from 0 to
+     * N - 1: mod N gives numbers in 0 to N - 1, don't ever want all
+     * pixels incremented to the next level (this is reserved for the
+     * pixel value with mod N == 0 at the next level).
+     */
 
     float magicfact = (N - 1) / 16;
     for (int i = 0; i < 4; i++)
@@ -139,8 +139,7 @@ CDetailManager::~CDetailManager()
     xr_free(cache_level1);
 #endif
 }
-/*
-*/
+
 #ifndef _EDITOR
 
 /*
@@ -389,6 +388,7 @@ void CDetailManager::Render()
     MT_SYNC();
 
     RImplementation.BasicStats.DetailRender.Begin();
+    g_pGamePersistent->m_pGShaderConstants->m_blender_mode.w = 1.0f; //--#SM+#-- Флаг начала рендера травы [begin of grass render]
 
 #ifndef _EDITOR
     float factor = g_pGamePersistent->Environment().wind_strength_factor;
@@ -404,6 +404,8 @@ void CDetailManager::Render()
     else
         soft_Render();
     RCache.set_CullMode(CULL_CCW);
+
+    g_pGamePersistent->m_pGShaderConstants->m_blender_mode.w = 0.0f; //--#SM+#-- Флаг конца рендера травы [end of grass render]
     RImplementation.BasicStats.DetailRender.End();
     m_frame_rendered = RDEVICE.dwFrame;
 }

src/Layers/xrRender/FHierrarhyVisual.h

@@ -22,6 +22,12 @@ class FHierrarhyVisual : public dxRender_Visual
     virtual void Load(const char* N, IReader* data, u32 dwFlags);
     virtual void Copy(dxRender_Visual* pFrom);
     virtual void Release();
+    virtual IRenderVisual* getSubModel(u8 idx) //--#SM+#--
+    {
+        if (children.size() > idx)
+            return children[idx];
+        return NULL;
+    }
 };
 
 #endif // FHierrarhyVisualH

src/Layers/xrRender/KinematicsAddBoneTransform.hpp

@@ -0,0 +1,52 @@
+#pragma once //--#SM+#--
+
+#include "xrCore/_quaternion.h"
+
+namespace KinematicsABT
+{
+struct additional_bone_transform // Описывает постоянное смещение для указанной кости --#SM+#--
+{
+    bool m_bRotGlobal; // Use XYZ axis instead of HPB
+    u16 m_bone_id; // Bone ID
+    Fmatrix m_transform; // Rotation + Position
+
+    additional_bone_transform() : m_bRotGlobal(false), m_bone_id(-1) { m_transform.identity(); }
+
+    // Установить поворот кости (статичные оси)
+    void setRotGlobal(const float _x, const float _y, const float _z)
+    {
+        m_bRotGlobal = true;
+        m_transform.setXYZ(_x, _y, _z);
+    }
+
+    void setRotGlobal(Fvector& vRotOfs)
+    {
+        setRotGlobal(vRotOfs.x, vRotOfs.y, vRotOfs.z);
+    }
+
+    // Установить поворот кости (кость крутится вместе с осями)
+    void setRotLocal(const float _x, const float _y, const float _z)
+    {
+        m_bRotGlobal = false;
+        Fquaternion Q;
+        Q.rotationYawPitchRoll(_y, _x, _z);
+        m_transform.rotation(Q);
+    }
+
+    void setRotLocal(Fvector& vRotOfs)
+    {
+        setRotLocal(vRotOfs.x, vRotOfs.y, vRotOfs.z);
+    }
+
+    // Установить смещение позиции кости
+    void setPosOffset(const float _x, const float _y, const float _z)
+    {
+        m_transform.translate_over(_x, _y, _z);
+    }
+
+    void setPosOffset(Fvector& vPosOfs)
+    {
+        setPosOffset(vPosOfs.x, vPosOfs.y, vPosOfs.z);
+    }
+};
+}

src/Layers/xrRender/R_Backend_hemi.cpp

@@ -9,6 +9,9 @@ void R_hemi::unmap()
     c_pos_faces = nullptr;
     c_neg_faces = nullptr;
     c_material = nullptr;
+    c_camo_data = nullptr; //--#SM+#--
+    c_custom_data = nullptr; //--#SM+#--
+    c_entity_data = nullptr; //--#SM+#--
 }
 
 void R_hemi::set_pos_faces(float posx, float posy, float posz)
@@ -27,3 +30,18 @@ void R_hemi::set_material(float x, float y, float z, float w)
     if (c_material)
         RCache.set_c(c_material, x, y, z, w);
 }
+
+// Обновляем значения в шейдерных константах //--#SM+#-- //SM_TODO Переместить
+void R_hemi::c_update(IRenderVisual* pVisual)
+{
+    vis_object_data* _data = pVisual->getVisData().obj_data;
+
+    if (c_camo_data)
+        RCache.set_c(c_camo_data, _data->sh_camo_data);
+
+    if (c_custom_data)
+        RCache.set_c(c_custom_data, _data->sh_custom_data);
+
+    if (c_entity_data)
+        RCache.set_c(c_entity_data, _data->sh_entity_data);
+}

src/Layers/xrRender/R_Backend_hemi.h

@@ -2,12 +2,17 @@
 #define r_backend_hemiH
 #pragma once
 
+#include "Include/xrRender/RenderVisual.h" //--#SM+#--
+
 class ECORE_API R_hemi
 {
 public:
     R_constant* c_pos_faces;
     R_constant* c_neg_faces;
     R_constant* c_material;
+    R_constant* c_camo_data; //--#SM+#--
+    R_constant* c_custom_data; //--#SM+#--
+    R_constant* c_entity_data; //--#SM+#--
 
 public:
     R_hemi();
@@ -19,5 +24,7 @@ class ECORE_API R_hemi
     void set_pos_faces(float posx, float posy, float posz);
     void set_neg_faces(float negx, float negy, float negz);
     void set_material(float x, float y, float z, float w);
+
+    void c_update(IRenderVisual* pVisual); //--#SM+#--
 };
 #endif

src/Layers/xrRender/SkeletonAnimated.cpp

@@ -920,6 +920,15 @@ void CKinematicsAnimated::LL_BoneMatrixBuild(CBoneInstance& bi, const Fmatrix* p
 #endif
 }
 
+// Добавить скриптовое смещение для кости --#SM+#--
+void CKinematicsAnimated::LL_AddTransformToBone(KinematicsABT::additional_bone_transform& offset)
+{
+    inherited::LL_AddTransformToBone(offset);
+}
+
+// Обнулить скриптовое смещение для конкретной кости или всех сразу (bone_id = BI_NONE) --#SM+#--
+void CKinematicsAnimated::LL_ClearAdditionalTransform(u16 bone_id) { inherited::LL_ClearAdditionalTransform(bone_id); }
+
 void CKinematicsAnimated::BuildBoneMatrix(
     const CBoneData* bd, CBoneInstance& bi, const Fmatrix* parent, u8 channel_mask /*= (1<<0)*/)
 {
@@ -931,6 +940,8 @@ void CKinematicsAnimated::BuildBoneMatrix(
 
     LL_BoneMatrixBuild(bi, parent, keys);
 
+    CalculateBonesAdditionalTransforms(bd, bi, parent, channel_mask); //--#SM+#--
+
     /*
     if(bi.mTransform.c.y>10000)
     {

src/Layers/xrRender/SkeletonAnimated.h

@@ -64,6 +64,9 @@ class ECORE_API CKinematicsAnimated : public CKinematics, public IKinematicsAnim
         const CBoneData* bd, CBoneInstance& bi, const Fmatrix* parent, u8 mask_channel = (1 << 0));
 
 public:
+    virtual void LL_AddTransformToBone(KinematicsABT::additional_bone_transform& offset); //--#SM+#--
+    virtual void LL_ClearAdditionalTransform(u16 bone_id = BI_NONE); //--#SM+#--
+
     virtual void OnCalculateBones();
 
 public:

src/Layers/xrRender/SkeletonCustom.h

@@ -105,6 +105,10 @@ class CKinematics : public FHierrarhyVisual, public IKinematics
     friend class CBoneData;
     friend class CSkeletonX;
 
+protected: //--#SM+#--
+    DEFINE_VECTOR(KinematicsABT::additional_bone_transform, BONE_TRANSFORM_VECTOR, BONE_TRANSFORM_VECTOR_IT);
+    BONE_TRANSFORM_VECTOR m_bones_offsets;
+
 public:
 #ifdef DEBUG
     BOOL dbg_single_use_marker;
@@ -118,6 +122,11 @@ class CKinematics : public FHierrarhyVisual, public IKinematics
     virtual void BuildBoneMatrix(
         const CBoneData* bd, CBoneInstance& bi, const Fmatrix* parent, u8 mask_channel = (1 << 0));
     virtual void OnCalculateBones() {}
+
+    virtual void CalculateBonesAdditionalTransforms(
+        const CBoneData* bd, CBoneInstance& bi, const Fmatrix* parent, u8 mask_channel = (1 << 0)); //--#SM+#--
+    virtual void LL_AddTransformToBone(KinematicsABT::additional_bone_transform& offset); //--#SM+#--
+    virtual void LL_ClearAdditionalTransform(u16 bone_id = BI_NONE); //--#SM+#--
 public:
     dxRender_Visual* m_lod;
 
@@ -276,6 +285,7 @@ class CKinematics : public FHierrarhyVisual, public IKinematics
 
 protected:
     shared_str getDebugName() override { return dbg_name; }
+
 public:
 #endif