Queued dxDrawPrimitive and dxDrawMaterialPrimitive #339

forkerer · 2018-08-24T16:34:58Z

It's pretty much this pull request, but with proper queueing, state saving, and ability to be called from anywhere, not only onClientRender event.
Also there's added postGUI parameter:

bool dxDrawPrimitive( string primitiveType, [ postGUI = true ] table vertex1, table vertex2, table vertex3, ... )

bool dxDrawMaterialPrimitive( string primitiveType, material, [ postGUI = true ] table vertex1, table vertex2, table vertex3, ... )

…tive

Basic dxDrawPrimitive

…tive

CrosRoad95 · 2018-08-24T16:40:08Z

HE STOLE MY PULL REQUEST!

forkerer · 2018-08-24T16:41:03Z

yes

4O4 · 2018-08-24T22:11:11Z

While I really appreciate the work you did, I have to say the way you did it feels really wrong. This should be kept in scope of one pull request - you could ask @CrosRoad95 for write permissions to his fork or send him a patch to apply manually. But this is the tiny issue here. The bigger one is the legal one - code might be open source but there's a thing called copyright. You two should have a short conversation and come to some agreement :)

forkerer · 2018-08-25T06:04:41Z

Ye, i completely agree that it isn't the best way of doing it. My motivation for that was that i was telling CrosRoad exactly what's wrong with his dxDrawPrimitive since he created the pull request, as it is just flawed. I wont mind if this request is closed and not accepted as long as the original one is modified to work properly. It's not an attack on him, i just want the primitive drawing to be added, and this is the easiest way for me to show how it could be done.

CrosRoad95 · 2018-08-25T06:06:43Z

i can close my pr and you can marge this one.
also i noticed that your function don't have any limit of vertices, i tested and limit 4096 vertices should be ok

CrosRoad95 · 2018-08-25T06:37:39Z

i have one question: should be option to rotate and scale primitives or not? just like dxDrawText support this

forkerer · 2018-08-25T06:41:35Z

Would be pretty complicated to add right now i think, it's a good idea tho. Additional rotate/scale center parameter sounds nice.

- dxDrawPrimitive doesn't require you to draw at least 2 points now - Batcher classes did draw only a single point at all times anyways tho, fixed that - Cleaned up CPrimitiveBatcher.cpp - Replaced NULLs with nullptrs

Noticed that with last commit it would be possible to try draw 0 points without error

qaisjp · 2018-08-26T04:05:38Z

#301 has more gifs and so is better /close (thanks for your hard work @CrosRoad95)

ghost

The methods are too long in your PR, you can very easily shorten them. If your methods are shorter, your code will be readable and thus more easier to maintain.

ghost · 2018-08-26T18:32:03Z

.gitignore

@@ -416,3 +416,7 @@ utils/DXFiles/
 !*.dll


.gitignore is not needed, you can delete it.

ghost · 2018-08-26T18:38:10Z

Client/core/Graphics/CPrimitiveMaterialBatcher.cpp

+    // Make projection 3D friendly, so shaders can alter the z coord for fancy effects
+    float fFarPlane = 10000;
+    float fNearPlane = 100;
+    float Q = fFarPlane / (fFarPlane - fNearPlane);


what is Q? Try to use pronounceable names for variables, because it will be really hard to understand the purpose later.

ghost · 2018-08-26T18:40:43Z

Client/core/Graphics/CPrimitiveMaterialBatcher.cpp

+
+    for (int i = 0; i < m_primitiveList.size(); i++)
+    {
+        sDrawQueuePrimitiveMaterial primitive = m_primitiveList[i];


why not use (auto& primitive : m_primitiveList)?

ghost · 2018-08-26T18:44:08Z

Client/core/Graphics/CPrimitiveMaterialBatcher.cpp

+    m_pDevice->SetRenderState(D3DRS_ALPHATESTENABLE, TRUE);
+    m_pDevice->SetRenderState(D3DRS_ALPHAREF, 0x01);
+    m_pDevice->SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATEREQUAL);
+    m_pDevice->SetRenderState(D3DRS_LIGHTING, FALSE);


Create a new function void CPrimitiveMaterialBatcher::SetRenderStates (), call m_pDevice->SetRenderState within that function.

ghost · 2018-08-26T18:44:39Z

Client/core/Graphics/CPrimitiveMaterialBatcher.cpp

+    m_pDevice->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
+    m_pDevice->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
+    m_pDevice->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_DISABLE);
+    m_pDevice->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);


Create a new function void CPrimitiveMaterialBatcher::SetTextureStageStates (), call m_pDevice->SetTextureStageState within that function.

ghost · 2018-08-26T19:11:12Z

Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp

+            return 1;
+        }
+
+        switch (primitiveType)


Use this code here:

if (IsPrimitiveSizeIncorrect (primitiveType, vecVertices)) { lua_pushboolean(luaVM, false); return 1; }

ghost · 2018-08-26T19:13:38Z

Client/core/Graphics/CPrimitiveBatcher.cpp

+
+    // Draw
+    m_pDevice->SetTexture(0, nullptr);
+    for (int i = 0; i < m_primitiveList.size(); i++)


why not use (auto& primitive : m_primitiveList)?

ghost · 2018-08-26T19:14:21Z

Client/core/Graphics/CPrimitiveBatcher.cpp

+    case D3DPT_LINESTRIP:
+        iSize = iCollectionSize - 1;
+        break;
+    case D3DPT_TRIANGLEFAN:


case D3DPT_TRIANGLEFAN: break;

D3DPT_TRIANGLEFANsize needs to be same as D3DPT_TRIANGLESTRIP, so break is unnecessary, it uses shared case

Oh, that makes sense.

ghost · 2018-08-26T19:17:18Z

Client/core/Graphics/CPrimitiveBatcher.cpp

+    m_pDevice->SetRenderState(D3DRS_ALPHATESTENABLE, TRUE);
+    m_pDevice->SetRenderState(D3DRS_ALPHAREF, 0x01);
+    m_pDevice->SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATEREQUAL);
+    m_pDevice->SetRenderState(D3DRS_LIGHTING, FALSE);


Create a new function void CPrimitiveMaterialBatcher::SetRenderStates (), call m_pDevice->SetRenderState within that function.

ghost · 2018-08-26T19:17:40Z

Client/core/Graphics/CPrimitiveBatcher.cpp

+    m_pDevice->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG2);
+    m_pDevice->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
+    m_pDevice->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_DISABLE);
+    m_pDevice->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);


Create a new function void CPrimitiveMaterialBatcher::SetTextureStageStates (), call m_pDevice->SetTextureStageState within that function.

ccw808 · 2018-08-26T20:20:08Z

sam1ler, the code you commented on has been copied from CTileBatcher.cpp, so I don't think your suggestions should be done in isolation.

ghost · 2018-08-26T21:08:28Z

@ccw808 I see, I didn't know that. This is a lot of code. We have a problem of redundancy here. How about sharing the code between CTileBatcher.cpp, CPrimitiveMaterialBatcher.cpp, and CPrimitiveBatcher.cpp? I can refactor the code in CTileBatcher.cpp, then the author of PR can make appropriate changes to the PR.

ccw808 · 2018-08-26T22:01:05Z

@Sam1ler it's up to you. (I would put refactor on the TODO list and leave it for now)

qaisjp · 2018-08-29T17:58:19Z

When merging (after 1.5.6), please squash and add the following line to the end of the commit message:

Co-authored-by: CrosRoad95 <sebajura1234@gmail.com>

…tive

Kamil Marciniak added 6 commits August 20, 2018 23:44

Merge remote-tracking branch 'multitheftauto/master' into dxDrawPrimi…

f4d22cf

…tive

Auto stash before merge of "dxDrawPrimitive" and "multitheftauto/master"

df3eea7

Basic dxDrawPrimitive

Added material caching, so no settings are changed needlessly

9209c67

Merge remote-tracking branch 'multitheftauto/master' into dxDrawPrimi…

97a7bea

…tive

Merge remote-tracking branch 'multitheftauto/master' into dxDrawPrimi…

7f37b28

…tive

Small fixes

6dd15ab

patrikjuvonen added the enhancement New feature or request label Aug 24, 2018

Naming changes, formatting

11de36f

Kamil Marciniak added 3 commits August 25, 2018 09:01

Fixed conditions checking for Pointlist, cleaned up classes a bit

0855ae7

- dxDrawPrimitive doesn't require you to draw at least 2 points now - Batcher classes did draw only a single point at all times anyways tho, fixed that - Cleaned up CPrimitiveBatcher.cpp - Replaced NULLs with nullptrs

Fix for pointlist checking

71a7ca7

Noticed that with last commit it would be possible to try draw 0 points without error

linestrip condition checking

1b54f7b

ghost changed the title ~~Queued dxDrawPrimitive~~ Queued dxDrawPrimitive and dxDrawMaterialPrimitive Aug 26, 2018

ghost reviewed Aug 26, 2018

View reviewed changes

Merge remote-tracking branch 'multitheftauto/master' into dxDrawPrimi…

e54d345

…tive

forkerer force-pushed the dxDrawPrimitive branch from e1576a3 to e54d345 Compare August 30, 2018 19:11

Kamil Marciniak added 2 commits August 30, 2018 21:13

hopefully no more bad stuff

21e6305

gitignore again

bb469d8

ghost merged commit 893c134 into multitheftauto:master Aug 30, 2018

patrikjuvonen assigned ghost Sep 4, 2018

patrikjuvonen modified the milestones: 1.5.6, 1.5.7 Sep 4, 2018

This pull request was closed.

Uh oh!

Queued dxDrawPrimitive and dxDrawMaterialPrimitive #339

Queued dxDrawPrimitive and dxDrawMaterialPrimitive #339

Uh oh!

Conversation

forkerer commented Aug 24, 2018

Uh oh!

CrosRoad95 commented Aug 24, 2018

Uh oh!

forkerer commented Aug 24, 2018

Uh oh!

4O4 commented Aug 24, 2018

Uh oh!

forkerer commented Aug 25, 2018

Uh oh!

CrosRoad95 commented Aug 25, 2018

Uh oh!

CrosRoad95 commented Aug 25, 2018

Uh oh!

forkerer commented Aug 25, 2018

Uh oh!

qaisjp commented Aug 26, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ghost Aug 26, 2018 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ccw808 commented Aug 26, 2018

Uh oh!

ghost commented Aug 26, 2018

Uh oh!

ccw808 commented Aug 26, 2018

Uh oh!

qaisjp commented Aug 29, 2018

Uh oh!

Uh oh!

qaisjp commented Aug 26, 2018 •

edited

Loading

ghost Aug 26, 2018 •

edited by ghost

Loading