Skip to content

chore: formatting, comment clarity adjusted #28

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.

Sign up for GitHub

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

Open
petrSchreiber wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: formatting, comment clarity adjusted #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions src/entity_Light.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
' -----------------------------------------------------------------------------

' -- Equates for cType
%TBGL_LIGHTTYPE_POINT = 0
%TBGL_LIGHTTYPE_POINT = 0
%TBGL_LIGHTTYPE_DIRECTIONAL = 1
%TBGL_LIGHTTYPE_SPOT = 2

Expand All @@ -16,7 +16,7 @@ TYPE t_Entity_Light
rgba(0 TO 3) AS SINGLE ' rgba diffuse color, expressed in [0..1] floats
ambient(0 TO 3) AS SINGLE ' rgba ambient color
specular(0 TO 3) AS SINGLE ' rgba specular color
BorderFade AS SINGLE ' border fade ratio
borderFade AS SINGLE ' border fade ratio
cutoff AS SINGLE ' cutoff angle
END TYPE

Expand All @@ -32,22 +32,22 @@ MACRO macro_t_Entity_Light_MemPos(pStart) = STRPTR(pStart) + SIZEOF(t_EntityInf
MACRO macro_t_Entity_Light_FillData(ptrTo_t_EntityInfo, nType)

@ptrTo_t_EntityInfo.cType = nType
@ptrTo_t_EntityInfo.BorderFade = 0
@ptrTo_t_EntityInfo.borderFade = 0
@ptrTo_t_EntityInfo.cutoff = IIF( nType <> %TBGL_LIGHTTYPE_SPOT, 180, 45)

@ptrTo_t_EntityInfo.RGBA(0) = 1!
@ptrTo_t_EntityInfo.RGBA(1) = 1!
@ptrTo_t_EntityInfo.RGBA(2) = 1!
@ptrTo_t_EntityInfo.RGBA(3) = 1!
@ptrTo_t_EntityInfo.RGBA(0) = 1
@ptrTo_t_EntityInfo.RGBA(1) = 1
@ptrTo_t_EntityInfo.RGBA(2) = 1
@ptrTo_t_EntityInfo.RGBA(3) = 1

@ptrTo_t_EntityInfo.ambient(0) = 0!
@ptrTo_t_EntityInfo.ambient(1) = 0!
@ptrTo_t_EntityInfo.ambient(2) = 0!
@ptrTo_t_EntityInfo.ambient(0) = 0
@ptrTo_t_EntityInfo.ambient(1) = 0
@ptrTo_t_EntityInfo.ambient(2) = 0
@ptrTo_t_EntityInfo.ambient(3) = 1

@ptrTo_t_EntityInfo.specular(0) = 0!
@ptrTo_t_EntityInfo.specular(1) = 0!
@ptrTo_t_EntityInfo.specular(2) = 0!
@ptrTo_t_EntityInfo.specular(0) = 0
@ptrTo_t_EntityInfo.specular(1) = 0
@ptrTo_t_EntityInfo.specular(2) = 0
@ptrTo_t_EntityInfo.specular(3) = 1

END MACRO
Expand All @@ -56,11 +56,12 @@ SUB Exec_TBGL_EntityCreateLight()

LOCAL ScriptSceneID AS EXT
LOCAL EntityID AS EXT
LOCAL ParentEntityId AS EXT
LOCAL Param AS EXT
LOCAL PARENT AS EXT


Param = %TBGL_LIGHTTYPE_POINT
thinBASIC_ParseXNumbers( 2, 4, ScriptSceneID, EntityID, PARENT, Param )
thinBASIC_ParseXNumbers( 2, 4, ScriptSceneID, EntityID, ParentEntityId, Param )

internal_EntityRedimArrayIfNeeded(ScriptSceneID, EntityID)

Expand All @@ -71,7 +72,7 @@ SUB Exec_TBGL_EntityCreateLight()

'---Now point the object info pointer to point to the first byte (remember here there is the space for t_ObjectInfo
dummy_PtrTo_t_EntityInfo = STRPTR(TBGLSceneEntities(EntityID))
macro_t_EntityInfo_FillData(dummy_PtrTo_t_EntityInfo, %TBGL_ENTITY_LIGHT, PARENT, 1, 0, 0, 0)', 0, 0, 0)
macro_t_EntityInfo_FillData(dummy_PtrTo_t_EntityInfo, %TBGL_ENTITY_LIGHT, ParentEntityId, 1, 0, 0, 0)

'---Now point the object info pointer to point to the initial of the specific object data.
dummy_PtrTo_t_Entity_Light = macro_t_Entity_Light_MemPos(TBGLSceneEntities(EntityID))
Expand Down Expand Up @@ -120,8 +121,8 @@ SUB Exec_TBGL_EntitySetBorderFade()
IF @dummy_PtrTo_t_EntityInfo.EntType = %TBGL_ENTITY_LIGHT THEN
dummy_PtrTo_t_Entity_LIGHT = macro_t_Entity_Light_MemPos(TBGLSceneEntities(EntityID))

' -- OpenGL uses scale 0 - 128 instead of 0 - 1
@dummy_PtrTo_t_Entity_LIGHT.BorderFade = exponent*1.28
' -- OpenGL uses scale 0 - 128 instead of 0 - 100
@dummy_PtrTo_t_Entity_LIGHT.borderFade = exponent*1.28
END IF

END SUB
Expand Down
10 changes: 5 additions & 5 deletions src/thinbasic_TBGL.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
' -----------------------------------------------------------------------------
#RESOURCE ICON, PROGRAM, "TBGL.ICO"
#RESOURCE VERSIONINFO
#RESOURCE FILEVERSION 1, 11, 7, 1
#RESOURCE PRODUCTVERSION 1, 11, 7, 1
#RESOURCE FILEVERSION 1, 14, 0, 0
#RESOURCE PRODUCTVERSION 1, 14, 0, 0

#RESOURCE STRINGINFO "0409", "04B0"

#RESOURCE VERSION$ "CompanyName", "thinBasic"
#RESOURCE VERSION$ "FileDescription", "thinBASIC module for 2D/3D graphics"
#RESOURCE VERSION$ "FileVersion", "1.11.7.1"
#RESOURCE VERSION$ "FileVersion", "1.14.0.0"
#RESOURCE VERSION$ "InternalName", "TBGL"
#RESOURCE VERSION$ "OriginalFilename", "ThinBASIC_TBGL.dll"
#RESOURCE VERSION$ "LegalCopyright", "Copyright � thinBasic 2020"
#RESOURCE VERSION$ "LegalCopyright", "Copyright � thinBasic 2025"
#RESOURCE VERSION$ "ProductName", "TBGL"
#RESOURCE VERSION$ "ProductVersion", "1.11.7.1"
#RESOURCE VERSION$ "ProductVersion", "1.14.0.0"
#RESOURCE VERSION$ "Comments", "Support site: http://www.thinbasic.com/"

' -----------------------------------------------------------------------------
Expand Down