Surface property editing functions #702

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

botder merged 12 commits into multitheftauto:master from CrosRoad95:Surface-Editing-Properties

Feb 14, 2019

Merged

Surface property editing functions #702

botder merged 12 commits into multitheftauto:master from CrosRoad95:Surface-Editing-Properties

Feb 14, 2019

Conversation

@CrosRoad95

Copy link

@CrosRoad95 CrosRoad95 commented Nov 12, 2018

This pr introducing functions that allow to manipulate surface properties.

Properties are resetting after connect/reconnect to ther server.
There are 2 disabled properties createobjects and createplants for future, or i can just remove this code.

Functions

bool engineSetSurfaceProperties( surfaceID, property, value )
mixed engineGetSurfaceProperties( surfaceID, property )
bool engineResetSurfaceProperties( [ surfaceID ] ) -- by default reset all properties

Properties and values

Property name	Accepted values	Effect	Picture
glass	boolean	unknown, i think should be true for all glass surfaces	-
stairs	boolean	unknown, i think should be true for all stairs surfaces	-
pavement	boolean	unknown, i think should be true for all pavement surfaces	-
stepwatersplash	boolean	water effect while step	image
softlanding	boolean	propably make landing cause less damage	-
steepslope	boolean	make you can't climb up / go up	-
footeffect	boolean	create prints of boots on ground	image
canclimb	boolean	make ped can or not jump on obstacle.	-
seethrough	boolean	connected with processLineOfSight function.	-
shootthrough	boolean	combined with seethrough allow to shot through surfaces, objects. Some fences has this ability	-
audio	"concrete", "grass", "sand", "gravel", "wood", "water", "metal"	change noise while walking	-
bulleteffect	"metal", "concrete", "sand", "wood", "disabled"	change effect when weapon hit	image
tyregrip	integer 0 - 255	change tyre grip	-
wetgrip	integer 0 - 255	change tyre grip while rain	-
adhesiongroup	"rubber", "hard", "road", "loose", "sand", "wet"	change tyre grip between various surfaces. If both surfaces ( vehicle tyre and ground ) are set to "rubber", make vehicle rarely create skid marks and vehicle don't slip	-
roughness	integer 0 - 3	unknown	-
fractioneffect	integer 0 - 7	unknown, probable make wheels vibrating on rail track	-
wheeleffect	"grass", "gravel", "mud", "sand", "dust", "disabled"	particles appearing while driving	image
skidmarktype	"asphalt", "dirt", "dust", "disabled"	change mark while after sudden braking	image

Test resource

Download

Gui

At left are valid values, at right current value.
image

Usage

Arrows up and down navigate over menu.
Press z to show/hide cursor, click over surface to select them.
Command /set value set value of selected property
Type /reset to reset selected surface values to default.

CrosRoad95 added 2 commits

November 12, 2018 16:30


 Editing, Getting and Resetting surface properties

fdeb6f9


 fixed bullet effect

6033de2

@ArranTuna

Copy link

Collaborator

ArranTuna commented Nov 12, 2018

Just some possibly useful info: I was running around with that skin that has rollerblades and on a grass object I was running slower, so I guess that is one of the effects one of those surface properties has, maybe it's what the unknown roughness effects.

@ArranTuna

Copy link

Collaborator

ArranTuna commented Dec 7, 2018

Tested and everything works good.

@ArranTuna ArranTuna added the tested label

Dec 7, 2018

@qaisjp qaisjp removed the tested label

Dec 8, 2018

@patrikjuvonen patrikjuvonen changed the title ~~(削除) Feature: editing surface properties. (削除ここまで)~~ (追記) Feature: editing surface properties (追記ここまで)

Dec 8, 2018

botder

botder requested changes

Dec 23, 2018

View reviewed changes

Client/mods/deathmatch/logic/CClientGame.cpp Outdated Show resolved Hide resolved

Client/mods/deathmatch/logic/CClientGame.h Outdated Show resolved Hide resolved

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp Outdated Show resolved Hide resolved


 fixed according to Botder tips

3f96c16

@qaisjp qaisjp changed the title ~~(削除) Feature: editing surface properties (削除ここまで)~~ (追記) Surface property editing functions (追記ここまで)

Dec 24, 2018

botder

botder reviewed

Dec 26, 2018

View reviewed changes

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp Outdated Show resolved Hide resolved

@botder botder self-assigned this

Dec 26, 2018


 Update CStaticFunctionDefinitions.cpp

6417d10

botder

botder requested changes

Jan 2, 2019

View reviewed changes

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp Show resolved Hide resolved

Client/mods/deathmatch/logic/CClientGame.cpp Outdated Show resolved Hide resolved

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp Outdated Show resolved Hide resolved

qaisjp and others added 2 commits

January 2, 2019 21:09

@qaisjp


 Run code through formatter

fb4127f


 fix a bit

dc753da

@botder

Copy link

Member

botder commented Jan 7, 2019

Mantis issue: https://bugs.mtasa.com/view.php?id=7656

CrosRoad95 added 3 commits

January 9, 2019 13:38


 Merge remote-tracking branch 'origin/Surface-Editing-Properties' into...

e2009ea

... Surface-Editing-Properties


 moved a bit of code to game_sa

617b98e


 added back 2 functions

4a8a5b0

botder

botder requested changes

Jan 12, 2019

View reviewed changes

Client/game_sa/CWorldSA.cpp Outdated Show resolved Hide resolved

Client/game_sa/CWorldSA.h Outdated Show resolved Hide resolved

Client/game_sa/CWorldSA.cpp Outdated

short sSize = sizeof(SurfaceInfo_c) * EColSurfaceValue::SIZE;

memcpy((void*)(dwSurfaceInfo + sOffset), (void*)(dwOriginalSurfaceInfo + sOffset), sSize);

return true;

Copy link

Member

@botder botder Jan 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function only returns true. Please change the function to return void.


 fix along Botder tips

qaisjp

qaisjp reviewed

Jan 12, 2019

View reviewed changes

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp Outdated Show resolved Hide resolved


 removed unnecessary else

44b9588

botder

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

break; not required after return 1;. Remove it for the other case X:s too!

Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp Outdated

if (pSurface->m_bulletFx == 0)

{

lua_pushstring(luaVM, "disabled");

return 1;

Copy link

Member

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not required because you have a return 1; after the if-else.

Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp Outdated

if (argStream.HasErrors())

m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

lua_pushboolean(luaVM, true);

Copy link

Member

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if (argStream.HasErrors())
{
 m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
 lua_pushnil(luaVM);
}
else
 lua_pushboolean(luaVM, false);

Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp Show resolved Hide resolved

Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp Outdated

}

if (argStream.HasErrors())

m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

lua_pushboolean(luaVM, false);

Copy link

Member

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use lua_pushnil(luaVM); because the code above can only fail due to invalid input.


 updated

3b54e2c

@botder botder merged commit f16a8e5 into multitheftauto:master

Feb 14, 2019

@StrixG StrixG added this to the 1.5.7 milestone

Jul 1, 2020

@lopezloo lopezloo mentioned this pull request

Jul 24, 2022

Implement createobjects and createplants property in engineSetSurfaceProperties #2681

Open

1 task

Labels

enhancement

5 participants

@CrosRoad95 @ArranTuna @botder @qaisjp @StrixG

Uh oh!

Uh oh!

Surface property editing functions #702

Surface property editing functions #702

Uh oh!

Conversation

@CrosRoad95 CrosRoad95 commented Nov 12, 2018

Functions

Properties and values

Test resource

Gui

Usage

Uh oh!

ArranTuna commented Nov 12, 2018

Uh oh!

ArranTuna commented Dec 7, 2018

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

botder commented Jan 7, 2019

Uh oh!

Uh oh!

Uh oh!

@botder botder Jan 12, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

Uh oh!

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

Uh oh!

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

Uh oh!

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

Uh oh!

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

Uh oh!

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

Uh oh!

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

Uh oh!

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

@botder botder Jan 14, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants