Skip to content

Commit

Permalink
2.9.5
Browse files Browse the repository at this point in the history
  • Loading branch information
ehsankamrani committed Dec 17, 2023
1 parent 3872b96 commit 75e23ee
Show file tree
Hide file tree
Showing 33 changed files with 313 additions and 38 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Vanda Engine Editor/Debug/Assets/Engine/Publish/publish.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion Vanda Engine Editor/Debug/Readme.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Vanda Engine 2.9.4
Vanda Engine 2.9.5
Copyright (C) 2023 Ehsan Kamrani

www.vanda3d.org
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ void CEditProjectProperties::OnOK()
}

CChar temp[256];
sprintf(temp, "%s%s%s%s%s", "Vanda Engine 2.9.4 (", newProjectName, " - ", m_currentVSceneNameWithoutDot, ")");
sprintf(temp, "%s%s%s%s%s", "Vanda Engine 2.9.5 (", newProjectName, " - ", m_currentVSceneNameWithoutDot, ")");
ex_pVandaEngineDlg->SetWindowTextA(temp);

//save changes to projects.dat
Expand Down Expand Up @@ -230,7 +230,7 @@ void CEditProjectProperties::OnOK()
}

CChar temp[256];
sprintf(temp, "%s%s%s%s%s", "Vanda Engine 2.9.4 (", newProject->m_name, " - ", m_currentVSceneNameWithoutDot, ")");
sprintf(temp, "%s%s%s%s%s", "Vanda Engine 2.9.5 (", newProject->m_name, " - ", m_currentVSceneNameWithoutDot, ")");
ex_pVandaEngineDlg->SetWindowTextA(temp);

//create new directory
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10413,6 +10413,133 @@ CInt GetDistanceBetweenPhysicsCameraAndCharacterController(lua_State* L)
return 1;
}

CInt GetCharacterControllerCapsuleRadius(lua_State* L)
{
if (g_testScript)
return 0;

if (g_editorMode == eMODE_PREFAB || g_editorMode == eMODE_GUI)
{
PrintInfo("\nGetCharacterControllerCapsuleRadius() will be executed", COLOR_GREEN);
return 0;
}

CFloat value = g_physXProperties.m_fCapsuleRadius;

lua_pushnumber(L, value);

return 1;
}

CInt GetCharacterControllerCapsuleHeight(lua_State* L)
{
if (g_testScript)
return 0;

if (g_editorMode == eMODE_PREFAB || g_editorMode == eMODE_GUI)
{
PrintInfo("\nGetCharacterControllerCapsuleHeight() will be executed", COLOR_GREEN);
return 0;
}

CFloat value = g_physXProperties.m_fCapsuleHeight;

lua_pushnumber(L, value);

return 1;
}

CInt GetCharacterControllerForcePower(lua_State* L)
{
if (g_testScript)
return 0;

if (g_editorMode == eMODE_PREFAB || g_editorMode == eMODE_GUI)
{
PrintInfo("\nGetCharacterControllerForcePower() will be executed", COLOR_GREEN);
return 0;
}

CFloat value = g_physXProperties.m_fCharacterPower;

lua_pushnumber(L, value);

return 1;
}

CInt GetCharacterControllerWalkSpeed(lua_State* L)
{
if (g_testScript)
return 0;

if (g_editorMode == eMODE_PREFAB || g_editorMode == eMODE_GUI)
{
PrintInfo("\nGetCharacterControllerWalkSpeed() will be executed", COLOR_GREEN);
return 0;
}

CFloat value = g_physXProperties.m_fCharacterWalkSpeed;

lua_pushnumber(L, value);

return 1;
}

CInt GetCharacterControllerRunSpeed(lua_State* L)
{
if (g_testScript)
return 0;

if (g_editorMode == eMODE_PREFAB || g_editorMode == eMODE_GUI)
{
PrintInfo("\nGetCharacterControllerRunSpeed() will be executed", COLOR_GREEN);
return 0;
}

CFloat value = g_physXProperties.m_fCharacterRunSpeed;

lua_pushnumber(L, value);

return 1;
}

CInt GetCharacterControllerStepOffset(lua_State* L)
{
if (g_testScript)
return 0;

if (g_editorMode == eMODE_PREFAB || g_editorMode == eMODE_GUI)
{
PrintInfo("\nGetCharacterControllerStepOffset() will be executed", COLOR_GREEN);
return 0;
}

CFloat value = g_physXProperties.m_fCharacterStepOffset;

lua_pushnumber(L, value);

return 1;
}

CInt GetCharacterControllerJumpPower(lua_State* L)
{
if (g_testScript)
return 0;

if (g_editorMode == eMODE_PREFAB || g_editorMode == eMODE_GUI)
{
PrintInfo("\nGetCharacterControllerJumpPower() will be executed", COLOR_GREEN);
return 0;
}

CFloat value = g_physXProperties.m_fJumpPower;

lua_pushnumber(L, value);

return 1;
}


CInt GetPhysicsDefaultRestitution(lua_State* L)
{
if (g_testScript)
Expand Down
10 changes: 5 additions & 5 deletions Vanda Engine Editor/VandaEngineEditor/GraphicsEngine/Scene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ CInt CScene::WriteZipFile(CChar* zipFileName, CChar* fileInZipName, CChar* fileI
CChar temp[MAX_NAME_SIZE];
sprintf(temp, "\n%s %s %s", "Error in opening",fileInZipPath, "in zipfile");
zipCloseFileInZip(zf);
zipClose(zipOpen, "Vanda Engine 2.9.4");
zipClose(zipOpen, "Vanda Engine 2.9.5");
free(buf);
return -1;
}
Expand All @@ -157,7 +157,7 @@ CInt CScene::WriteZipFile(CChar* zipFileName, CChar* fileInZipName, CChar* fileI
//sprintf(temp, "\n%s %s %s", "Error in opening",fileInZipPath, "for reading");
//PrintInfo( temp, COLOR_RED );
//zipCloseFileInZip(zf);
//zipClose(zf, "Vanda Engine 2.9.4");
//zipClose(zf, "Vanda Engine 2.9.5");
//free(buf);
//return -1;
// }
Expand All @@ -173,7 +173,7 @@ CInt CScene::WriteZipFile(CChar* zipFileName, CChar* fileInZipName, CChar* fileI
CChar temp[MAX_NAME_SIZE];
sprintf(temp, "\n%s%s", "Error in reading ",fileInZipPath);
zipCloseFileInZip(zf);
zipClose(zf, "Vanda Engine 2.9.4");
zipClose(zf, "Vanda Engine 2.9.5");
free(buf);
return -1;
}
Expand All @@ -188,7 +188,7 @@ CInt CScene::WriteZipFile(CChar* zipFileName, CChar* fileInZipName, CChar* fileI

sprintf( temp, "\n%s%s%s", "Error in writing ", fileInZipPath, " in the zipfile");
zipCloseFileInZip(zf);
zipClose(zf, "Vanda Engine 2.9.4");
zipClose(zf, "Vanda Engine 2.9.5");
free(buf);
return -1;
}
Expand All @@ -198,7 +198,7 @@ CInt CScene::WriteZipFile(CChar* zipFileName, CChar* fileInZipName, CChar* fileI
if (fin)
fclose(fin);
zipCloseFileInZip(zf);
zipClose(zf,"Vanda Engine 2.9.4");
zipClose(zf,"Vanda Engine 2.9.5");
free(buf);
return 1;
}
Expand Down
44 changes: 44 additions & 0 deletions Vanda Engine Editor/VandaEngineEditor/ScriptEditorAddFunction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,14 @@ CScriptEditorAddFunction::CScriptEditorAddFunction(CWnd* pParent /*=NULL*/)

Cpy(GetDistanceBetweenPhysicsCameraAndCharacterController, "double GetDistanceBetweenPhysicsCameraAndCharacterController()");

Cpy(GetCharacterControllerCapsuleRadius, "double GetCharacterControllerCapsuleRadius()");
Cpy(GetCharacterControllerCapsuleHeight, "double GetCharacterControllerCapsuleHeight()");
Cpy(GetCharacterControllerForcePower, "double GetCharacterControllerForcePower()");
Cpy(GetCharacterControllerWalkSpeed, "double GetCharacterControllerWalkSpeed()");
Cpy(GetCharacterControllerRunSpeed, "double GetCharacterControllerRunSpeed()");
Cpy(GetCharacterControllerStepOffset, "double GetCharacterControllerStepOffset()");
Cpy(GetCharacterControllerJumpPower, "double GetCharacterControllerJumpPower()");

Cpy(GetPhysicsDefaultRestitution, "double GetPhysicsDefaultRestitution()");
Cpy(GetPhysicsDefaultSkinWidth, "double GetPhysicsDefaultSkinWidth()");
Cpy(GetPhysicsDefaultStaticFriction, "double GetPhysicsDefaultStaticFriction()");
Expand Down Expand Up @@ -2546,6 +2554,34 @@ void CScriptEditorAddFunction::OnLvnItemchangedListFunctions(NMHDR *pNMHDR, LRES
{
m_richFunctionName.SetWindowTextA(WriteStringVariableToFile);
}
else if (Cmp(szBuffer, "GetCharacterControllerCapsuleRadius"))
{
m_richFunctionName.SetWindowTextA(GetCharacterControllerCapsuleRadius);
}
else if (Cmp(szBuffer, "GetCharacterControllerCapsuleHeight"))
{
m_richFunctionName.SetWindowTextA(GetCharacterControllerCapsuleHeight);
}
else if (Cmp(szBuffer, "GetCharacterControllerForcePower"))
{
m_richFunctionName.SetWindowTextA(GetCharacterControllerForcePower);
}
else if (Cmp(szBuffer, "GetCharacterControllerWalkSpeed"))
{
m_richFunctionName.SetWindowTextA(GetCharacterControllerWalkSpeed);
}
else if (Cmp(szBuffer, "GetCharacterControllerRunSpeed"))
{
m_richFunctionName.SetWindowTextA(GetCharacterControllerRunSpeed);
}
else if (Cmp(szBuffer, "GetCharacterControllerStepOffset"))
{
m_richFunctionName.SetWindowTextA(GetCharacterControllerStepOffset);
}
else if (Cmp(szBuffer, "GetCharacterControllerJumpPower"))
{
m_richFunctionName.SetWindowTextA(GetCharacterControllerJumpPower);
}


CInt end = m_richFunctionName.GetWindowTextLengthA();
Expand Down Expand Up @@ -2740,6 +2776,14 @@ BOOL CScriptEditorAddFunction::OnInitDialog()

InsertItem("GetDistanceBetweenPhysicsCameraAndCharacterController");

InsertItem("GetCharacterControllerCapsuleRadius");
InsertItem("GetCharacterControllerCapsuleHeight");
InsertItem("GetCharacterControllerForcePower");
InsertItem("GetCharacterControllerWalkSpeed");
InsertItem("GetCharacterControllerRunSpeed");
InsertItem("GetCharacterControllerStepOffset");
InsertItem("GetCharacterControllerJumpPower");

InsertItem("GetPhysicsDefaultRestitution");
InsertItem("GetPhysicsDefaultSkinWidth");
InsertItem("GetPhysicsDefaultStaticFriction");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,14 @@ class CScriptEditorAddFunction : public CDialog

CChar GetDistanceBetweenPhysicsCameraAndCharacterController[MAX_URI_SIZE];

CChar GetCharacterControllerCapsuleRadius[MAX_URI_SIZE];
CChar GetCharacterControllerCapsuleHeight[MAX_URI_SIZE];
CChar GetCharacterControllerForcePower[MAX_URI_SIZE];
CChar GetCharacterControllerWalkSpeed[MAX_URI_SIZE];
CChar GetCharacterControllerRunSpeed[MAX_URI_SIZE];
CChar GetCharacterControllerStepOffset[MAX_URI_SIZE];
CChar GetCharacterControllerJumpPower[MAX_URI_SIZE];

CChar GetPhysicsDefaultRestitution[MAX_URI_SIZE];
CChar GetPhysicsDefaultSkinWidth[MAX_URI_SIZE];
CChar GetPhysicsDefaultStaticFriction[MAX_URI_SIZE];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,14 @@ static void LuaRegisterFunctions(lua_State* L)

lua_register(L, "GetDistanceBetweenPhysicsCameraAndCharacterController", GetDistanceBetweenPhysicsCameraAndCharacterController);

lua_register(L, "GetCharacterControllerCapsuleRadius", GetCharacterControllerCapsuleRadius);
lua_register(L, "GetCharacterControllerCapsuleHeight", GetCharacterControllerCapsuleHeight);
lua_register(L, "GetCharacterControllerForcePower", GetCharacterControllerForcePower);
lua_register(L, "GetCharacterControllerWalkSpeed", GetCharacterControllerWalkSpeed);
lua_register(L, "GetCharacterControllerRunSpeed", GetCharacterControllerRunSpeed);
lua_register(L, "GetCharacterControllerStepOffset", GetCharacterControllerStepOffset);
lua_register(L, "GetCharacterControllerJumpPower", GetCharacterControllerJumpPower);

lua_register(L, "GetPhysicsDefaultRestitution", GetPhysicsDefaultRestitution);
lua_register(L, "GetPhysicsDefaultSkinWidth", GetPhysicsDefaultSkinWidth);
lua_register(L, "GetPhysicsDefaultStaticFriction", GetPhysicsDefaultStaticFriction);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ void CSetCurrentProject::OnOK()
}

CChar temp[256];
sprintf(temp, "%s%s%s%s%s", "Vanda Engine 2.9.4 (", szBuffer, " - ", m_currentVSceneNameWithoutDot, ")");
sprintf(temp, "%s%s%s%s%s", "Vanda Engine 2.9.5 (", szBuffer, " - ", m_currentVSceneNameWithoutDot, ")");
ex_pVandaEngineDlg->SetWindowTextA(temp);
//save the changes to projects.dat
FILE *ProjectsFilePtr;
Expand Down
Binary file modified Vanda Engine Editor/VandaEngineEditor/VandaEngineEditor.aps
Binary file not shown.
8 changes: 4 additions & 4 deletions Vanda Engine Editor/VandaEngineEditor/VandaEngineEditor.rc
Original file line number Diff line number Diff line change
Expand Up @@ -2894,7 +2894,7 @@ BEGIN
LTEXT "Do not show this dialog at startup",IDC_STATIC,20,151,155,10
CONTROL "Tick",IDC_WELCOME_BUTTON_UNCHECK,"Button",BS_OWNERDRAW | WS_TABSTOP,5,149,12,12
CONTROL IDB_BITMAP7,IDC_STATIC,"Static",SS_BITMAP,2,3,77,19
LTEXT "Version 2.9.4",IDC_STATIC,7,33,60,8
LTEXT "Version 2.9.5",IDC_STATIC,7,33,60,8
LTEXT "� 2023 Ehsan Kamrani",IDC_STATIC,7,50,126,9
CONTROL "Tutorials",IDDONATE,"Button",BS_OWNERDRAW | WS_TABSTOP,15,91,52,16
LTEXT "To see the demo, please go to File | Open menu.",IDC_STATIC,9,69,167,9
Expand Down Expand Up @@ -3054,7 +3054,7 @@ CAPTION "About Vanda Engine"
FONT 9, "Century Gothic", 400, 0, 0x0
BEGIN
DEFPUSHBUTTON "OK",IDOK,241,114,50,16,WS_GROUP
LTEXT "VandaEngine Version 2.9.4",IDC_STATIC,103,7,123,8,SS_NOPREFIX
LTEXT "VandaEngine Version 2.9.5",IDC_STATIC,103,7,123,8,SS_NOPREFIX
CONTROL IDB_BITMAP_SCENE_LIST,IDC_STATIC,"Static",SS_BITMAP,21,79,59,17
CONTROL IDB_BITMAP1,IDC_STATIC,"Static",SS_BITMAP,83,79,67,17
CONTROL IDB_BITMAP_OPENAL_LOGO,IDC_STATIC,"Static",SS_BITMAP,153,73,59,27
Expand Down Expand Up @@ -3631,12 +3631,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Ehsan Kamrani "
VALUE "FileDescription", "Vanda Engine"
VALUE "FileVersion", "2.9.4"
VALUE "FileVersion", "2.9.5"
VALUE "internalName", "VandaEngine.exe"
VALUE "LegalCopyright", "(c) 2023 Ehsan Kamrani . All rights reserved."
VALUE "OriginalFilename", "VandaEngine.exe"
VALUE "ProductName", " Vanda Engine"
VALUE "ProductVersion", "2.9.4"
VALUE "ProductVersion", "2.9.5"
END
END
BLOCK "VarFileInfo"
Expand Down
Loading

0 comments on commit 75e23ee

Please sign in to comment.