Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dxDrawPrimitive3D and dxDrawMaterialPrimitive3D #760

Merged
merged 10 commits into from Sep 2, 2019

Conversation

@CrosRoad95
Copy link
Contributor

@CrosRoad95 CrosRoad95 commented Jan 6, 2019

Fixes Mantis #6064

Syntax:

  1. dxDrawPrimitive3D( primitiveType, postGui, vertex1, vertex2, ... )
    where vertex is {x,y,z} or {x,y,z,color}
  2. dxDrawMaterialPrimitive3D( primitiveType, texture, postGui, vertex1, vertex2, ... )
    where vertex is {x,y,z, u, v} or {x,y,z,color, u, v}

Test resource

TestResource

Example result:

image
image

Only alpha has issues when 2 rendering on top of each other 馃槩
https://github.com/multitheftauto/mtasa-blue/pull/760/files#diff-7950232204280a1f9935357a84b79876R80
if someone could help me fix it that would be nice, or we could do this in future

@CrosRoad95 CrosRoad95 requested a review from botder Jan 10, 2019
Copy link
Member

@botder botder left a comment

Run the formatting tool after fixing these.

Loading

Loading
Client/core/Graphics/CMaterialPrimitive3DBatcher.cpp Outdated Show resolved Hide resolved
Loading
Client/core/Graphics/CMaterialPrimitive3DBatcher.h Outdated Show resolved Hide resolved
Loading
Client/core/Graphics/CMaterialPrimitive3DBatcher.h Outdated Show resolved Hide resolved
Loading
Client/core/Graphics/CMaterialPrimitive3DBatcher.h Outdated Show resolved Hide resolved
Loading
Loading
Loading
Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp Outdated Show resolved Hide resolved
Loading
Loading
Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp Outdated Show resolved Hide resolved
Loading
@botder botder changed the title feature: dxDrawPrimitive3D and dxDrawMaterialPrimitive3D Add dxDrawPrimitive3D and dxDrawMaterialPrimitive3D Jan 12, 2019
Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp Outdated Show resolved Hide resolved
Loading
Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp Outdated Show resolved Hide resolved
Loading
@patrikjuvonen
Copy link
Contributor

@patrikjuvonen patrikjuvonen commented Feb 22, 2019

PR is now up to date and I cleaned up requested changes confirming if they were done or not. @CrosRoad95 See my comments, I think there's still some changes that need doing.

Regarding function returns, this PR should wait for #821 to resolve.

Loading

@botder botder added this to the Backlog milestone Mar 4, 2019
@CrosRoad95
Copy link
Contributor Author

@CrosRoad95 CrosRoad95 commented May 22, 2019

any update?

Loading

@qaisjp
Copy link
Contributor

@qaisjp qaisjp commented May 22, 2019

this PR should wait for #821 to resolve.

Loading

Client/core/Graphics/CMaterialPrimitive3DBatcher.h Outdated Show resolved Hide resolved
Loading
Client/core/Graphics/CPrimitive3DBatcher.h Outdated Show resolved Hide resolved
Loading
@CrosRoad95 CrosRoad95 force-pushed the dxDrawPrimitive3d branch from 2714f3d to bdcaa59 Aug 11, 2019
@botder
Copy link
Member

@botder botder commented Aug 17, 2019

The decision in pull request #821 (Pin down return value on failure) is now settled.

Loading

@patrikjuvonen patrikjuvonen self-assigned this Sep 2, 2019
@patrikjuvonen patrikjuvonen removed this from the Backlog milestone Sep 2, 2019
@patrikjuvonen patrikjuvonen added this to the 1.6 milestone Sep 2, 2019
@patrikjuvonen patrikjuvonen merged commit 901ed44 into multitheftauto:master Sep 2, 2019
4 checks passed
Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants