Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/guballaro99746/Stone_Development
This commit is contained in:
commit
653f9c48c2
@ -18,7 +18,7 @@ set(SRC_FILES
|
|||||||
)
|
)
|
||||||
|
|
||||||
set(INCLUDE_DIRS
|
set(INCLUDE_DIRS
|
||||||
${CMAKE_CURRENT_LIST_DIR}/linux
|
${CMAKE_CURRENT_LIST_DIR}/OS_NAME
|
||||||
)
|
)
|
||||||
|
|
||||||
add_executable(${EXECUTABLE_NAME} ${SRC_FILES})
|
add_executable(${EXECUTABLE_NAME} ${SRC_FILES})
|
||||||
|
|||||||
@ -3,6 +3,10 @@
|
|||||||
gamecube::gamecube(const Vec3 &pos, Color col)
|
gamecube::gamecube(const Vec3 &pos, Color col)
|
||||||
: position(pos), color(col) {}
|
: position(pos), color(col) {}
|
||||||
|
|
||||||
|
|
||||||
|
// hallo hier ist robert
|
||||||
|
//hallo Robert hier ist Niklas
|
||||||
|
//test
|
||||||
void gamecube::Update(float flipSpeed)
|
void gamecube::Update(float flipSpeed)
|
||||||
{
|
{
|
||||||
if (flippingForward)
|
if (flippingForward)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user