Changeset 1908


Ignore:
Timestamp:
Sep 12, 2012, 2:53:58 AM (7 years ago)
Author:
rez
Message:

NEERCS: at last, all setup function keys are fixed!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/neercs/video/render.cpp

    r1906 r1908  
    105105vec4 postfx_ghost1(0.0f,0.0f,-2.0f,-0.15f);     // ghost picture 1 [position x,position y,position z,strength]
    106106vec4 postfx_ghost2(0.0f,0.0f,2.0f,0.15f);       // ghost picture 2 [position x,position y,position z,strength]
    107 vec4 postfx_moire_h(0.75f,-0.25f,0.0f,1.0f);    // vertical moire [base,variable,repeat x,repeat y]
    108 vec4 postfx_moire_v(0.75f,-0.25f,1.0f,1.5f);    // horizontal moire [base,variable,repeat x,repeat y]
    109 vec4 postfx_scanline_h(0.75f, 0.25f,0.0f,2.0f); // vertical scanline [base,variable,repeat x,repeat y]
    110 vec4 postfx_scanline_v(0.75f,-0.25f,2.0f,0.0f); // horizontal scanline [base,variable,repeat x,repeat y]
     107vec4 postfx_moire_h(0.75f,-0.25f,0.0f,1.0f);    // vertical moire [base,variable,repeat,shift]
     108vec4 postfx_moire_v(0.75f,-0.25f,1.0f,1.5f);    // horizontal moire [base,variable,repeat,shift]
     109vec4 postfx_scanline_h(0.75f, 0.25f,0.0f,2.0f); // vertical scanline [base,variable,repeat,shift]
     110vec4 postfx_scanline_v(0.75f,-0.25f,2.0f,0.0f); // horizontal scanline [base,variable,repeat,shift]
    111111vec3 postfx_corner(0.0f,0.75f,0.95f);           // corner [width,radius,blur]
    112112/* text variable */
     
    209209        "h base",
    210210        "h variable",
    211         "h repeat x",
    212         "h repeat y",
     211        "h repeat",
     212        "h shift",
    213213        "v base",
    214214        "v variable",
    215         "v repeat x",
    216         "v repeat y",
     215        "v repeat",
     216        "v shift",
    217217    "scanline",
    218218        "h base",
    219219        "h variable",
    220         "h repeat x",
    221         "h repeat y",
     220        "h repeat",
     221        "h shift",
    222222        "v base",
    223223        "v variable",
    224         "v repeat x",
    225         "v repeat y"
     224        "v repeat",
     225        "v shift"
    226226    };
    227227
     
    697697                else
    698698                {
    699                     if ((setup_option_p > 0) && setup_cursor == 0) setup_option_p--;
     699                    if (setup_cursor == 0) setup_option_p--;
    700700                }
    701701                if (setup_option_i > 0)
     
    710710                }
    711711                setup_item_i = 0;
     712                setup_item_p = 0;
    712713            }
    713714            else
    714715            {
    715                 setup_item_i--;
    716                 if (setup_item_i < 0) setup_item_i = setup_n;
     716                if (setup_cursor > 0)
     717                {
     718                    setup_cursor--;
     719                }
     720                else
     721                {
     722                    if (setup_cursor == 0) setup_item_p--;
     723                }
     724                if (setup_item_i > 0)
     725                {
     726                    setup_item_i--;
     727                }
     728                else
     729                {
     730                    setup_item_i = setup_n;
     731                    setup_item_p = (setup_n < setup_h) ? 0 : setup_n - setup_h + 1;
     732                    setup_cursor = (setup_n < setup_h) ? setup_n : setup_h - 1;
     733                }
    717734            }
    718735        }
     
    730747                else
    731748                {
    732                     if ((setup_option_p + setup_h < setup_option_n) && setup_cursor == setup_h - 1) setup_option_p++;
     749                    if (setup_cursor == setup_h - 1) setup_option_p++;
    733750                }
    734751                if (setup_option_i < setup_option_n - 1)
     
    743760                }
    744761                setup_item_i = 0;
     762                setup_item_p = 0;
    745763            }
    746764            else
     
    752770                else
    753771                {
    754                     if ((setup_item_p + setup_h < setup_n) && setup_cursor == setup_h - 1) setup_item_p++;
     772                    if (setup_cursor == setup_h - 1) setup_item_p++;
    755773                }
    756774                if (setup_item_i < setup_n)
     
    796814            else
    797815            {
    798                 setup_item_i += setup_n - setup_cursor - 1;
    799                 setup_cursor = setup_h - 1;
     816                setup_item_i += (setup_n < setup_h) ? setup_n - setup_cursor : setup_h - setup_cursor - 1;
     817                setup_cursor = (setup_n < setup_h) ? setup_n : setup_h - 1;
    800818            }
    801819        }
Note: See TracChangeset for help on using the changeset viewer.