RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
h4570
2022-08-11 10:20:35 +02:00
parent 5f5f28b3fb
commit b6ffc11be3
302 changed files with 3547 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/src/renderer/2d/renderer_2d.cpp
+8 -3
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
@@ -18,7 +18,12 @@ Renderer2D::~Renderer2D() {}
void Renderer2D::init(RendererCore* t_rendererCore) { core = t_rendererCore; }
void Renderer2D::render(Sprite* sprite) {
auto* texture = core->texture.repository.getBySpriteOrMesh(sprite->getId());
auto* texture = core->texture.repository.getBySpriteOrMesh(sprite->id);
TYRA_ASSERT(
texture, "Texture for sprite with id: ", sprite->id,
"Was not found in texture repository! Did you forget to add texture?");
auto texBuffers = core->texture.useTexture(texture);
core->texture.updateClutBuffer(texBuffers.clut);
core->renderer2D.render(sprite, texBuffers, texture);
engine/src/renderer/3d/bbox/bbox.cpp
+2 -5
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
@@ -68,7 +68,6 @@ Vec4 BBox::min() {
Vec4 temp, _min;
u8 isInitialized = 0;
const Vec4* vertices = vertices;
for (u8 i = 0; i < 8; i++) {
temp.set(vertices[i].x, vertices[i].y, vertices[i].z, 1.0F);
if (isInitialized == 0) {
@@ -88,7 +87,6 @@ Vec4 BBox::max() {
Vec4 temp, _max;
u8 isInitialized = 0;
const Vec4* vertices = vertices;
for (u8 i = 0; i < 8; i++) {
temp.set(vertices[i].x, vertices[i].y, vertices[i].z, 1.0F);
if (isInitialized == 0) {
@@ -108,7 +106,6 @@ void BBox::getMinMax(Vec4* res_min, Vec4* res_max) {
Vec4 temp = Vec4();
u8 isInitialized = 0;
const Vec4* vertices = vertices;
for (u8 i = 0; i < 8; i++) {
temp.set(vertices[i].x, vertices[i].y, vertices[i].z, 1.0F);
if (isInitialized == 0) {
engine/src/renderer/3d/mesh/dynamic/dynamic_mesh.cpp
+2 -2
View File
@@ -1,11 +1,11 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/mesh/mesh.cpp
+2 -2
View File
@@ -1,11 +1,11 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/mesh/mesh_frame.cpp
+2 -2
View File
@@ -1,11 +1,11 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/mesh/mesh_material.cpp
+2 -2
View File
@@ -1,11 +1,11 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/mesh/mesh_material_frame.cpp
+2 -2
View File
@@ -1,11 +1,11 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/mesh/static/static_mesh.cpp
+2 -2
View File
@@ -1,11 +1,11 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_bag.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_color_bag.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_lighting_bag.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_texture_bag.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/dynpip_core.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/dynpip_programs_repository.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/dynpip_renderer.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/dynpip_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_c_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_c_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_d_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_d_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_tc_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_tc_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_td_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_td_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/dynamic/dynamic_pipeline.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/minecraft/data/mcpip_block_data.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/minecraft/data/mcpip_multi_tex_block_data.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0F
# Licensed under Apache License 2.0F
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/minecraft/data/mcpip_single_tex_block_data.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0F
# Licensed under Apache License 2.0F
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/minecraft/minecraft_pipeline.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/minecraft/programs/as_is/mcpip_as_is_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/minecraft/programs/as_is/mcpip_as_is_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/minecraft/programs/as_is/mcpip_clip.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/minecraft/programs/cull/mcpip_cull.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/minecraft/programs/cull/mcpip_cull_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/minecraft/programs/cull/mcpip_cull_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/minecraft/programs/mcpip_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/minecraft/programs/mcpip_programs_manager.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/minecraft/programs/mcpip_programs_repository.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/shared/bag/pipeline_dir_lights_bag.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/bag/packaging/stapip_bag_package.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/bag/packaging/stapip_bag_packager.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/bag/packaging/stapip_bag_packages_bbox.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/bag/stapip_bag.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/bag/stapip_color_bag.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/bag/stapip_lighting_bag.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/bag/stapip_texture_bag.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/programs/as_is/stapip_as_is_c_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/static/core/programs/as_is/stapip_as_is_c_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/programs/as_is/stapip_as_is_d_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/static/core/programs/as_is/stapip_as_is_d_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/programs/as_is/stapip_as_is_tc_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/static/core/programs/as_is/stapip_as_is_tc_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/programs/as_is/stapip_as_is_td_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/static/core/programs/as_is/stapip_as_is_td_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/programs/cull/stapip_cull_c_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/static/core/programs/cull/stapip_cull_c_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/programs/cull/stapip_cull_d_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/static/core/programs/cull/stapip_cull_d_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/programs/cull/stapip_cull_tc_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/static/core/programs/cull/stapip_cull_tc_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/programs/cull/stapip_cull_td_vu1.vclpp
+2 -2
View File
@@ -1,9 +1,9 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/3d/pipeline/static/core/programs/cull/stapip_cull_td_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/stapip_clipper.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/stapip_core.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/stapip_programs_repository.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/stapip_qbuffer.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/stapip_qbuffer_renderer.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/core/stapip_vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/pipeline/static/static_pipeline.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/3d/renderer_3d.cpp
+2 -2
View File
@@ -1,11 +1,11 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/2d/renderer_core_2d.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/2d/sprite/sprite.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/3d/bbox/core_bbox.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/3d/bbox/render_bbox.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/3d/camera_info_3d.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/3d/clipper/ee_clip_algorithm.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/3d/renderer_3d_frustum_planes.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/3d/renderer_core_3d.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/gs/renderer_core_gs.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/gs/renderer_core_gs_vram.cpp
+5 -5
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
@@ -36,10 +36,10 @@ const float& RendererCoreGSVRam::getFreeSpaceInMB() {
}
float RendererCoreGSVRam::getSizeInMB(const Texture& texture) {
float result = getSizeInMB(texture.getCoreData());
float result = getSizeInMB(*texture.core);
if (texture.getClutData() != nullptr) {
result += getSizeInMB(*texture.getClutData());
if (texture.clut != nullptr) {
result += getSizeInMB(*texture.clut);
}
return result;
engine/src/renderer/core/paths/path1/draw_finish.vclpp
+2 -2
View File
@@ -1,10 +1,10 @@
; ______ ____ ___
; _____ ____ ___
; | \/ ____| |___|
; | | | \ | |
;---------------------------------------------------------------
; Copyright 2022, tyra - https://github.com/h4570/tyra
; Licenced under Apache License 2.0
; Licensed under Apache License 2.0
; Sandro Sobczyński <sandro.sobczynski@gmail.com>
;
;---------------------------------------------------------------
engine/src/renderer/core/paths/path1/path1.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/paths/path1/vu1_program.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/paths/path3/path3.cpp
+8 -9
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
@@ -66,15 +66,14 @@ void Path3::sendTexture(Texture* texture,
packet2_reset(texturePacket, false);
int coreWidth = texBuffers.core->width <= 64 ? 64 : texBuffers.core->width;
packet2_update(
texturePacket,
draw_texture_transfer(texturePacket->base, texture->getCoreData().data,
texture->getWidth(), texture->getHeight(),
texture->getCoreData().psm,
texBuffers.core->address, coreWidth));
packet2_update(texturePacket,
draw_texture_transfer(texturePacket->base, texture->core->data,
texture->getWidth(),
texture->getHeight(), texture->core->psm,
texBuffers.core->address, coreWidth));
if (texBuffers.clut != nullptr) {
auto* clut = texture->getClutData();
auto* clut = texture->clut;
int clutWidth = texBuffers.clut->width <= 64 ? 64 : texBuffers.clut->width;
packet2_update(texturePacket,
draw_texture_transfer(texturePacket->next, clut->data,
engine/src/renderer/core/renderer_core.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/renderer_core_sync.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/texture/models/texture.cpp
+27 -3
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
@@ -50,11 +50,35 @@ Texture::Texture(TextureBuilderData* t_data) {
}
Texture::~Texture() {
if (getTextureLinksCount() > 0) links.clear();
if (links.size() > 0) links.clear();
if (core) delete core;
if (clut) delete clut;
}
const s32 Texture::getIndexOfLink(const u32& t_id) const {
for (u32 i = 0; i < links.size(); i++)
if (links[i].id == t_id) return i;
return -1;
}
const u8 Texture::isLinkedWith(const u32& t_id) const {
s32 index = getIndexOfLink(t_id);
if (index != -1)
return true;
else
return false;
}
void Texture::removeLinkByIndex(const u32& t_index) {
links.erase(links.begin() + t_index);
}
void Texture::removeLinkById(const u32& t_id) {
s32 index = getIndexOfLink(t_id);
TYRA_ASSERT(index != -1, "Cant remove link, because it was not found!");
removeLinkByIndex(index);
}
float Texture::getSizeInMB() const {
return (core->width / 100.0F) * (core->height / 100.0F) *
(core->bpp / 100.0F) / 8.0F;
engine/src/renderer/core/texture/renderer_core_texture.cpp
+3 -3
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
@@ -38,7 +38,7 @@ void RendererCoreTexture::updateClutBuffer(texbuffer_t* clutBuffer) {
RendererCoreTextureBuffers RendererCoreTexture::useTexture(Texture* t_tex) {
TYRA_ASSERT(t_tex != nullptr, "Provided nullptr texture!");
auto allocated = getAllocatedBuffersByTextureId(t_tex->getId());
auto allocated = getAllocatedBuffersByTextureId(t_tex->id);
if (allocated.id != 0) return allocated;
if (gs->vram.getSizeInMB(*t_tex) >= gs->vram.getFreeSpaceInMB()) {
engine/src/renderer/core/texture/renderer_core_texture_sender.cpp
+9 -9
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
@@ -27,11 +27,11 @@ RendererCoreTextureBuffers RendererCoreTextureSender::allocate(
texbuffer_t* core = allocateTextureCore(t_texture);
texbuffer_t* clut = nullptr;
auto texClut = t_texture->getClutData();
auto texClut = t_texture->clut;
if (texClut != nullptr && texClut->width > 0) {
clut = allocateTextureClut(t_texture);
}
return {t_texture->getId(), core, clut};
return {t_texture->id, core, clut};
}
float RendererCoreTextureSender::getSizeInMB(texbuffer_t* texBuffer) {
@@ -56,13 +56,13 @@ void RendererCoreTextureSender::deallocate(
texbuffer_t* RendererCoreTextureSender::allocateTextureCore(
Texture* t_texture) {
auto* result = new texbuffer_t;
const auto& core = t_texture->getCoreData();
const auto* core = t_texture->core;
result->width = t_texture->getWidth();
result->psm = core.psm;
result->info.components = core.components;
result->psm = core->psm;
result->info.components = core->components;
auto address = gs->vram.allocate(core);
auto address = gs->vram.allocate(*core);
TYRA_ASSERT(address > 0, "Texture buffer allocation error, no memory!");
result->address = address;
@@ -75,7 +75,7 @@ texbuffer_t* RendererCoreTextureSender::allocateTextureCore(
texbuffer_t* RendererCoreTextureSender::allocateTextureClut(
Texture* t_texture) {
auto* result = new texbuffer_t;
const auto* clut = t_texture->getClutData();
const auto* clut = t_texture->clut;
result->width = clut->width;
result->psm = clut->psm;
engine/src/renderer/core/texture/texture_data.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/core/texture/texture_repository.cpp
+4 -4
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
@@ -31,13 +31,13 @@ Texture* TextureRepository::getBySpriteOrMesh(const u32& t_id) const {
Texture* TextureRepository::getByTextureId(const u32& t_id) const {
for (u32 i = 0; i < textures.size(); i++)
if (t_id == textures[i]->getId()) return textures[i];
if (t_id == textures[i]->id) return textures[i];
return nullptr;
}
const s32 TextureRepository::getIndexOf(const u32& t_texId) const {
for (u32 i = 0; i < textures.size(); i++)
if (textures[i]->getId() == t_texId) return i;
if (textures[i]->id == t_texId) return i;
return -1;
}
engine/src/renderer/models/color.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/renderer.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
engine/src/renderer/renderer_settings.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
/*
# ______ ____ ___
# _____ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Licensed under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/