Skip to content

Commit

Permalink
Updated TilengineJNI.c. some functions are not implemented yet. You c…
Browse files Browse the repository at this point in the history 
…an see which functions are not implemented by seeing '// TO UPDATEgit pushgit push' on the right of the function
  • Loading branch information
@system64MC
system64MC committed Dec 6, 2020
1 parent 9c3d357 commit 4b0b83e
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 26 deletions.
16 changes: 8 additions & 8 deletions jni/Tilengine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,8 @@ TLNAPI void TLN_UpdateFrame (int frame);
TLNAPI void TLN_SetLoadPath (const char* path);
TLNAPI void TLN_SetCustomBlendFunction (TLN_BlendFunction);
TLNAPI void TLN_SetLogLevel(TLN_LogLevel log_level);
TLNAPI bool TLN_OpenResourcePack(const char* filename, const char* key);
TLNAPI void TLN_CloseResourcePack(void);
TLNAPI bool TLN_OpenResourcePack(const char* filename, const char* key); // TO UPDATE!!!!
TLNAPI void TLN_CloseResourcePack(void); // TO UPDATE!!!!

/**@}*/

Expand Down Expand Up @@ -452,7 +452,7 @@ TLNAPI bool TLN_DeleteSpriteset (TLN_Spriteset Spriteset);
* \brief Tileset resources management for background layers
* @{ */
TLNAPI TLN_Tileset TLN_CreateTileset (int numtiles, int width, int height, TLN_Palette palette, TLN_SequencePack sp, TLN_TileAttributes* attributes);
TLNAPI TLN_Tileset TLN_CreateImageTileset(int numtiles, TLN_TileImage* images);
TLNAPI TLN_Tileset TLN_CreateImageTileset(int numtiles, TLN_TileImage* images); // TO UPDATE!!!!
TLNAPI TLN_Tileset TLN_LoadTileset (const char* filename);
TLNAPI TLN_Tileset TLN_CloneTileset (TLN_Tileset src);
TLNAPI bool TLN_SetTilesetPixels (TLN_Tileset tileset, int entry, uint8_t* srcdata, int srcpitch);
Expand Down Expand Up @@ -513,7 +513,7 @@ TLNAPI bool TLN_SetBitmapPalette (TLN_Bitmap bitmap, TLN_Palette palette);
TLNAPI bool TLN_DeleteBitmap (TLN_Bitmap bitmap);
/**@}*/

/**
/** TO UPDATE!!!!
* \defgroup objects
* \brief ObjectList resources management
* @{ */
Expand Down Expand Up @@ -546,7 +546,7 @@ TLNAPI bool TLN_DisableLayerClip (int nlayer);
TLNAPI bool TLN_SetLayerMosaic (int nlayer, int width, int height);
TLNAPI bool TLN_DisableLayerMosaic (int nlayer);
TLNAPI bool TLN_ResetLayerMode (int nlayer);
TLNAPI bool TLN_SetLayerObjects(int nlayer, TLN_ObjectList objects, TLN_Tileset tileset);
TLNAPI bool TLN_SetLayerObjects(int nlayer, TLN_ObjectList objects, TLN_Tileset tileset); // TO UPDATE!!!!
TLNAPI bool TLN_SetLayerPriority(int nlayer, bool enable);
TLNAPI bool TLN_SetLayerParent(int nlayer, int parent);
TLNAPI bool TLN_DisableLayerParent(int nlayer);
Expand Down Expand Up @@ -578,12 +578,12 @@ TLNAPI int TLN_GetSpritePicture (int nsprite);
TLNAPI int TLN_GetAvailableSprite (void);
TLNAPI bool TLN_EnableSpriteCollision (int nsprite, bool enable);
TLNAPI bool TLN_GetSpriteCollision (int nsprite);
TLNAPI bool TLN_GetSpriteState(int nsprite, TLN_SpriteState* state);
TLNAPI bool TLN_GetSpriteState(int nsprite, TLN_SpriteState* state); // TO UPDATE!!!!
TLNAPI bool TLN_SetFirstSprite(int nsprite);
TLNAPI bool TLN_SetNextSprite(int nsprite, int next);
TLNAPI bool TLN_EnableSpriteMasking(int nsprite, bool enable);
TLNAPI void TLN_SetSpritesMaskRegion(int top_line, int bottom_line);
TLNAPI bool TLN_SetSpriteAnimation (int nsprite, TLN_Sequence sequence, int loop);
TLNAPI bool TLN_SetSpriteAnimation (int nsprite, TLN_Sequence sequence, int loop); // TO UPDATE!!!!
TLNAPI bool TLN_DisableSpriteAnimation(int nsprite);
TLNAPI bool TLN_DisableSprite (int nsprite);
TLNAPI TLN_Palette TLN_GetSpritePalette (int nsprite);
Expand All @@ -595,7 +595,7 @@ TLNAPI TLN_Palette TLN_GetSpritePalette (int nsprite);
* @{ */
TLNAPI TLN_Sequence TLN_CreateSequence (const char* name, int target, int num_frames, TLN_SequenceFrame* frames);
TLNAPI TLN_Sequence TLN_CreateCycle (const char* name, int num_strips, TLN_ColorStrip* strips);
TLNAPI TLN_Sequence TLN_CreateSpriteSequence(const char* name, TLN_Spriteset spriteset, const char* basename, int delay);
TLNAPI TLN_Sequence TLN_CreateSpriteSequence(const char* name, TLN_Spriteset spriteset, const char* basename, int delay); // TO UPDATE!!!!
TLNAPI TLN_Sequence TLN_CloneSequence (TLN_Sequence src);
TLNAPI bool TLN_GetSequenceInfo (TLN_Sequence sequence, TLN_SequenceInfo* info);
TLNAPI bool TLN_DeleteSequence (TLN_Sequence sequence);
Expand Down
107 changes: 89 additions & 18 deletions jni/TilengineJNI.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,28 +157,28 @@ JNIEXPORT void JNICALL Java_Tilengine_SetRenderTarget (JNIEnv* env, jobject this
}
}

JNIEXPORT void JNICALL Java_Tilengine_UpdateFrame (JNIEnv* env, jobject thisobj, jint time)
JNIEXPORT void JNICALL Java_Tilengine_UpdateFrame (JNIEnv* env, jobject thisobj, jint frame)
{
jint* buffer;

if (target.pitch)
{
buffer = (*env)->GetIntArrayElements (env, target.jia, NULL);
TLN_SetRenderTarget ((uint8_t*)buffer, target.pitch);
TLN_UpdateFrame (time);
TLN_UpdateFrame (frame);
(*env)->ReleaseIntArrayElements (env, target.jia, buffer, 0);
}
}

JNIEXPORT void JNICALL Java_Tilengine_BeginFrame (JNIEnv* env, jobject thisobj, jint time)
{
TLN_BeginFrame (time);
}
//JNIEXPORT void JNICALL Java_Tilengine_BeginFrame (JNIEnv* env, jobject thisobj, jint time)
//{
// TLN_BeginFrame (time);
//}

JNIEXPORT bool JNICALL Java_Tilengine_DrawNextScanline (JNIEnv* env, jobject thisobj)
{
return TLN_DrawNextScanline ();
}
//JNIEXPORT bool JNICALL Java_Tilengine_DrawNextScanline (JNIEnv* env, jobject thisobj)
//{
// return TLN_DrawNextScanline ();
//}

JNIEXPORT void JNICALL Java_Tilengine_SetLoadPath (JNIEnv* env, jobject thisobj, jstring path)
{
Expand Down Expand Up @@ -250,9 +250,9 @@ JNIEXPORT jboolean JNICALL Java_Tilengine_GetInput (JNIEnv* env, jobject thisobj
return TLN_GetInput (input);
}

JNIEXPORT void JNICALL Java_Tilengine_DrawFrame (JNIEnv* env, jobject thisobj, jint time)
JNIEXPORT void JNICALL Java_Tilengine_DrawFrame (JNIEnv* env, jobject thisobj, jint frame)
{
TLN_DrawFrame (time);
TLN_DrawFrame (frame);
}

JNIEXPORT void JNICALL Java_Tilengine_WaitRedraw (JNIEnv* env, jobject thisobj)
Expand Down Expand Up @@ -280,9 +280,19 @@ JNIEXPORT void JNICALL Java_Tilengine_Delay (JNIEnv* env, jobject thisobj, jint
TLN_Delay (time);
}

JNIEXPORT void JNICALL Java_Tilengine_BeginWindowFrame (JNIEnv* env, jobject thisobj, jint time)
// JNIEXPORT void JNICALL Java_Tilengine_BeginWindowFrame (JNIEnv* env, jobject thisobj, jint time)
// {
// TLN_BeginWindowFrame (time);
// }

JNIEXPORT jint JNICALL Java_Tilengine_GetWindowWidth (JNIEnv* env, jobject thisobj)
{
return TLN_GetWindowWidth ();
}

JNIEXPORT jint JNICALL Java_Tilengine_GetWindowHeight (JNIEnv* env, jobject thisobj)
{
TLN_BeginWindowFrame (time);
return TLN_GetWindowHeight ();
}

JNIEXPORT void JNICALL Java_Tilengine_EndWindowFrame (JNIEnv* env, jobject thisobj)
Expand Down Expand Up @@ -382,10 +392,10 @@ JNIEXPORT jboolean JNICALL Java_Tilengine_SetTilesetPixels (JNIEnv* env, jobject
return retval;
}

JNIEXPORT jboolean JNICALL Java_Tilengine_CopyTile (JNIEnv* env, jobject thisobj, jint tileset, jint src, jint dst)
{
return TLN_CopyTile ((TLN_Tileset)tileset, src, dst);
}
//JNIEXPORT jboolean JNICALL Java_Tilengine_CopyTile (JNIEnv* env, jobject thisobj, jint tileset, jint src, jint dst)
//{
// return TLN_CopyTile ((TLN_Tileset)tileset, src, dst);
//}

JNIEXPORT jint JNICALL Java_Tilengine_GetTileWidth (JNIEnv* env, jobject thisobj, jint tileset)
{
Expand All @@ -397,6 +407,11 @@ JNIEXPORT jint JNICALL Java_Tilengine_GetTileHeight (JNIEnv* env, jobject thisob
return TLN_GetTileHeight ((TLN_Tileset)tileset);
}

JNIEXPORT jiny JNICALL Java_Tilengine_GetTilesetNumTiles(JNIEnv* env, jobject thisobj, jint tileset)
{
return TLN_GetTilesetNumTiles((TLN_Tileset)tileset);
}

JNIEXPORT jint JNICALL Java_Tilengine_GetTilesetPalette (JNIEnv* env, jobject thisobj, jint tileset)
{
return (jint)TLN_GetTilesetPalette ((TLN_Tileset)tileset);
Expand Down Expand Up @@ -617,6 +632,26 @@ JNIEXPORT jboolean JNICALL Java_Tilengine_SetLayer (JNIEnv* env, jobject thisobj
return TLN_SetLayer (nlayer, (TLN_Tileset)tileset, (TLN_Tilemap)tilemap);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_SetLayer_Tilemap (JNIEnv* env, jobject thisobj, jint nlayer, jint tilemap)
{
return TLN_SetLayerTilemap(int nlayer, (TLN_Tilemap) tilemap);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_SetLayer_Priority (JNIEnv* env, jobject thisobj, jint nlayer, jboolean enable)
{
return TLN_SetLayerPriority(int nlayer, bool enable);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_SetLayer_Parent (JNIEnv* env, jobject thisobj, jint nlayer, jint parent)
{
return TLN_SetLayerParent(int nlayer, int parent);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_DisableLayer (JNIEnv* env, jobject thisobj, jint nlayer)
{
return TLN_DisableLayerParent(int nlayer);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_SetLayerPalette (JNIEnv* env, jobject thisobj, jint nlayer, jint palette)
{
return TLN_SetLayerPalette (nlayer, (TLN_Palette)palette);
Expand Down Expand Up @@ -737,6 +772,11 @@ JNIEXPORT jboolean JNICALL Java_Tilengine_SetSpriteFlags (JNIEnv* env, jobject t
return TLN_SetSpriteFlags (nsprite, flags);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_EnableSpriteFlags (JNIEnv* env, jobject thisobj, jint nsprite, jshort flag, jboolean enable)
{
return TLN_EnableSpriteFlag(int nsprite, uint32_t flag, bool enable);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_SetSpritePosition (JNIEnv* env, jobject thisobj, jint nsprite, jint x, jint y)
{
return TLN_SetSpritePosition (nsprite, x,y);
Expand Down Expand Up @@ -787,6 +827,31 @@ JNIEXPORT jboolean JNICALL Java_Tilengine_GetSpriteCollision (JNIEnv* env, jobje
return TLN_GetSpriteCollision (nsprite);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_SetFirstSprite (JNIEnv* env, jobject thisobj, jint nsprite)
{
return TLN_SetFirstSprite(int nsprite);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_SetNextSprite (JNIEnv* env, jobject thisobj, jint nsprite, jint next)
{
return TLN_SetNextSprite(int nsprite, int next);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_EnableSpriteMasking (JNIEnv* env, jobject thisobj, jint nsprite, jboolean enable)
{
return TLN_EnableSpriteMasking(int nsprite, bool enable);
}

JNIEXPORT void JNICALL Java_Tilengine_SetSpriteMaskRegion (JNIEnv* env, jobject thisobj, jint top_line, jint bottom_line)
{
return TLN_SetSpritesMaskRegion(int top_line, int bottom_line);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_DisableSpriteAnimation (JNIEnv* env, jobject thisobj, jint nsprite)
{
return TLN_DisableSpriteAnimation(int nsprite);
}

JNIEXPORT jboolean JNICALL Java_Tilengine_DisableSprite (JNIEnv* env, jobject thisobj, jint nsprite)
{
return TLN_DisableSprite (nsprite);
Expand Down Expand Up @@ -906,3 +971,9 @@ JNIEXPORT jboolean JNICALL Java_Tilengine_DisableAnimation (JNIEnv* env, jobject
{
return TLN_DisableAnimation (index);
}

// ****************************************************************************
// Update
// ****************************************************************************

// JNIEXPORT jboolean JNICALL Java_Tilengine_DisableAnimation (JNIEnv* env, jobject thisobj, jint index)

0 comments on commit 4b0b83e

Please sign in to comment.