Skip to content

Commit

Permalink
Hitbox Editor Basic Components
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuria-Shikibe committed Jun 19, 2024
1 parent a7a22f3 commit cf2ff07
Show file tree
Hide file tree
Showing 100 changed files with 4,681 additions and 1,761 deletions.
6 changes: 2 additions & 4 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ import StackTrace;
import Graphic.Draw;
import Graphic.Pixmap;
import Core.Renderer;
import Graphic.Viewport.Viewport_OrthoRect;
import Graphic.Viewport;

import Graphic.PostProcessor.BloomProcessor;
import Graphic.PostProcessor.ShaderProcessor;
Expand Down Expand Up @@ -125,7 +123,7 @@ import ext.Encoding;
import ext.TreeStructure;
import ext.algorithm;
import ext.Heterogeneous;
import ext.Json;
import ext.json;
import ext.Base64;
import ext.StringParse;
import ext.StaticReflection;
Expand Down Expand Up @@ -393,7 +391,7 @@ int main(const int argc, char* argv[]){
// GL::Blendings::Disable.apply(worldFrameBuffer.getID());


Core::renderer->getListener().on<ext::Draw_After>([&](const ext::Draw_After& event){
Core::renderer->getListener().on<ext::Draw_Prepare>([&](const ext::Draw_Prepare& event){
if(!drawDebug) return;
// event.renderer->effectBuffer.bind();
event.renderer->frameBegin(&frameBuffer);
Expand Down
8 changes: 4 additions & 4 deletions properties/resource/assets/shader/coordinate-axis.frag
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ uniform float scale;
uniform vec2 screenSize;
uniform vec2 cameraPos;

uniform vec4 emptyColor;

bool modified(float a){
return a > 0.0;
}
Expand Down Expand Up @@ -56,16 +58,14 @@ void main() {
}

if(modified(newA)){
color.r = 0.3f;
color.g = 0.961f;
color.b = 0.671f;
color.rgb = vec3(0.3f, 0.961f, 0.671f);
}

color.a = max(color.a, newA);
}

if(!modified(color.a)){
color = vec4(0.22f, 0.35f, 0.6f, 0.12f);
color = emptyColor;
}

// color.rg *= (gl_FragCoord.xy / screenSize);
Expand Down
76 changes: 76 additions & 0 deletions properties/resource/assets/svg/icons/blender_icon_cursor.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
93 changes: 93 additions & 0 deletions properties/resource/assets/svg/icons/blender_icon_image_data.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 81 additions & 0 deletions properties/resource/assets/svg/icons/blender_icon_mod_mirror.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit cf2ff07

Please sign in to comment.